Panagiotis Christopoulos Charitos 15 lat temu
rodzic
commit
1b313ae57c
2 zmienionych plików z 2 dodań i 2 usunięć
  1. 1 1
      src/Physics/PhyWorld.cpp
  2. 1 1
      src/Scene/ParticleEmitter.cpp

+ 1 - 1
src/Physics/PhyWorld.cpp

@@ -24,7 +24,7 @@ btRigidBody* PhyWorld::createNewRigidBody(float mass, const Transform& startTran
 	btRigidBody* body = new btRigidBody(cInfo);
 	body->setContactProcessingThreshold(defaultContactProcessingThreshold);
 
-	if(mask==-1 & group==-1)
+	if(mask==-1 && group==-1)
 		dynamicsWorld->addRigidBody(body);
 	else
 		dynamicsWorld->addRigidBody(body, group, mask);

+ 1 - 1
src/Scene/ParticleEmitter.cpp

@@ -129,7 +129,7 @@ void ParticleEmitter::update()
 			if(minGravity != maxGravity)
 			{
 				grav = Vec3(Util::randRange(minGravity.x,maxGravity.x), Util::randRange(minGravity.y,maxGravity.y),
-			               Util::randRange(minGravity.z,maxGravity.z));
+			              Util::randRange(minGravity.z,maxGravity.z));
 			}
 			else
 			{