fix particleCount to SIMPLE

meta4d-me · Dec 30, 2023 · fff2d89 · fff2d89
1 parent 0226728
commit fff2d89
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/private/Scene/ParticleEmitter.cpp b/private/Scene/ParticleEmitter.cpp
@@ -15,7 +15,7 @@ ParticleEmitter::ParticleEmitter(ParticleEmitterID id, const char* pName)
 PIMPL_SIMPLE_TYPE_APIS(ParticleEmitter, ID);
 PIMPL_SIMPLE_TYPE_APIS(ParticleEmitter, Type);
 PIMPL_SIMPLE_TYPE_APIS(ParticleEmitter, MeshID);
-PIMPL_COMPLEX_TYPE_APIS(ParticleEmitter, MaxCount);
+PIMPL_SIMPLE_TYPE_APIS(ParticleEmitter, MaxCount);
 PIMPL_COMPLEX_TYPE_APIS(ParticleEmitter, Position);
 PIMPL_COMPLEX_TYPE_APIS(ParticleEmitter, Velocity);
 PIMPL_COMPLEX_TYPE_APIS(ParticleEmitter, Accelerate);

diff --git a/private/Scene/ParticleEmitterImpl.h b/private/Scene/ParticleEmitterImpl.h
@@ -21,7 +21,7 @@ class ParticleEmitterImpl final
 	IMPLEMENT_SIMPLE_TYPE_APIS(ParticleEmitter, ID);
 	IMPLEMENT_SIMPLE_TYPE_APIS(ParticleEmitter, Type);
 	IMPLEMENT_SIMPLE_TYPE_APIS(ParticleEmitter, MeshID);
-	IMPLEMENT_COMPLEX_TYPE_APIS(ParticleEmitter, MaxCount);
+	IMPLEMENT_SIMPLE_TYPE_APIS(ParticleEmitter, MaxCount);
 	IMPLEMENT_COMPLEX_TYPE_APIS(ParticleEmitter, Position);
 	IMPLEMENT_COMPLEX_TYPE_APIS(ParticleEmitter, Velocity);
 	IMPLEMENT_COMPLEX_TYPE_APIS(ParticleEmitter, Accelerate);

diff --git a/private/Scene/SceneDatabaseImpl.cpp b/private/Scene/SceneDatabaseImpl.cpp
@@ -485,8 +485,8 @@ void SceneDatabaseImpl::Validate() const
 
 	for (uint32_t particleIndex = 0U; particleIndex < GetParticleEmitterCount(); ++particleIndex)
 	{
-		const cd::ParticleEmitter& ParticleEmitter = GetParticleEmitter(particleIndex);
-		assert(particleIndex == ParticleEmitter.GetID().Data());
+		const cd::ParticleEmitter& particleEmitter = GetParticleEmitter(particleIndex);
+		assert(particleIndex == particleEmitter.GetID().Data());
 	}
 }
 

diff --git a/public/Scene/ParticleEmitter.h b/public/Scene/ParticleEmitter.h
@@ -19,7 +19,7 @@ class CORE_API ParticleEmitter final
 	EXPORT_SIMPLE_TYPE_APIS(ParticleEmitter, ID);
 	EXPORT_SIMPLE_TYPE_APIS(ParticleEmitter, Type);
 	EXPORT_SIMPLE_TYPE_APIS(ParticleEmitter, MeshID);
-	EXPORT_COMPLEX_TYPE_APIS(ParticleEmitter, MaxCount);
+	EXPORT_SIMPLE_TYPE_APIS(ParticleEmitter, MaxCount);
 	EXPORT_COMPLEX_TYPE_APIS(ParticleEmitter, Position);
 	EXPORT_COMPLEX_TYPE_APIS(ParticleEmitter, Velocity);
 	EXPORT_COMPLEX_TYPE_APIS(ParticleEmitter, Accelerate);