Merge branch 'main' into collection

meta4d-me · Sep 12, 2023 · 3dedbb6 · 3dedbb6
2 parents 782e884 + 0c49ac5
commit 3dedbb6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/Engine/Source/Editor/EditorApp.cpp b/Engine/Source/Editor/EditorApp.cpp
@@ -177,8 +177,8 @@ void EditorApp::InitEditorUILayers()
 	pSceneView->SetAABBRenderer(m_pAABBRenderer);
 	m_pEditorImGuiContext->AddDynamicLayer(cd::MoveTemp(pSceneView));
 
-	m_pEditorImGuiContext->AddDynamicLayer(std::make_unique<Inspector>("Inspector"));
 	m_pEditorImGuiContext->AddDynamicLayer(std::make_unique<SkeletonView>("SkeletonView"));
+	m_pEditorImGuiContext->AddDynamicLayer(std::make_unique<Inspector>("Inspector"));
 
 	auto pAssetBrowser = std::make_unique<AssetBrowser>("AssetBrowser");
 	pAssetBrowser->SetSceneRenderer(m_pSceneRenderer);

diff --git a/Engine/Source/Editor/UILayers/AssetBrowser.cpp b/Engine/Source/Editor/UILayers/AssetBrowser.cpp
@@ -909,15 +909,15 @@ void AssetBrowser::ImportModelFile(const char* pFilePath)
 	if (0 == inputFileExtension.compare(".cdbin"))
 	{
 		cdtools::CDProducer cdProducer(pFilePath);
-		cdtools::Processor processor(&cdProducer, nullptr, pSceneDatabase);
+		cd::SceneDatabase newSceneDatabase;
+		cdtools::Processor processor(&cdProducer, nullptr, &newSceneDatabase);
 		processor.Run();
+		pSceneDatabase->Merge(cd::MoveTemp(newSceneDatabase));
 	}
 	else
 	{
 #ifdef ENABLE_GENERIC_PRODUCER
 		cdtools::GenericProducer genericProducer(pFilePath);
-		genericProducer.SetSceneDatabaseIDs(pSceneDatabase->GetNodeCount(), pSceneDatabase->GetMeshCount(),
-		pSceneDatabase->GetMaterialCount(), pSceneDatabase->GetTextureCount(), pSceneDatabase->GetLightCount());
 		genericProducer.ActivateBoundingBoxService();
 		genericProducer.ActivateCleanUnusedService();
 		genericProducer.ActivateTangentsSpaceService();
@@ -928,10 +928,12 @@ void AssetBrowser::ImportModelFile(const char* pFilePath)
 			genericProducer.ActivateFlattenHierarchyService();
 		}
 
-		cdtools::Processor processor(&genericProducer, nullptr, pSceneDatabase);
+		cd::SceneDatabase newSceneDatabase;
+		cdtools::Processor processor(&genericProducer, nullptr, &newSceneDatabase);
 		processor.SetDumpSceneDatabaseEnable(false);
 		//processor.SetFlattenSceneDatabaseEnable(true);
 		processor.Run();
+		pSceneDatabase->Merge(cd::MoveTemp(newSceneDatabase));
 #else
 		assert("Unable to import this file format.");
 #endif

diff --git a/Engine/Source/Editor/UILayers/Inspector.cpp b/Engine/Source/Editor/UILayers/Inspector.cpp
@@ -146,12 +146,10 @@ void UpdateComponentWidget<engine::MaterialComponent>(engine::SceneWorld* pScene
 				ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(2, 2));
 				ImGui::Separator();
 
-				std::string uvOffset = std::string(title) + std::string(" UVOffset");
-				std::string uvScale = std::string(title) + std::string(" UVScale");
 				if (isOpen)
 				{
-					ImGuiUtils::ImGuiVectorProperty(uvOffset.c_str(), pTextureInfo->GetUVOffset());
-					ImGuiUtils::ImGuiVectorProperty(uvScale.c_str(), pTextureInfo->GetUVScale());
+					ImGuiUtils::ImGuiVectorProperty("UVOffset", pTextureInfo->GetUVOffset());
+					ImGuiUtils::ImGuiVectorProperty("UVScale", pTextureInfo->GetUVScale());
 				}
 
 				ImGui::Separator();

diff --git a/Engine/Source/Runtime/ECWorld/TransformComponent.cpp b/Engine/Source/Runtime/ECWorld/TransformComponent.cpp
@@ -19,7 +19,7 @@ void TransformComponent::Build()
 	}
 }
 #ifdef EDITOR_MODE
-bool TransformComponent::m_doUseUniformScale = false;
+bool TransformComponent::m_doUseUniformScale = true;
 #endif
 
 }
diff --git a/Engine/Source/Runtime/ImGui/ImGuiUtils.hpp b/Engine/Source/Runtime/ImGui/ImGuiUtils.hpp
@@ -243,7 +243,7 @@ static void ColorPickerProperty(const char* Name, cd::Vec3f& veccolor)
 	ImGui::SameLine();
 	ImGui::NextColumn();
 	ImGui::PushID(Name);
-	if (ImGui::Button("Change"))
+	if (ImGui::Button("..."))
 	{
 		showMap[Name] = true;
 	}

diff --git a/Engine/Source/ThirdParty/AssetPipeline b/Engine/Source/ThirdParty/AssetPipeline
+49 −5		examples/FbxToUVMap/Main.cpp
+2 −0		examples/HEMToFbx/Main.cpp
+52 −348		private/Framework/ProcessorImpl.cpp
+12 −2		private/Framework/ProcessorImpl.h
+43 −7		private/Producers/FbxProducer/FbxProducerImpl.cpp
+1 −1		private/Producers/FbxProducer/FbxProducerImpl.h
+2 −19		private/Scene/Animation.cpp
+2 −5		private/Scene/AnimationImpl.h
+2 −14		private/Scene/Bone.cpp
+2 −6		private/Scene/BoneImpl.h
+2 −19		private/Scene/Camera.cpp
+2 −6		private/Scene/CameraImpl.h
+2 −14		private/Scene/Light.cpp
+3 −5		private/Scene/LightImpl.h
+2 −19		private/Scene/Material.cpp
+2 −5		private/Scene/MaterialImpl.h
+12 −145		private/Scene/Mesh.cpp
+15 −17		private/Scene/MeshImpl.cpp
+9 −34		private/Scene/MeshImpl.h
+9 −129		private/Scene/Morph.cpp
+0 −29		private/Scene/MorphImpl.cpp
+9 −30		private/Scene/MorphImpl.h
+2 −19		private/Scene/Node.cpp
+2 −6		private/Scene/NodeImpl.h
+15 −0		private/Scene/SceneDatabase.cpp
+445 −2		private/Scene/SceneDatabaseImpl.cpp
+3 −0		private/Scene/SceneDatabaseImpl.h
+2 −14		private/Scene/Texture.cpp
+2 −5		private/Scene/TextureImpl.h
+5 −94		private/Scene/Track.cpp
+5 −23		private/Scene/TrackImpl.h
+64 −2		public/Base/Export.h
+2 −0		public/Math/Math.hpp
+1 −0		public/Math/Quaternion.hpp
+1 −0		public/Math/Vector.hpp
+2 −5		public/Scene/Animation.h
+2 −4		public/Scene/Bone.h
+2 −5		public/Scene/Camera.h
+3 −4		public/Scene/Light.h
+2 −5		public/Scene/Material.h
+8 −32		public/Scene/Mesh.h
+10 −31		public/Scene/Morph.h
+2 −5		public/Scene/Node.h
+6 −0		public/Scene/ObjectID.h
+4 −0		public/Scene/SceneDatabase.h
+2 −4		public/Scene/Texture.h
+5 −22		public/Scene/Track.h