Changeset 1188 for code/branches/console/src/orxonox

Timestamp:

Apr 26, 2008, 2:50:04 AM (17 years ago)

Author:

landauf

Message:

removed some bugs
tcl knows now orxonox

Location:

code/branches/console/src/orxonox

Files:

• Orxonox.cc (modified) (2 diffs)
• objects/Ambient.h (modified) (1 diff)

code/branches/console/src/orxonox/Orxonox.cc

@@ -129 +129 @@
   {
   public:
-    static void calculate(const std::string& calculation)
+    static float calculate(const std::string& calculation)
     {
       ExprParser expr(calculation);
@@ -141 +141 @@
           std::cout << "Warning: Expression could not be parsed to the end! Remains: '"
               << expr.getRemains() << "'" << std::endl;
+        return expr.getResult();
       }
       else
+      {
         std::cout << "Cannot calculate expression: Parse error" << std::endl;
+        return 0;
+      }
     }
   };

code/branches/console/src/orxonox/objects/Ambient.h

@@ -48 +48 @@
 
             static void setAmbientLightTest(const ColourValue& colour)
-                { Ambient::instance_s->setAmbientLight(colour); }
+                { std::cout << "setambientlight: " << colour << std::endl; Ambient::instance_s->setAmbientLight(colour); }
 
         private: