git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5489 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 3aeae8a885105e1e868b3ef4f32c613feaad2d3a
Former-commit-id: 5b668455a2969dbd79c143996bf401bcce4e2152

src/modules/graphic/osggraph/CMakeLists.txt

@@ -1,22 +1,74 @@
 INCLUDE(../../../../cmake/macros.cmake)
 
-SET(OSGGRAPH_HEADERS OsgVectorArrayAdapter.h OsgColor.h OsgAtomic.h
-                     OsgReferenced.h #OsgSharedPtr.h 
-		     OsgSphere.h OsgSun.h OsgMoon.h OsgStars.h OsgDome.h 
-			#OsgStateAttributeFactory.h
-                     OsgCloud.h OsgSky.h
-                     AccGeode.h AccException.h ReaderWriterACC.h
-                     OsgLoader.h OsgScenery.h OsgRender.h OsgMath.h OsgMain.h
-                     OsgView.h OsgGraph.h OsgCar.h OsgWheel.h OsgBrake.h 
-                     OsgScreens.h OsgCamera.h)
+SET(OSGGRAPH_HEADERS OsgUtil/OsgVectorArrayAdapter.h
+	             OsgUtil/OsgColor.h
+		     OsgUtil/OsgAtomic.h
+                     OsgUtil/OsgReferenced.h 
+		     #OsgUtil/OsgSharedPtr.h
+		     #OsgUtil/OsgStateAttributeFactory.h 
+		     OsgUtil/OsgSphere.h 
+		     OsgUtil/OsgMath.h
+
+                     OsgSky/OsgSun.h 
+                     OsgSky/OsgMoon.h 
+                     OsgSky/OsgStars.h 
+                     OsgSky/OsgDome.h 
+                     OsgSky/OsgCloud.h
+		     OsgSky/OsgSky.h
+                     
+		     OsgLoader/AccGeode.h
+		     OsgLoader/AccException.h
+		     OsgLoader/ReaderWriterACC.h
+                     OsgLoader/OsgLoader.h
+
+		     OsgWorld/OsgScenery.h
+
+		     OsgFX/OsgRender.h
+                       
+                     OsgView/OsgView.h  	
+                     OsgView/OsgScreens.h 
+                     OsgView/OsgCamera.h
+
+		     OsgCar/OsgCar.h 
+		     OsgCar/OsgWheel.h 
+		     OsgCar/OsgBrake.h
+
+		     OsgGraph.h
+		     OsgMain.h
+                     )
 			
-SET(OSGGRAPH_SOURCES OsgSphere.cpp OsgSun.cpp OsgMoon.cpp OsgStars.cpp 
-                     OsgDome.cpp #OsgStateAttributeFactory.cpp 
-                     OsgCloud.cpp OsgSky.cpp AccGeode.cpp AccException.cpp
-                     ReaderWriterACC.cpp OsgLoader.cpp OsgBackground.cpp
-                     OsgScenery.cpp OsgView.cpp OsgRender.cpp
-                     OsgMath.cpp OsgMain.cpp OsgGraph.cpp OsgCar.cpp OsgWheel.cpp
-                     OsgBrake.cpp OsgScreens.cpp OsgCamera.cpp)
+SET(OSGGRAPH_SOURCES OsgUtil/OsgSphere.cpp 
+                     #OsgUtil/OsgStateAttributeFactory.cpp 
+		     OsgUtil/OsgMath.cpp
+
+		     OsgSky/OsgSun.cpp 
+		     OsgSky/OsgMoon.cpp 
+		     OsgSky/OsgStars.cpp 
+                     OsgSky/OsgDome.cpp  
+                     OsgSky/OsgCloud.cpp 
+                     OsgSky/OsgSky.cpp 
+
+                     OsgLoader/AccGeode.cpp 
+                     OsgLoader/AccException.cpp
+                     OsgLoader/ReaderWriterACC.cpp 
+                     OsgLoader/OsgLoader.cpp 
+
+                     OsgWorld/OsgBackground.cpp
+                     OsgWorld/OsgScenery.cpp 
+
+		     OsgFX/OsgRender.cpp
+
+                     OsgView/OsgView.cpp 
+                     OsgView/OsgScreens.cpp
+		     OsgView/OsgCamera.cpp
+
+		     OsgCar/OsgCar.cpp 
+		     OsgCar/OsgWheel.cpp
+                     OsgCar/OsgBrake.cpp
+
+		     OsgGraph.cpp
+		     OsgMain.cpp
+		     )
 
 ADD_INTERFACE_INCLUDEDIR()
 ADD_SDLIB_INCLUDEDIR(portability math tgf tgfclient robottools)

src/modules/graphic/osggraph/OsgCar/OsgBrake.cpp

@@ -3,7 +3,7 @@
 #include <portability.h>
 
 #include "OsgBrake.h"
-#include "OsgMath.h"
+#include "../OsgUtil/OsgMath.h"
 
 void SDBrakes::setCar(tCarElt * car)
 {

src/modules/graphic/osggraph/OsgCar/OsgCar.cpp

@@ -32,13 +32,13 @@
 
 #include <robottools.h>
 
-#include "OsgLoader.h"
+#include "../OsgLoader/OsgLoader.h"
 #include "OsgCar.h"
-#include "OsgMath.h"
-#include "OsgScreens.h"
-#include "OsgRender.h"
-#include "OsgMain.h"
-#include "OsgSky.h"
+#include "../OsgUtil/OsgMath.h"
+#include "../OsgView/OsgScreens.h"
+#include "../OsgFX/OsgRender.h"
+#include "../OsgMain.h"
+#include "../OsgSky/OsgSky.h"
 
 
 
@@ -81,12 +81,15 @@ public :
        // stateset->addUniform(normalMap);
         specularColor = new osg::Uniform("specularColor", osg::Vec4(0.8f,0.8f,0.8f,1.0f));
         stateset->addUniform(specularColor);
-        lightVector = new osg::Uniform("lightvector",osg::Vec3());
+        /*lightVector = new osg::Uniform("lightvector",osg::Vec3());
         stateset->addUniform(lightVector);
         lightPower = new osg::Uniform("lightpower",osg::Vec4());
         stateset->addUniform(lightPower);
         ambientColor =new osg::Uniform("ambientColor",osg::Vec4());
-        stateset->addUniform(ambientColor);
+        stateset->addUniform(ambientColor);*/
+        lightVector = stateset->getOrCreateUniform("lightvector",osg::Uniform::FLOAT_VEC3);
+        lightPower = stateset->getOrCreateUniform("lightpower",osg::Uniform::FLOAT_VEC4);
+        ambientColor = stateset->getOrCreateUniform("ambientColor",osg::Uniform::FLOAT_VEC4);
         shininess = new osg::Uniform("smoothness", 300.0f);
         stateset->addUniform(shininess);
     }
@@ -118,6 +121,15 @@ public :
        //GfOut("View Point : %f %f %f\n",pv.x(),pv.y(),pv.z());
     //  GfOut("Scene Color : %f %f %f %f\n",scene_color._v[0],scene_color._v[1],scene_color._v[2],scene_color._v[3]);
 
+        osg::Uniform::Type t1 = lightVector->getType();
+        osg::Uniform::Type t2 = lightPower->getType();
+        osg::Uniform::Type t3 = ambientColor->getType();
+
+        GfOut("LV (vec3) %s, LP (vec4) %s, AC(vec4), %s\n",
+              osg::Uniform::getTypename(t1),osg::Uniform::getTypename(t2),osg::Uniform::getTypename(t3));
+
+
+
         this->lightVector->set(osg::Vec3f(lv.x(),lv.y(),lv.z()));
         this->lightPower->set(sun_color);
         this->ambientColor->set(scene_color);

src/modules/graphic/osggraph/OsgCar/OsgWheel.cpp

@@ -1,6 +1,6 @@
 #include <portability.h>
 
-#include "OsgLoader.h"
+#include "../OsgLoader/OsgLoader.h"
 #include "OsgWheel.h"
 #include <osgDB/WriteFile>
 

src/modules/graphic/osggraph/OsgFX/OsgRender.cpp

@@ -39,12 +39,12 @@
 #include <osgShadow/StandardShadowMap>
 //#include <osgShadow/ViewDependentShadowMap>
 
-#include "OsgMain.h"
+#include "../OsgMain.h"
 #include "OsgRender.h"
-#include "OsgSky.h"
-#include "OsgScenery.h"
-#include "OsgMath.h"
-#include "OsgColor.h"
+#include "../OsgSky/OsgSky.h"
+#include "../OsgWorld/OsgScenery.h"
+#include "../OsgUtil/OsgMath.h"
+#include "../OsgUtil/OsgColor.h"
 
 #include <glfeatures.h>	//gluXXX
 #include <robottools.h>	//RtXXX()

src/modules/graphic/osggraph/OsgFX/OsgRender.h

@@ -26,7 +26,7 @@
 #include <track.h>	 //tTrack
 #include <raceman.h> // tSituation
 
-#define SHADOW_TECHNIQUE 0
+#define SHADOW_TECHNIQUE 3
 
 class SDSky;
 class SDScenery;

src/modules/graphic/osggraph/OsgMain.cpp

@@ -31,11 +31,11 @@
 #include <graphic.h>
 
 #include "OsgMain.h"
-#include "OsgCar.h"
-#include "OsgScenery.h"
-#include "OsgRender.h"
-#include "OsgMath.h"
-#include "OsgScreens.h"
+#include "OsgCar/OsgCar.h"
+#include "OsgWorld/OsgScenery.h"
+#include "OsgFX/OsgRender.h"
+#include "OsgUtil/OsgMath.h"
+#include "OsgView/OsgScreens.h"
 
 //extern	osg::Timer m_timer;
 //extern	osg::Timer_t m_start_tick;

src/modules/graphic/osggraph/OsgSky/OsgCloud.cpp

@@ -37,7 +37,7 @@
 
 #include <tgf.h>
 
-#include "OsgMath.h"
+#include "../OsgUtil/OsgMath.h"
 //#include "OsgNewcloud.h"
 //#include "OsgCloudfield.h"
 //#include "OsgStateAttributeFactory.h"

src/modules/graphic/osggraph/OsgSky/OsgDome.cpp

@@ -32,8 +32,8 @@
 
 #include<tgf.h>
 
-#include "OsgMath.h"
-#include "OsgVectorArrayAdapter.h"
+#include "../OsgUtil/OsgMath.h"
+#include "../OsgUtil/OsgVectorArrayAdapter.h"
 #include "OsgDome.h"
 
 using namespace osg;

src/modules/graphic/osggraph/OsgSky/OsgDome.h

@@ -23,8 +23,8 @@
 #include <osg/Array>
 #include <osg/MatrixTransform>
 
-#include "OsgReferenced.h"
-#include "OsgMath.h"
+#include "../OsgUtil/OsgReferenced.h"
+#include "../OsgUtil/OsgMath.h"
 
 namespace osg
 {

src/modules/graphic/osggraph/OsgSky/OsgMoon.cpp

@@ -32,9 +32,9 @@
 #include <osg/Texture2D>
 #include <osgDB/ReadFile>
 
-#include "OsgMath.h"
-#include "OsgColor.h"
-#include "OsgSphere.h"
+#include "../OsgUtil/OsgMath.h"
+#include "../OsgUtil/OsgColor.h"
+#include "../OsgUtil/OsgSphere.h"
 #include "OsgMoon.h"
 
 // Constructor

src/modules/graphic/osggraph/OsgSky/OsgStars.cpp

@@ -34,7 +34,7 @@
 
 //#include "OsgConstants.h"
 #include "OsgStars.h"
-#include "OsgMath.h"
+#include "../OsgUtil/OsgMath.h"
 
 // Constructor
 SDStars::SDStars( void ) : old_phase(-1)

src/modules/graphic/osggraph/OsgSky/OsgSun.cpp

@@ -29,10 +29,10 @@
 #include <osg/Texture2D>
 #include <osgDB/ReadFile>
 
-#include "OsgColor.h"
+#include "../OsgUtil/OsgColor.h"
 #include "OsgSun.h"
-#include "OsgMath.h"
-#include "OsgSphere.h"
+#include "../OsgUtil/OsgMath.h"
+#include "../OsgUtil/OsgSphere.h"
 
 // Constructor
 SDSun::SDSun( void ) :

src/modules/graphic/osggraph/OsgView/OsgCamera.cpp

@@ -31,8 +31,8 @@
 
 #include "OsgCamera.h"
 #include "OsgView.h"
-#include "OsgScenery.h"
-#include "OsgMain.h"
+#include "../OsgWorld/OsgScenery.h"
+#include "../OsgMain.h"
 
 static char path[1024];
 char 		buf[256];

src/modules/graphic/osggraph/OsgView/OsgScreens.cpp

@@ -26,8 +26,8 @@
 #include <osg/ValueObject>
 
 #include "OsgScreens.h"
-#include "OsgMain.h"
-#include "OsgCar.h"
+#include "../OsgMain.h"
+#include "../OsgCar/OsgCar.h"
 
 SDScreens::SDScreens()
    :m_CurrentScreenIndex(0)

src/modules/graphic/osggraph/OsgView/OsgView.cpp

@@ -21,7 +21,7 @@
 #include <tgfclient.h>
 #include <graphic.h>
 
-#include "OsgMain.h"
+#include "../OsgMain.h"
 #include "OsgView.h"
 //#include "OsgCar.h"
 

src/modules/graphic/osggraph/OsgWorld/OsgScenery.cpp

@@ -25,9 +25,9 @@
 #include <osg/LightSource>
 #include <osg/Camera>
 
-#include "OsgMain.h"
+#include "../OsgMain.h"
 #include "OsgScenery.h"
-#include "OsgLoader.h"
+#include "../OsgLoader/OsgLoader.h"
 
 #include <glfeatures.h>	//gluXXX
 #include <robottools.h>	//RtXXX()