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

Timestamp:

Sep 16, 2006, 3:34:04 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: does not run anymore with scripts, but i think, it is on track

lua_State is now handled over the Global Executor

Location:

branches/new_class_id/src/lib/graphics/effects

Files:

• cloud_effect.cc (modified) (1 diff)
• fog_effect.cc (modified) (2 diffs)
• lightning_effect.cc (modified) (2 diffs)
• rain_effect.cc (modified) (2 diffs)
• snow_effect.cc (modified) (1 diff)

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

@@ -50 +50 @@
 
 CREATE_SCRIPTABLE_CLASS(CloudEffect, CloudEffect::classID(),
-                        addMethod("skyColor", ExecutorLua4<CloudEffect,float,float,float,float>(&CloudEffect::shellSkyColor))
-                        ->addMethod("cloudColor", ExecutorLua4<CloudEffect,float,float,float,float>(&CloudEffect::shellCloudColor))
-                        ->addMethod("activate", ExecutorLua0<CloudEffect>(&CloudEffect::activate))
-                        ->addMethod("deactivate", ExecutorLua0<CloudEffect>(&CloudEffect::deactivate))
+                        addMethod("skyColor", Executor4<CloudEffect, lua_State*,float,float,float,float>(&CloudEffect::shellSkyColor))
+                        ->addMethod("cloudColor", Executor4<CloudEffect, lua_State*,float,float,float,float>(&CloudEffect::shellCloudColor))
+                        ->addMethod("activate", Executor0<CloudEffect, lua_State*>(&CloudEffect::activate))
+                        ->addMethod("deactivate", Executor0<CloudEffect, lua_State*>(&CloudEffect::deactivate))
                        );
 

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

@@ -21 +21 @@
 #include "script_class.h"
 #include "cloud_effect.h"
+#include "debug.h"
 
 ObjectListDefinition(FogEffect);
@@ -32 +33 @@
 
 CREATE_SCRIPTABLE_CLASS(FogEffect, FogEffect::classID(),
-                        addMethod("fadeIn", ExecutorLua0<FogEffect>(&FogEffect::fadeInFog))
-                            ->addMethod("fadeOut", ExecutorLua0<FogEffect>(&FogEffect::fadeOutFog))
-                            ->addMethod("activate", ExecutorLua0<FogEffect>(&FogEffect::activate))
-                            ->addMethod("deactivate", ExecutorLua0<FogEffect>(&FogEffect::deactivate))
+                        addMethod("fadeIn", Executor0<FogEffect, lua_State*>(&FogEffect::fadeInFog))
+                            ->addMethod("fadeOut", Executor0<FogEffect, lua_State*>(&FogEffect::fadeOutFog))
+                            ->addMethod("activate", Executor0<FogEffect, lua_State*>(&FogEffect::activate))
+                            ->addMethod("deactivate", Executor0<FogEffect, lua_State*>(&FogEffect::deactivate))
                        );
 

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

@@ -27 +27 @@
 #include "cloud_effect.h"
 #include "script_class.h"
+#include "debug.h"
 #include "class_id_DEPRECATED.h"
 
@@ -35 +36 @@
 
 CREATE_SCRIPTABLE_CLASS(LightningEffect, LightningEffect::classID(),
-                        addMethod("activate", ExecutorLua0<LightningEffect>(&LightningEffect::activate))
-                            ->addMethod("deactivate", ExecutorLua0<LightningEffect>(&LightningEffect::deactivate))
+                        addMethod("activate", Executor0<LightningEffect, lua_State*>(&LightningEffect::activate))
+                            ->addMethod("deactivate", Executor0<LightningEffect, lua_State*>(&LightningEffect::deactivate))
                        );
 

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

@@ -30 +30 @@
 #include "cloud_effect.h"
 #include "script_class.h"
+#include "debug.h"
 
 #include "class_id_DEPRECATED.h"
@@ -44 +45 @@
 
 CREATE_SCRIPTABLE_CLASS(RainEffect, RainEffect::classID(),
-                        addMethod("startRaining", ExecutorLua0<RainEffect>(&RainEffect::startRaining))
-                            ->addMethod("stopRaining", ExecutorLua0<RainEffect>(&RainEffect::stopRaining))
-                            ->addMethod("activate", ExecutorLua0<RainEffect>(&RainEffect::activate))
-                            ->addMethod("deactivate", ExecutorLua0<RainEffect>(&RainEffect::deactivate))
+                        addMethod("startRaining", Executor0<RainEffect, lua_State*>(&RainEffect::startRaining))
+                            ->addMethod("stopRaining", Executor0<RainEffect, lua_State*>(&RainEffect::stopRaining))
+                            ->addMethod("activate", Executor0<RainEffect, lua_State*>(&RainEffect::activate))
+                            ->addMethod("deactivate", Executor0<RainEffect, lua_State*>(&RainEffect::deactivate))
                        );
 

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

@@ -38 +38 @@
 
 CREATE_SCRIPTABLE_CLASS(SnowEffect, SnowEffect::classID(),
-                            addMethod("activate", ExecutorLua0<SnowEffect>(&SnowEffect::activate))
-                            ->addMethod("deactivate", ExecutorLua0<SnowEffect>(&SnowEffect::deactivate))
+                            addMethod("activate", Executor0<SnowEffect, lua_State*>(&SnowEffect::activate))
+                            ->addMethod("deactivate", Executor0<SnowEffect, lua_State*>(&SnowEffect::deactivate))
                        );