Changeset 1052 for code/trunk/src/orxonox/objects/Ambient.h

Timestamp:

Apr 14, 2008, 3:42:49 AM (16 years ago)

Author:

landauf

Message:

merged core2 back to trunk
there might be some errors, wasn't able to test it yet due to some strange g++ and linker behaviour.

File:

• code/trunk/src/orxonox/objects/Ambient.h (modified) (1 diff)

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

@@ -43 +43 @@
 
             void loadParams(TiXmlElement* xmlElem);
-            virtual void XMLPort(Element& xmlelement, bool loading);
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
             void setAmbientLight(const ColourValue& colour);
 
+            static void setAmbientLightTest(const ColourValue& colour)
+                { Ambient::instance_s->setAmbientLight(colour); }
+
         private:
-
+            static Ambient* instance_s;
 
     };