Changeset 7028 for code/branches/presentation3/src

Timestamp:

May 30, 2010, 10:21:41 PM (14 years ago)

Author:

rgrieder

Message:

Fixed M_PI problem (not C++).
Note: For the future, we should define pi in Math.h, but we all don't like recompiles before the presentation…

Location:

code/branches/presentation3/src/modules/designtools

Files:

• CreateStars.cc (modified) (2 diffs)
• CreateStars.h (modified) (10 diffs)

code/branches/presentation3/src/modules/designtools/CreateStars.cc

@@ -29 +29 @@
 #include "CreateStars.h"
 
-#include "core/ConsoleCommand.h"
+#include <OgreVector3.h>
+
 #include "core/CoreIncludes.h"
-#include "core/ConfigValueIncludes.h"
-#include "core/ScopedSingletonManager.h"
-#include "core/BaseObject.h"
-
-
 #include "core/XMLPort.h"
-
 #include "graphics/Billboard.h"
-
-#include <OgreVector3.h>
-#include "util/Math.h"
  
 namespace orxonox
 {
-
     CreateFactory(CreateStars);
 
+    static const float pi = 3.14159265359f;
+
     CreateStars::CreateStars(BaseObject* creator) : BaseObject(creator)
-
     {
         RegisterObject(CreateStars);
         this->material_ = "Examples/Flare";
-        this->alpha_ = 0.7;
-        this->alphaDiff_ = 0.5;
-        this->radiusDiff_ = 0.9;
+        this->alpha_ = 0.7f;
+        this->alphaDiff_ = 0.5f;
+        this->radiusDiff_ = 0.9f;
         this->colour_.r = 1;
         this->colour_.g = 1;
         this->colour_.b = 1;
-        this->colourDiff_ = 0.1;
+        this->colourDiff_ = 0.1f;
     }
 
@@ -98 +90 @@
             while(1) 
             {
-                phi = rnd(2*M_PI);
-                teta = rnd(M_PI);
+                phi = rnd(2*pi);
+                teta = rnd(pi);
                 float random = rnd(1);
                 if(sin(teta)>random) break;

code/branches/presentation3/src/modules/designtools/CreateStars.h

@@ -27 +27 @@
  */
 
+#include "DesignToolsPrereqs.h"
 
+#include <string>
+#include "util/Math.h"
 #include "core/BaseObject.h"
-
-#include "graphics/Billboard.h"
-
  
 namespace orxonox
@@ -49 +49 @@
             }
 
-            int getNumStars(){
+            int getNumStars() const {
                 return this->numStars_;
             }
@@ -57 +57 @@
             }
 
-            std::string& getMaterial(){
+            const std::string& getMaterial() const {
                 return this->material_;
             }
@@ -65 +65 @@
             }
 
-            ColourValue& getColour() { 
+            const ColourValue& getColour() const { 
                 return this->colour_;
             }
@@ -73 +73 @@
             }
 
-            float getAlpha() {
+            float getAlpha() const {
                 return this->alpha_;
             }
@@ -81 +81 @@
             }
 
-            float getColourDiff() {
+            float getColourDiff() const {
                 return this->colourDiff_;
             }
@@ -89 +89 @@
             }
 
-            float getAlphaDiff() {
+            float getAlphaDiff() const {
                 return this->alphaDiff_;
             }
@@ -97 +97 @@
             }
 
-            float getRadiusDiff() {
+            float getRadiusDiff() const {
                 return this->radiusDiff_;
             }
@@ -106 +106 @@
             }
 
-            unsigned int getRadius(){
+            unsigned int getRadius()const {
                 return this->radius_;
             }
@@ -115 +115 @@
             int numStars_;
             std::string material_;
-            orxonox::ColourValue colour_;
+            ColourValue colour_;
             std::vector<Billboard*> billboards_;
-            float radius_;
+            unsigned int radius_;
             float alpha_;
             float colourDiff_;