Changeset 1085 for code/trunk

Timestamp:

Apr 16, 2008, 10:00:56 PM (17 years ago)

Author:

rgrieder

Message:

stupid people should be punished…

Location:

code/trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• bin/levels/sample.oxw (modified) (1 diff)
• src/core/Loader.cc (modified) (2 diffs)
• src/util/CMakeLists.txt (modified) (1 diff)

code/trunk/CMakeLists.txt

@@ -55 +55 @@
 # FIND_PACKAGE(CEGUI_OGRE)
 FIND_PACKAGE(ENet)
-FIND_PACKAGE(Boost)
+FIND_PACKAGE(Boost REQUIRED thread)
 FIND_PACKAGE(OpenAL)
 FIND_PACKAGE(ALUT)

code/trunk/bin/levels/sample.oxw

@@ -115 +115 @@
 
 <?lua
-for i = 1, 2, 1 
+for i = 1, 226, 1 
 do ?>
   <Model position="<?lua print(math.random(-19597, 18732))?>, <?lua print(math.random(-19597, 18732)) ?>, <?lua print(math.random(-19597, 18732)) ?>" scale="<?lua print(math.random( 20, 119)) ?>" mesh="ast<?lua print(i%6 + 1) ?>.mesh" rotationAxis="<?lua print(math.random()) ?>, <?lua print(math.random()) ?>, <?lua print(math.random()) ?>" rotationRate="<?lua print(math.random(16, 44)) ?>" />

code/trunk/src/core/Loader.cc

@@ -115 +115 @@
         Script::init(Script::getLuaState());
         Script::run();*/
-        Script* lua = Script::getInstance();
-        lua->loadFile(level->getFile(), true);
-        lua->run();
+        //Script* lua = Script::getInstance();
+        //lua->loadFile(level->getFile(), true);
+        //lua->run();
 
         try
@@ -124 +124 @@
             COUT(3) << "Mask: " << Loader::currentMask_s << std::endl;
 
-            //ticpp::Document xmlfile(level->getFile());
-            //xmlfile.LoadFile();
+            ticpp::Document xmlfile(level->getFile());
+            xmlfile.LoadFile();
             //ticpp::Element myelement(*Script::getFileString());
-            ticpp::Document xmlfile;
-            //xmlfile.ToDocument();
-            xmlfile.Parse(lua->getLuaOutput(), true);
+            //ticpp::Document xmlfile;
+            xmlfile.ToDocument();
+            //xmlfile.Parse(lua->getLuaOutput(), true);
 
             ticpp::Element rootElement;

code/trunk/src/util/CMakeLists.txt

@@ -10 +10 @@
   MultiTypeString.cc
   MultiTypeMath.cc
-  tolua_event.c
-  tolua_is.c
-  tolua_map.c
-  tolua_push.c
-  tolua_to.c
+  tolua/tolua_event.c
+  tolua/tolua_is.c
+  tolua/tolua_map.c
+  tolua/tolua_push.c
+  tolua/tolua_to.c
   ${TINYXML_SRC_FILES}
 )