fix vector type data size error

meta4d-me · Dec 18, 2023 · 4f5e7df · 4f5e7df
1 parent e5059d8
commit 4f5e7df
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/make_win64_vs2022.bat b/make_win64_vs2022.bat
@@ -22,5 +22,4 @@ if exist "./auto/commercial_sdk_locations.bat" (
 )
 @echo on
 cd auto
-call "./Premake/Windows/premake5" --os=windows vs2022
-pause
+call "./Premake/Windows/premake5" --os=windows vs2022
diff --git a/private/Producers/GenericProducer/GenericProducerImpl.cpp b/private/Producers/GenericProducer/GenericProducerImpl.cpp
@@ -589,8 +589,6 @@ void GenericProducerImpl::AddMaterials(cd::SceneDatabase* pSceneDatabase, const
 	}
 
 	// Add materials and associated textures(a simple filepath or raw pixel data) to SceneDatabase.
-	uint32_t actualMaterialCount = optUsedMaterialIndexes.has_value() ? static_cast<uint32_t>(optUsedMaterialIndexes.value().size()) : pSourceScene->mNumMaterials;
-	pSceneDatabase->SetMaterialCount(actualMaterialCount);
 	for (uint32_t materialIndex = 0; materialIndex < pSourceScene->mNumMaterials; ++materialIndex)
 	{
 		if (optUsedMaterialIndexes.has_value() &&
@@ -644,7 +642,6 @@ void GenericProducerImpl::AddScene(cd::SceneDatabase* pSceneDatabase, const aiSc
 
 	if (pSourceScene->HasLights())
 	{
-		pSceneDatabase->SetLightCount(pSourceScene->mNumLights);
 		for (uint32_t lightIndex = 0U; lightIndex < pSourceScene->mNumLights; ++lightIndex)
 		{
 			AddLight(pSceneDatabase, pSourceScene->mLights[lightIndex]);
@@ -653,9 +650,6 @@ void GenericProducerImpl::AddScene(cd::SceneDatabase* pSceneDatabase, const aiSc
 
 	if (pSourceScene->HasMeshes())
 	{
-		pSceneDatabase->SetNodeCount(GetSceneNodesCount(pSourceScene->mRootNode));
-		pSceneDatabase->SetMeshCount(pSourceScene->mNumMeshes);
-
 		// Add nodes and associated meshes to SceneDatabase.
 		// For assimp, bones are also treated as nodes.
 		AddNodeRecursively(pSceneDatabase, pSourceScene, pSourceScene->mRootNode, m_nodeIDGenerator.AllocateID().Data());
@@ -670,7 +664,6 @@ void GenericProducerImpl::AddScene(cd::SceneDatabase* pSceneDatabase, const aiSc
 	// Add animations.
 	if (pSourceScene->HasAnimations())
 	{
-		pSceneDatabase->SetAnimationCount(pSourceScene->mNumAnimations);
 		for (uint32_t animationIndex = 0U; animationIndex < pSourceScene->mNumAnimations; ++animationIndex)
 		{
 			AddAnimation(pSceneDatabase, pSourceScene->mAnimations[animationIndex]);

diff --git a/public/Scene/APIMacros.h b/public/Scene/APIMacros.h
@@ -80,13 +80,13 @@ public: \
 	Class##TypeTraits::Type Get##Type() const; \
 
 #define PIMPL_SIMPLE_TYPE_APIS(Class, Type) \
-	void Class::Set##Type(Class##TypeTraits::Type value) { return m_p##Class##Impl->Set##Type(cd::MoveTemp(value)); } \
+	void Class::Set##Type(Class##TypeTraits::Type value) { return m_p##Class##Impl->Set##Type(value); } \
 	Class##TypeTraits::Type& Class::Get##Type() { return m_p##Class##Impl->Get##Type(); } \
 	Class##TypeTraits::Type Class::Get##Type() const { return m_p##Class##Impl->Get##Type(); } \
 
 #define IMPLEMENT_SIMPLE_TYPE_APIS(Class, Type) \
 public: \
-	void Set##Type(Class##TypeTraits::Type value) { m_##Type = MoveTemp(value); } \
+	void Set##Type(Class##TypeTraits::Type value) { m_##Type = value; } \
 	Class##TypeTraits::Type& Get##Type() { return m_##Type; } \
 	Class##TypeTraits::Type Get##Type() const { return m_##Type; } \
 private: \
@@ -129,6 +129,8 @@ public: \
 	Class##TypeTraits::Type& Get##Type(uint32_t index); \
 	const Class##TypeTraits::Type& Get##Type(uint32_t index) const; \
 	void Add##Type(Class##TypeTraits::Type element); \
+	void Shrink##Type##Plural##ToFit(); \
+	void Clear##Type##Plural(); \
 
 #define PIMPL_VECTOR_TYPE_APIS_WITH_PLURAL(Class, Type, Plural) \
 	void Class::Set##Type##Capacity(uint32_t count) { m_p##Class##Impl->Set##Type##Capacity(count); } \
@@ -141,6 +143,8 @@ public: \
 	Class##TypeTraits::Type& Class::Get##Type(uint32_t index) { return m_p##Class##Impl->Get##Type(index); } \
 	const Class##TypeTraits::Type& Class::Get##Type(uint32_t index) const { return m_p##Class##Impl->Get##Type(index); } \
 	void Class::Add##Type(Class##TypeTraits::Type element) { m_p##Class##Impl->Add##Type(cd::MoveTemp(element)); } \
+	void Class::Shrink##Type##Plural##ToFit() { m_p##Class##Impl->Shrink##Type##Plural##ToFit(); } \
+	void Class::Clear##Type##Plural() { m_p##Class##Impl->Clear##Type##Plural(); } \
 
 #define IMPLEMENT_VECTOR_TYPE_APIS_WITH_PLURAL(Class, Type, Plural) \
 public: \
@@ -154,6 +158,8 @@ public: \
 	Class##TypeTraits::Type& Get##Type(uint32_t index) { return m_##Type##Plural[index]; } \
 	const Class##TypeTraits::Type& Get##Type(uint32_t index) const { return m_##Type##Plural[index]; } \
 	void Add##Type(Class##TypeTraits::Type element) { m_##Type##Plural.push_back(cd::MoveTemp(element)); } \
+	void Shrink##Type##Plural##ToFit() { m_##Type##Plural.shrink_to_fit(); } \
+	void Clear##Type##Plural() { m_##Type##Plural.clear(); } \
 private: \
 	std::vector<Class##TypeTraits::Type> m_##Type##Plural; \
 public: \