Explorar el Código

comment out unimplemented oriented particles

cxgeorge hace 23 años
padre
commit
d5122190d1

+ 13 - 8
panda/src/particlesystem/Sources.pp

@@ -16,8 +16,6 @@
      config_particlesystem.h discEmitter.I discEmitter.h  \
      geomParticleRenderer.I geomParticleRenderer.h lineEmitter.I  \
      lineEmitter.h lineParticleRenderer.I lineParticleRenderer.h  \
-     orientedParticle.I orientedParticle.h  \
-     orientedParticleFactory.I orientedParticleFactory.h  \
      particleSystem.I particleSystem.h particleSystemManager.I  \
      particleSystemManager.h pointEmitter.I pointEmitter.h  \
      pointParticle.h pointParticleFactory.h  \
@@ -30,15 +28,18 @@
      spriteParticleRenderer.h tangentRingEmitter.I  \
      tangentRingEmitter.h zSpinParticle.I zSpinParticle.h  \
      zSpinParticleFactory.I zSpinParticleFactory.h  \
-     particleCommonFuncs.h  \
+     particleCommonFuncs.h  
+
+// oriented particles currently unimplemented
+//     orientedParticle.I orientedParticle.h  \
+//     orientedParticleFactory.I orientedParticleFactory.h  \
     
  #define INCLUDED_SOURCES \
      baseParticle.cxx baseParticleEmitter.cxx baseParticleFactory.cxx \
      baseParticleRenderer.cxx boxEmitter.cxx \
      config_particlesystem.cxx discEmitter.cxx \
      geomParticleRenderer.cxx lineEmitter.cxx \
-     lineParticleRenderer.cxx orientedParticle.cxx \
-     orientedParticleFactory.cxx particleSystem.cxx \
+     lineParticleRenderer.cxx particleSystem.cxx \
      particleSystemManager.cxx pointEmitter.cxx pointParticle.cxx \
      pointParticleFactory.cxx pointParticleRenderer.cxx \
      rectangleEmitter.cxx ringEmitter.cxx \
@@ -47,6 +48,8 @@
      tangentRingEmitter.cxx zSpinParticle.cxx \
      zSpinParticleFactory.cxx 
 
+// orientedParticle.cxx orientedParticleFactory.cxx 
+
   #define INSTALL_HEADERS \
     baseParticle.I baseParticle.h baseParticleEmitter.I \
     baseParticleEmitter.h baseParticleFactory.I baseParticleFactory.h \
@@ -54,9 +57,8 @@
     boxEmitter.h config_particlesystem.h discEmitter.I discEmitter.h \
     emitters.h geomParticleRenderer.I geomParticleRenderer.h \
     lineEmitter.I lineEmitter.h lineParticleRenderer.I \
-    lineParticleRenderer.h orientedParticle.I orientedParticle.h \
-    orientedParticleFactory.I orientedParticleFactory.h \
-    particleSystem.I particleSystem.h particleSystemManager.I \
+    lineParticleRenderer.h particleSystem.I particleSystem.h \
+    particleSystemManager.I \
     particleSystemManager.h particlefactories.h particles.h \
     pointEmitter.I pointEmitter.h pointParticle.h \
     pointParticleFactory.h pointParticleRenderer.I \
@@ -69,6 +71,9 @@
     zSpinParticle.h zSpinParticleFactory.I zSpinParticleFactory.h \
     particleCommonFuncs.h
 
+// orientedParticle.I orientedParticle.h \
+// orientedParticleFactory.I orientedParticleFactory.h \
+
   #define IGATESCAN all
 
 #end lib_target

+ 3 - 2
panda/src/particlesystem/particlesystem_composite2.cxx

@@ -7,8 +7,9 @@
 #include "discEmitter.cxx"
 #include "lineEmitter.cxx"
 #include "lineParticleRenderer.cxx"
-#include "orientedParticle.cxx"
-#include "orientedParticleFactory.cxx"
+// oriented particles unimplemented
+//#include "orientedParticle.cxx"
+//#include "orientedParticleFactory.cxx"
 #include "particleSystem.cxx"
 #include "particleSystemManager.cxx"