nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updates, fixes and merge in master

Browse Source
This commit is contained in:
turanszkij
2018-09-14 22:36:17 +01:00
parent 67f592d5ac c427c62454
commit 21b4e280a0
25 changed files with 369 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/Editor.cpp
+17 -10
View File
@@ -390,6 +390,7 @@ void EditorComponent::Load()
translator = new Translator;
translator->enabled = false;
Translator::LoadShaders();
float screenW = (float)wiRenderer::GetDevice()->GetScreenWidth();
@@ -849,6 +850,8 @@ void EditorComponent::Load()
wiRenderer::ReloadShaders();
Translator::LoadShaders();
});
GetGUI().AddWidget(shaderButton);
@@ -1417,15 +1420,6 @@ void EditorComponent::Update(float dt)
assert(picked->entity != INVALID_ENTITY);
if (picked->subsetIndex >= 0)
{
const ObjectComponent* object = scene.objects.GetComponent(picked->entity);
meshWnd->SetEntity(object->meshID);
const MeshComponent* mesh = scene.meshes.GetComponent(object->meshID);
materialWnd->SetEntity(mesh->subsets[picked->subsetIndex].materialID);
}
objectWnd->SetEntity(picked->entity);
emitterWnd->SetEntity(picked->entity);
hairWnd->SetEntity(picked->entity);
@@ -1434,7 +1428,20 @@ void EditorComponent::Update(float dt)
envProbeWnd->SetEntity(picked->entity);
forceFieldWnd->SetEntity(picked->entity);
cameraWnd->SetEntity(picked->entity);
materialWnd->SetEntity(picked->entity);
if (picked->subsetIndex >= 0)
{
const ObjectComponent* object = scene.objects.GetComponent(picked->entity);
meshWnd->SetEntity(object->meshID);
const MeshComponent* mesh = scene.meshes.GetComponent(object->meshID);
materialWnd->SetEntity(mesh->subsets[picked->subsetIndex].materialID);
}
else
{
materialWnd->SetEntity(picked->entity);
}
}
//// Delete