Changeset 9709 in orxonox.OLD for branches/new_class_id/src/lib/graphics

Timestamp:

Aug 31, 2006, 10:51:08 PM (18 years ago)

Author:

bensch

Message:

orxonox/branches/new_class_id: new_class ID working, adapdet many classes, and reinvented some of the ClassID stuff

Location:

branches/new_class_id/src/lib/graphics

Files:

• effects/cloud_effect.cc (modified) (2 diffs)
• effects/fog_effect.cc (modified) (2 diffs)
• effects/lense_flare.cc (modified) (1 diff)
• effects/lightning_effect.cc (modified) (2 diffs)
• effects/rain_effect.cc (modified) (2 diffs)
• effects/snow_effect.cc (modified) (2 diffs)
• effects/volfog_effect.cc (modified) (1 diff)
• light.cc (modified) (1 diff)
• render2D/image_plane.cc (modified) (1 diff)

branches/new_class_id/src/lib/graphics/effects/cloud_effect.cc

@@ -40 +40 @@
 float     CloudEffect::fadeTime;
 
+NewObjectListDefinitionID(CloudEffect, CL_CLOUD_EFFECT);
 
 
@@ -56 +57 @@
 
 
-CREATE_FACTORY(CloudEffect, CL_CLOUD_EFFECT);
-NewObjectListDefinitionID(CloudEffect, CL_CLOUD_EFFECT);
+CREATE_FACTORY(CloudEffect);
 
 CloudEffect::CloudEffect(const TiXmlElement* root) {

branches/new_class_id/src/lib/graphics/effects/fog_effect.cc

@@ -22 +22 @@
 #include "cloud_effect.h"
 
+NewObjectListDefinition(FogEffect);
 // Define shell commands
 //SHELL_COMMAND(activate, FogEffect, activateFog);
@@ -37 +38 @@
                        );
 
-CREATE_FACTORY(FogEffect, CL_FOG_EFFECT);
-NewObjectListDefinition(FogEffect);
+CREATE_FACTORY(FogEffect);
 
 /**

branches/new_class_id/src/lib/graphics/effects/lense_flare.cc

@@ -35 +35 @@
 #include "class_id.h"
 
-CREATE_FACTORY(LenseFlare, CL_LENSE_FLARE);
 NewObjectListDefinitionID(LenseFlare, CL_LENSE_FLARE);
+CREATE_FACTORY(LenseFlare);
 
 /**

branches/new_class_id/src/lib/graphics/effects/lightning_effect.cc

@@ -29 +29 @@
 #include "class_id.h"
 
+NewObjectListDefinitionID(LightningEffect, CL_LIGHTNING_EFFECT);
+
 SHELL_COMMAND(activate, LightningEffect, activateLightning);
 SHELL_COMMAND(deactivate, LightningEffect, deactivateLightning);
@@ -37 +39 @@
                        );
 
-CREATE_FACTORY(LightningEffect, CL_LIGHTNING_EFFECT);
-NewObjectListDefinitionID(LightningEffect, CL_LIGHTNING_EFFECT);
+CREATE_FACTORY(LightningEffect);
 
 LightningEffect::LightningEffect(const TiXmlElement* root) {

branches/new_class_id/src/lib/graphics/effects/rain_effect.cc

@@ -33 +33 @@
 #include "class_id.h"
 
+NewObjectListDefinitionID(RainEffect, CL_RAIN_EFFECT);
+
 // Define shell commands
 //SHELL_COMMAND(activate, RainEffect, activateRain);
@@ -48 +50 @@
                        );
 
-CREATE_FACTORY(RainEffect, CL_RAIN_EFFECT);
-NewObjectListDefinitionID(RainEffect, CL_RAIN_EFFECT);
+CREATE_FACTORY(RainEffect);
 
 /**

branches/new_class_id/src/lib/graphics/effects/snow_effect.cc

@@ -32 +32 @@
 #include "class_id.h"
 
+NewObjectListDefinitionID(SnowEffect, CL_SNOW_EFFECT);
 SHELL_COMMAND(activate, SnowEffect, activateSnow);
 SHELL_COMMAND(deactivate, SnowEffect, deactivateSnow);
@@ -41 +42 @@
                        );
 
-CREATE_FACTORY(SnowEffect, CL_SNOW_EFFECT);
-NewObjectListDefinitionID(SnowEffect, CL_SNOW_EFFECT);
+CREATE_FACTORY(SnowEffect);
 
 SnowEffect::SnowEffect(const TiXmlElement* root)

branches/new_class_id/src/lib/graphics/effects/volfog_effect.cc

@@ -48 +48 @@
 
 #include "class_id.h"
-
-CREATE_FACTORY(VolFogEffect, CL_VOLFOG_EFFECT);
 NewObjectListDefinitionID(VolFogEffect, CL_VOLFOG_EFFECT);
+CREATE_FACTORY(VolFogEffect);
 
 VolFogEffect::VolFogEffect(const TiXmlElement* root) {

branches/new_class_id/src/lib/graphics/light.cc

@@ -29 +29 @@
 #include "class_id.h"
 
-CREATE_FACTORY(Light, CL_LIGHT);
 NewObjectListDefinitionID(Light, CL_LIGHT);
+CREATE_FACTORY(Light);
 
 //! Definition of the Lights and their Names

branches/new_class_id/src/lib/graphics/render2D/image_plane.cc

@@ -25 +25 @@
 
 #include "class_id.h"
-CREATE_FACTORY(ImagePlane, CL_IMAGE_ENTITY);
 
-NewObjectListDefinitionID(ImagePlane, CL_IMAGE_ENTITY);
+NewObjectListDefinitionID(ImagePlane, CL_IMAGE_PLANE);
+CREATE_FACTORY(ImagePlane);