Changeset 1037

Timestamp:

Apr 13, 2008, 2:24:00 PM (16 years ago)

Author:

landauf

Message:

moved tolua from util to core because of circular dependencies
reverted some bugfixes in ParticleInterface

Location:

code/trunk

Files:

• cmake/FindLua.cmake (modified) (1 diff)
• src/orxonox/CMakeLists.txt (modified) (1 diff)
• src/orxonox/core/CMakeLists.txt (modified) (3 diffs)
• src/orxonox/core/Script.cc (modified) (2 diffs)
• src/orxonox/core/tolua (moved) (moved from code/trunk/src/util/tolua)
• src/orxonox/core/tolua/tolua_bind.cc (modified) (1 diff)
• src/orxonox/objects/SpaceShip.h (modified) (1 diff)
• src/orxonox/particle/ParticleInterface.cc (modified) (3 diffs)
• src/orxonox/particle/ParticleInterface.h (modified) (2 diffs)
• src/util/CMakeLists.txt (modified) (2 diffs)

code/trunk/cmake/FindLua.cmake

@@ -17 +17 @@
 FIND_PATH(Lua_INCLUDE_DIR lua.h
         /usr/include/lua5.1
-        /usr/local/include/lua5.1)
+        /usr/local/include/lua5.1
+        ../libs/lua-5.1.3/src)
 
 FIND_LIBRARY(Lua_LIBRARIES lua5.1
         /usr/lib
-        /usr/local/lib)
+        /usr/local/lib
+        ../libs/lua-5.1.3/lib)
 
 IF (NOT Lua_INCLUDE_DIR)

code/trunk/src/orxonox/CMakeLists.txt

@@ -38 +38 @@
 TARGET_LINK_LIBRARIES( orxonox
   ${OGRE_LIBRARIES}
-  ${OIS_LIBRARIES}
   util
   core

code/trunk/src/orxonox/core/CMakeLists.txt

@@ +1 @@
+AUX_SOURCE_DIRECTORY(tolua TOLUA_SRC_FILES)
+
 SET( CORE_SRC_FILES
+  ${TOLUA_SRC_FILES}
   OrxonoxClass.cc
   BaseObject.cc
@@ -7 +10 @@
   InputHandler.cc
   InputManager.cc
+  InputEventListener.cc
   MetaObjectList.cc
   ConfigValueContainer.cc
@@ -27 +31 @@
 TARGET_LINK_LIBRARIES( core
   util
+
   ${Lua_LIBRARIES}
+  ${OIS_LIBRARIES}
 )

code/trunk/src/orxonox/core/Script.cc

@@ -31 +31 @@
 #include <map>
 
-#include "../core/CoreIncludes.h"
+#include "CoreIncludes.h"
 
 extern "C" {
@@ -38 +38 @@
 }
 
-#include "util/tolua/tolua++.h"
-#include "util/tolua/tolua_bind.h"
+#include "tolua/tolua++.h"
+#include "tolua/tolua_bind.h"
 
 namespace orxonox

code/trunk/src/orxonox/core/tolua/tolua_bind.cc

@@ -14 +14 @@
 TOLUA_API int  tolua_orxonox_open (lua_State* tolua_S);
 
-#include "../../orxonox/core/Script.h"
+#include "../Script.h"
 
 /* function to register type */

code/trunk/src/orxonox/objects/SpaceShip.h

@@ -82 +82 @@
             float mouseY_;
 
-            int emitterRate_;
+            float emitterRate_;
     };
 }

code/trunk/src/orxonox/particle/ParticleInterface.cc

@@ -69 +69 @@
   {
     //Abgleichen der anderen Emitter an die Variabeln
-    for (int i=1; i < numberOfEmitters_; i++) {
+    for (int i=0; i < numberOfEmitters_; i++) {
       particleSystem_->getEmitter(i)->setColour( colour_ );
       particleSystem_->getEmitter(i)->setTimeToLive( distance_ );
@@ -84 +84 @@
   }
 
-  void ParticleInterface::setRate(int r)
+  void ParticleInterface::setRate(float r)
   {
     rate_ = r;
@@ -127 +127 @@
   Vector3 ParticleInterface::getPositionOfEmitter ( int emitterNr )
   {
-    return particleSystem_->getEmitter(0)->getPosition();
+    return particleSystem_->getEmitter(emitterNr)->getPosition();
   }
 

code/trunk/src/orxonox/particle/ParticleInterface.h

@@ -48 +48 @@
     void setVelocity( Real v );
 
-    inline int getRate()
+    inline float getRate()
       { return rate_; };
-    void setRate( int r );
+    void setRate( float r );
 
     inline Real getDistance()
@@ -71 +71 @@
     Real distance_;
     Real velocity_;
-    int rate_;
+    float rate_;
     ColourValue colour_;
     int numberOfEmitters_;

code/trunk/src/util/CMakeLists.txt

@@ -2 +2 @@
 
 AUX_SOURCE_DIRECTORY(tinyxml TINYXML_SRC_FILES)
-AUX_SOURCE_DIRECTORY(tolua TOLUA_SRC_FILES)
 
 SET (UTIL_SRC_FILES
@@ -13 +12 @@
   MultiTypeMath.cc
   ${TINYXML_SRC_FILES}
-  ${TOLUA_SRC_FILES}
 )