Changeset 1777 for code/branches/core3/src/orxonox

Timestamp:

Sep 14, 2008, 1:03:48 PM (16 years ago)

Author:

rgrieder

Message:

svn save

Location:

code/branches/core3/src/orxonox

Files:

• Orxonox.cc (modified) (5 diffs)
• Orxonox.h (modified) (1 diff)

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

@@ -34 +34 @@
 // Precompiled Headers
 #include "OrxonoxStableHeaders.h"
+#include "util/MathConvert.h"
 #include "Orxonox.h"
 
@@ -77 +78 @@
 #include "Settings.h"
 
+
 #define TestConv(nr, Type1, var1, Type2, res) \
     Type1 var##nr##1##var1; \
@@ -98 +100 @@
 
 class FooBar { };
+
+inline bool explicitConversion(FooBar* output, std::string input)
+{
+    return true;
+}
+
+//inline bool explicitConversion(std::string* output, const orxonox::Vector3& input)
+//{
+//    std::ostringstream ostream;
+//    if (ostream << input.x << "," << input.y << "," << input.z)
+//    {
+//        (*output) = ostream.str();
+//        return true;
+//    }
+//    return false;
+//}
+
 
 
@@ -212 +231 @@
     Factory::createClassHierarchy();
 
-    Radian nmbr;
-    float res;
+    std::string nmbr;
+    char res('a');
     //const char* nmbr;
     //const char* str;
-    convertValue(&res, nmbr);
+    convertValue(&nmbr, res);
     //const unsigned int blah = 4;
     //convertValue(nmbr, blah);
@@ -226 +245 @@
     FooBar asdf;
     std::string asdf2;
+    std::ostringstream oss;
+    char blah(' ');
+    oss << blah;
     std::cout << asdf2;
     ConvertValue(&asdf2, asdf);
+    //if (conversionTests::OStreamOperator<FooBar>::exists)
+    //    int asdfasdfasdf = 7;
     //COUT(3) << asdf;
 

code/branches/core3/src/orxonox/Orxonox.h

@@ -35 +35 @@
 #ifndef _Orxonox_H__
 #define _Orxonox_H__
-inline bool explicitConversion(float* output, const double input)
-{
-    *output = 2*input;
-    return true;
-}
 
 #include "OrxonoxPrereqs.h"