From e281c12d7b663f13276495cd88bc03d13c149c70 Mon Sep 17 00:00:00 2001 From: rvlander Date: Sun, 2 Jun 2013 13:40:30 +0000 Subject: [PATCH] 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 | 84 +++++++++++++++---- .../osggraph/{ => OsgCar}/OsgBrake.cpp | 2 +- .../graphic/osggraph/{ => OsgCar}/OsgBrake.h | 0 .../graphic/osggraph/{ => OsgCar}/OsgCar.cpp | 28 +++++-- .../graphic/osggraph/{ => OsgCar}/OsgCar.h | 0 .../osggraph/{ => OsgCar}/OsgWheel.cpp | 2 +- .../graphic/osggraph/{ => OsgCar}/OsgWheel.h | 0 .../osggraph/{ => OsgFX}/OsgRender.cpp | 10 +-- .../graphic/osggraph/{ => OsgFX}/OsgRender.h | 2 +- .../osggraph/{ => OsgLoader}/AccException.cpp | 0 .../osggraph/{ => OsgLoader}/AccException.h | 0 .../osggraph/{ => OsgLoader}/AccGeode.cpp | 0 .../osggraph/{ => OsgLoader}/AccGeode.h | 0 .../osggraph/{ => OsgLoader}/OsgLoader.cpp | 0 .../osggraph/{ => OsgLoader}/OsgLoader.h | 0 .../{ => OsgLoader}/ReaderWriterACC.cpp | 0 .../{ => OsgLoader}/ReaderWriterACC.h | 0 src/modules/graphic/osggraph/OsgMain.cpp | 10 +-- .../osggraph/{ => OsgSky}/OsgCloud.cpp | 2 +- .../graphic/osggraph/{ => OsgSky}/OsgCloud.h | 0 .../graphic/osggraph/{ => OsgSky}/OsgDome.cpp | 4 +- .../graphic/osggraph/{ => OsgSky}/OsgDome.h | 4 +- .../graphic/osggraph/{ => OsgSky}/OsgMoon.cpp | 6 +- .../graphic/osggraph/{ => OsgSky}/OsgMoon.h | 0 .../graphic/osggraph/{ => OsgSky}/OsgSky.cpp | 0 .../graphic/osggraph/{ => OsgSky}/OsgSky.h | 0 .../osggraph/{ => OsgSky}/OsgStars.cpp | 2 +- .../graphic/osggraph/{ => OsgSky}/OsgStars.h | 0 .../graphic/osggraph/{ => OsgSky}/OsgSun.cpp | 6 +- .../graphic/osggraph/{ => OsgSky}/OsgSun.h | 0 .../osggraph/{ => OsgUtil}/OsgAtomic.h | 0 .../graphic/osggraph/{ => OsgUtil}/OsgColor.h | 0 .../osggraph/{ => OsgUtil}/OsgMath.cpp | 0 .../graphic/osggraph/{ => OsgUtil}/OsgMath.h | 0 .../osggraph/{ => OsgUtil}/OsgReferenced.h | 0 .../osggraph/{ => OsgUtil}/OsgSharedPtr.h | 0 .../osggraph/{ => OsgUtil}/OsgSphere.cpp | 0 .../osggraph/{ => OsgUtil}/OsgSphere.h | 0 .../{ => OsgUtil}/OsgVectorArrayAdapter.h | 0 .../osggraph/{ => OsgView}/OsgCamera.cpp | 4 +- .../osggraph/{ => OsgView}/OsgCamera.h | 0 .../osggraph/{ => OsgView}/OsgScreens.cpp | 4 +- .../osggraph/{ => OsgView}/OsgScreens.h | 0 .../osggraph/{ => OsgView}/OsgView.cpp | 2 +- .../graphic/osggraph/{ => OsgView}/OsgView.h | 0 .../osggraph/{ => OsgWorld}/OsgBackground.cpp | 0 .../osggraph/{ => OsgWorld}/OsgScenery.cpp | 4 +- .../osggraph/{ => OsgWorld}/OsgScenery.h | 0 48 files changed, 120 insertions(+), 56 deletions(-) rename src/modules/graphic/osggraph/{ => OsgCar}/OsgBrake.cpp (99%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgCar}/OsgBrake.h (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgCar}/OsgCar.cpp (94%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgCar}/OsgCar.h (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgCar}/OsgWheel.cpp (99%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgCar}/OsgWheel.h (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgFX}/OsgRender.cpp (99%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgFX}/OsgRender.h (99%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgLoader}/AccException.cpp (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgLoader}/AccException.h (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgLoader}/AccGeode.cpp (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgLoader}/AccGeode.h (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgLoader}/OsgLoader.cpp (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgLoader}/OsgLoader.h (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgLoader}/ReaderWriterACC.cpp (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgLoader}/ReaderWriterACC.h (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgSky}/OsgCloud.cpp (99%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgSky}/OsgCloud.h (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgSky}/OsgDome.cpp (99%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgSky}/OsgDome.h (96%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgSky}/OsgMoon.cpp (98%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgSky}/OsgMoon.h (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgSky}/OsgSky.cpp (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgSky}/OsgSky.h (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgSky}/OsgStars.cpp (99%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgSky}/OsgStars.h (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgSky}/OsgSun.cpp (99%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgSky}/OsgSun.h (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgUtil}/OsgAtomic.h (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgUtil}/OsgColor.h (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgUtil}/OsgMath.cpp (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgUtil}/OsgMath.h (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgUtil}/OsgReferenced.h (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgUtil}/OsgSharedPtr.h (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgUtil}/OsgSphere.cpp (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgUtil}/OsgSphere.h (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgUtil}/OsgVectorArrayAdapter.h (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgView}/OsgCamera.cpp (99%) rename src/modules/graphic/osggraph/{ => OsgView}/OsgCamera.h (100%) rename src/modules/graphic/osggraph/{ => OsgView}/OsgScreens.cpp (99%) rename src/modules/graphic/osggraph/{ => OsgView}/OsgScreens.h (100%) rename src/modules/graphic/osggraph/{ => OsgView}/OsgView.cpp (99%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgView}/OsgView.h (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgWorld}/OsgBackground.cpp (100%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgWorld}/OsgScenery.cpp (99%) mode change 100644 => 100755 rename src/modules/graphic/osggraph/{ => OsgWorld}/OsgScenery.h (100%) mode change 100644 => 100755 diff --git a/src/modules/graphic/osggraph/CMakeLists.txt b/src/modules/graphic/osggraph/CMakeLists.txt index 6167a40e..bf2f953e 100644 --- a/src/modules/graphic/osggraph/CMakeLists.txt +++ b/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) diff --git a/src/modules/graphic/osggraph/OsgBrake.cpp b/src/modules/graphic/osggraph/OsgCar/OsgBrake.cpp old mode 100644 new mode 100755 similarity index 99% rename from src/modules/graphic/osggraph/OsgBrake.cpp rename to src/modules/graphic/osggraph/OsgCar/OsgBrake.cpp index c17a9ea3..925ad4ab --- a/src/modules/graphic/osggraph/OsgBrake.cpp +++ b/src/modules/graphic/osggraph/OsgCar/OsgBrake.cpp @@ -3,7 +3,7 @@ #include #include "OsgBrake.h" -#include "OsgMath.h" +#include "../OsgUtil/OsgMath.h" void SDBrakes::setCar(tCarElt * car) { diff --git a/src/modules/graphic/osggraph/OsgBrake.h b/src/modules/graphic/osggraph/OsgCar/OsgBrake.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgBrake.h rename to src/modules/graphic/osggraph/OsgCar/OsgBrake.h diff --git a/src/modules/graphic/osggraph/OsgCar.cpp b/src/modules/graphic/osggraph/OsgCar/OsgCar.cpp old mode 100644 new mode 100755 similarity index 94% rename from src/modules/graphic/osggraph/OsgCar.cpp rename to src/modules/graphic/osggraph/OsgCar/OsgCar.cpp index 6a44a854..e8d54a89 --- a/src/modules/graphic/osggraph/OsgCar.cpp +++ b/src/modules/graphic/osggraph/OsgCar/OsgCar.cpp @@ -32,13 +32,13 @@ #include -#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); diff --git a/src/modules/graphic/osggraph/OsgCar.h b/src/modules/graphic/osggraph/OsgCar/OsgCar.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgCar.h rename to src/modules/graphic/osggraph/OsgCar/OsgCar.h diff --git a/src/modules/graphic/osggraph/OsgWheel.cpp b/src/modules/graphic/osggraph/OsgCar/OsgWheel.cpp old mode 100644 new mode 100755 similarity index 99% rename from src/modules/graphic/osggraph/OsgWheel.cpp rename to src/modules/graphic/osggraph/OsgCar/OsgWheel.cpp index 3eca19dd..4d954258 --- a/src/modules/graphic/osggraph/OsgWheel.cpp +++ b/src/modules/graphic/osggraph/OsgCar/OsgWheel.cpp @@ -1,6 +1,6 @@ #include -#include "OsgLoader.h" +#include "../OsgLoader/OsgLoader.h" #include "OsgWheel.h" #include diff --git a/src/modules/graphic/osggraph/OsgWheel.h b/src/modules/graphic/osggraph/OsgCar/OsgWheel.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgWheel.h rename to src/modules/graphic/osggraph/OsgCar/OsgWheel.h diff --git a/src/modules/graphic/osggraph/OsgRender.cpp b/src/modules/graphic/osggraph/OsgFX/OsgRender.cpp old mode 100644 new mode 100755 similarity index 99% rename from src/modules/graphic/osggraph/OsgRender.cpp rename to src/modules/graphic/osggraph/OsgFX/OsgRender.cpp index 1e4d46cc..7d294b9c --- a/src/modules/graphic/osggraph/OsgRender.cpp +++ b/src/modules/graphic/osggraph/OsgFX/OsgRender.cpp @@ -39,12 +39,12 @@ #include //#include -#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 //gluXXX #include //RtXXX() diff --git a/src/modules/graphic/osggraph/OsgRender.h b/src/modules/graphic/osggraph/OsgFX/OsgRender.h old mode 100644 new mode 100755 similarity index 99% rename from src/modules/graphic/osggraph/OsgRender.h rename to src/modules/graphic/osggraph/OsgFX/OsgRender.h index 70c58efa..6cce51a5 --- a/src/modules/graphic/osggraph/OsgRender.h +++ b/src/modules/graphic/osggraph/OsgFX/OsgRender.h @@ -26,7 +26,7 @@ #include //tTrack #include // tSituation -#define SHADOW_TECHNIQUE 0 +#define SHADOW_TECHNIQUE 3 class SDSky; class SDScenery; diff --git a/src/modules/graphic/osggraph/AccException.cpp b/src/modules/graphic/osggraph/OsgLoader/AccException.cpp old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/AccException.cpp rename to src/modules/graphic/osggraph/OsgLoader/AccException.cpp diff --git a/src/modules/graphic/osggraph/AccException.h b/src/modules/graphic/osggraph/OsgLoader/AccException.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/AccException.h rename to src/modules/graphic/osggraph/OsgLoader/AccException.h diff --git a/src/modules/graphic/osggraph/AccGeode.cpp b/src/modules/graphic/osggraph/OsgLoader/AccGeode.cpp old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/AccGeode.cpp rename to src/modules/graphic/osggraph/OsgLoader/AccGeode.cpp diff --git a/src/modules/graphic/osggraph/AccGeode.h b/src/modules/graphic/osggraph/OsgLoader/AccGeode.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/AccGeode.h rename to src/modules/graphic/osggraph/OsgLoader/AccGeode.h diff --git a/src/modules/graphic/osggraph/OsgLoader.cpp b/src/modules/graphic/osggraph/OsgLoader/OsgLoader.cpp old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgLoader.cpp rename to src/modules/graphic/osggraph/OsgLoader/OsgLoader.cpp diff --git a/src/modules/graphic/osggraph/OsgLoader.h b/src/modules/graphic/osggraph/OsgLoader/OsgLoader.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgLoader.h rename to src/modules/graphic/osggraph/OsgLoader/OsgLoader.h diff --git a/src/modules/graphic/osggraph/ReaderWriterACC.cpp b/src/modules/graphic/osggraph/OsgLoader/ReaderWriterACC.cpp old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/ReaderWriterACC.cpp rename to src/modules/graphic/osggraph/OsgLoader/ReaderWriterACC.cpp diff --git a/src/modules/graphic/osggraph/ReaderWriterACC.h b/src/modules/graphic/osggraph/OsgLoader/ReaderWriterACC.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/ReaderWriterACC.h rename to src/modules/graphic/osggraph/OsgLoader/ReaderWriterACC.h diff --git a/src/modules/graphic/osggraph/OsgMain.cpp b/src/modules/graphic/osggraph/OsgMain.cpp index 4de2305f..9a8de4b2 100644 --- a/src/modules/graphic/osggraph/OsgMain.cpp +++ b/src/modules/graphic/osggraph/OsgMain.cpp @@ -31,11 +31,11 @@ #include #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; diff --git a/src/modules/graphic/osggraph/OsgCloud.cpp b/src/modules/graphic/osggraph/OsgSky/OsgCloud.cpp old mode 100644 new mode 100755 similarity index 99% rename from src/modules/graphic/osggraph/OsgCloud.cpp rename to src/modules/graphic/osggraph/OsgSky/OsgCloud.cpp index 3e243b92..d5b84bab --- a/src/modules/graphic/osggraph/OsgCloud.cpp +++ b/src/modules/graphic/osggraph/OsgSky/OsgCloud.cpp @@ -37,7 +37,7 @@ #include -#include "OsgMath.h" +#include "../OsgUtil/OsgMath.h" //#include "OsgNewcloud.h" //#include "OsgCloudfield.h" //#include "OsgStateAttributeFactory.h" diff --git a/src/modules/graphic/osggraph/OsgCloud.h b/src/modules/graphic/osggraph/OsgSky/OsgCloud.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgCloud.h rename to src/modules/graphic/osggraph/OsgSky/OsgCloud.h diff --git a/src/modules/graphic/osggraph/OsgDome.cpp b/src/modules/graphic/osggraph/OsgSky/OsgDome.cpp old mode 100644 new mode 100755 similarity index 99% rename from src/modules/graphic/osggraph/OsgDome.cpp rename to src/modules/graphic/osggraph/OsgSky/OsgDome.cpp index 5d402d8b..fab23778 --- a/src/modules/graphic/osggraph/OsgDome.cpp +++ b/src/modules/graphic/osggraph/OsgSky/OsgDome.cpp @@ -32,8 +32,8 @@ #include -#include "OsgMath.h" -#include "OsgVectorArrayAdapter.h" +#include "../OsgUtil/OsgMath.h" +#include "../OsgUtil/OsgVectorArrayAdapter.h" #include "OsgDome.h" using namespace osg; diff --git a/src/modules/graphic/osggraph/OsgDome.h b/src/modules/graphic/osggraph/OsgSky/OsgDome.h old mode 100644 new mode 100755 similarity index 96% rename from src/modules/graphic/osggraph/OsgDome.h rename to src/modules/graphic/osggraph/OsgSky/OsgDome.h index 49de94cf..6ebefa35 --- a/src/modules/graphic/osggraph/OsgDome.h +++ b/src/modules/graphic/osggraph/OsgSky/OsgDome.h @@ -23,8 +23,8 @@ #include #include -#include "OsgReferenced.h" -#include "OsgMath.h" +#include "../OsgUtil/OsgReferenced.h" +#include "../OsgUtil/OsgMath.h" namespace osg { diff --git a/src/modules/graphic/osggraph/OsgMoon.cpp b/src/modules/graphic/osggraph/OsgSky/OsgMoon.cpp old mode 100644 new mode 100755 similarity index 98% rename from src/modules/graphic/osggraph/OsgMoon.cpp rename to src/modules/graphic/osggraph/OsgSky/OsgMoon.cpp index 1067175a..9a395df8 --- a/src/modules/graphic/osggraph/OsgMoon.cpp +++ b/src/modules/graphic/osggraph/OsgSky/OsgMoon.cpp @@ -32,9 +32,9 @@ #include #include -#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 diff --git a/src/modules/graphic/osggraph/OsgMoon.h b/src/modules/graphic/osggraph/OsgSky/OsgMoon.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgMoon.h rename to src/modules/graphic/osggraph/OsgSky/OsgMoon.h diff --git a/src/modules/graphic/osggraph/OsgSky.cpp b/src/modules/graphic/osggraph/OsgSky/OsgSky.cpp old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgSky.cpp rename to src/modules/graphic/osggraph/OsgSky/OsgSky.cpp diff --git a/src/modules/graphic/osggraph/OsgSky.h b/src/modules/graphic/osggraph/OsgSky/OsgSky.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgSky.h rename to src/modules/graphic/osggraph/OsgSky/OsgSky.h diff --git a/src/modules/graphic/osggraph/OsgStars.cpp b/src/modules/graphic/osggraph/OsgSky/OsgStars.cpp old mode 100644 new mode 100755 similarity index 99% rename from src/modules/graphic/osggraph/OsgStars.cpp rename to src/modules/graphic/osggraph/OsgSky/OsgStars.cpp index b2a78b51..9373a98c --- a/src/modules/graphic/osggraph/OsgStars.cpp +++ b/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) diff --git a/src/modules/graphic/osggraph/OsgStars.h b/src/modules/graphic/osggraph/OsgSky/OsgStars.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgStars.h rename to src/modules/graphic/osggraph/OsgSky/OsgStars.h diff --git a/src/modules/graphic/osggraph/OsgSun.cpp b/src/modules/graphic/osggraph/OsgSky/OsgSun.cpp old mode 100644 new mode 100755 similarity index 99% rename from src/modules/graphic/osggraph/OsgSun.cpp rename to src/modules/graphic/osggraph/OsgSky/OsgSun.cpp index f721968f..05b9c38f --- a/src/modules/graphic/osggraph/OsgSun.cpp +++ b/src/modules/graphic/osggraph/OsgSky/OsgSun.cpp @@ -29,10 +29,10 @@ #include #include -#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 ) : diff --git a/src/modules/graphic/osggraph/OsgSun.h b/src/modules/graphic/osggraph/OsgSky/OsgSun.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgSun.h rename to src/modules/graphic/osggraph/OsgSky/OsgSun.h diff --git a/src/modules/graphic/osggraph/OsgAtomic.h b/src/modules/graphic/osggraph/OsgUtil/OsgAtomic.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgAtomic.h rename to src/modules/graphic/osggraph/OsgUtil/OsgAtomic.h diff --git a/src/modules/graphic/osggraph/OsgColor.h b/src/modules/graphic/osggraph/OsgUtil/OsgColor.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgColor.h rename to src/modules/graphic/osggraph/OsgUtil/OsgColor.h diff --git a/src/modules/graphic/osggraph/OsgMath.cpp b/src/modules/graphic/osggraph/OsgUtil/OsgMath.cpp old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgMath.cpp rename to src/modules/graphic/osggraph/OsgUtil/OsgMath.cpp diff --git a/src/modules/graphic/osggraph/OsgMath.h b/src/modules/graphic/osggraph/OsgUtil/OsgMath.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgMath.h rename to src/modules/graphic/osggraph/OsgUtil/OsgMath.h diff --git a/src/modules/graphic/osggraph/OsgReferenced.h b/src/modules/graphic/osggraph/OsgUtil/OsgReferenced.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgReferenced.h rename to src/modules/graphic/osggraph/OsgUtil/OsgReferenced.h diff --git a/src/modules/graphic/osggraph/OsgSharedPtr.h b/src/modules/graphic/osggraph/OsgUtil/OsgSharedPtr.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgSharedPtr.h rename to src/modules/graphic/osggraph/OsgUtil/OsgSharedPtr.h diff --git a/src/modules/graphic/osggraph/OsgSphere.cpp b/src/modules/graphic/osggraph/OsgUtil/OsgSphere.cpp old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgSphere.cpp rename to src/modules/graphic/osggraph/OsgUtil/OsgSphere.cpp diff --git a/src/modules/graphic/osggraph/OsgSphere.h b/src/modules/graphic/osggraph/OsgUtil/OsgSphere.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgSphere.h rename to src/modules/graphic/osggraph/OsgUtil/OsgSphere.h diff --git a/src/modules/graphic/osggraph/OsgVectorArrayAdapter.h b/src/modules/graphic/osggraph/OsgUtil/OsgVectorArrayAdapter.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgVectorArrayAdapter.h rename to src/modules/graphic/osggraph/OsgUtil/OsgVectorArrayAdapter.h diff --git a/src/modules/graphic/osggraph/OsgCamera.cpp b/src/modules/graphic/osggraph/OsgView/OsgCamera.cpp similarity index 99% rename from src/modules/graphic/osggraph/OsgCamera.cpp rename to src/modules/graphic/osggraph/OsgView/OsgCamera.cpp index fae21123..09fd63cb 100755 --- a/src/modules/graphic/osggraph/OsgCamera.cpp +++ b/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]; diff --git a/src/modules/graphic/osggraph/OsgCamera.h b/src/modules/graphic/osggraph/OsgView/OsgCamera.h similarity index 100% rename from src/modules/graphic/osggraph/OsgCamera.h rename to src/modules/graphic/osggraph/OsgView/OsgCamera.h diff --git a/src/modules/graphic/osggraph/OsgScreens.cpp b/src/modules/graphic/osggraph/OsgView/OsgScreens.cpp similarity index 99% rename from src/modules/graphic/osggraph/OsgScreens.cpp rename to src/modules/graphic/osggraph/OsgView/OsgScreens.cpp index 85ffb066..c326953f 100755 --- a/src/modules/graphic/osggraph/OsgScreens.cpp +++ b/src/modules/graphic/osggraph/OsgView/OsgScreens.cpp @@ -26,8 +26,8 @@ #include #include "OsgScreens.h" -#include "OsgMain.h" -#include "OsgCar.h" +#include "../OsgMain.h" +#include "../OsgCar/OsgCar.h" SDScreens::SDScreens() :m_CurrentScreenIndex(0) diff --git a/src/modules/graphic/osggraph/OsgScreens.h b/src/modules/graphic/osggraph/OsgView/OsgScreens.h similarity index 100% rename from src/modules/graphic/osggraph/OsgScreens.h rename to src/modules/graphic/osggraph/OsgView/OsgScreens.h diff --git a/src/modules/graphic/osggraph/OsgView.cpp b/src/modules/graphic/osggraph/OsgView/OsgView.cpp old mode 100644 new mode 100755 similarity index 99% rename from src/modules/graphic/osggraph/OsgView.cpp rename to src/modules/graphic/osggraph/OsgView/OsgView.cpp index 8d3811b8..ef588034 --- a/src/modules/graphic/osggraph/OsgView.cpp +++ b/src/modules/graphic/osggraph/OsgView/OsgView.cpp @@ -21,7 +21,7 @@ #include #include -#include "OsgMain.h" +#include "../OsgMain.h" #include "OsgView.h" //#include "OsgCar.h" diff --git a/src/modules/graphic/osggraph/OsgView.h b/src/modules/graphic/osggraph/OsgView/OsgView.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgView.h rename to src/modules/graphic/osggraph/OsgView/OsgView.h diff --git a/src/modules/graphic/osggraph/OsgBackground.cpp b/src/modules/graphic/osggraph/OsgWorld/OsgBackground.cpp old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgBackground.cpp rename to src/modules/graphic/osggraph/OsgWorld/OsgBackground.cpp diff --git a/src/modules/graphic/osggraph/OsgScenery.cpp b/src/modules/graphic/osggraph/OsgWorld/OsgScenery.cpp old mode 100644 new mode 100755 similarity index 99% rename from src/modules/graphic/osggraph/OsgScenery.cpp rename to src/modules/graphic/osggraph/OsgWorld/OsgScenery.cpp index 5af5b024..4f4305e4 --- a/src/modules/graphic/osggraph/OsgScenery.cpp +++ b/src/modules/graphic/osggraph/OsgWorld/OsgScenery.cpp @@ -25,9 +25,9 @@ #include #include -#include "OsgMain.h" +#include "../OsgMain.h" #include "OsgScenery.h" -#include "OsgLoader.h" +#include "../OsgLoader/OsgLoader.h" #include //gluXXX #include //RtXXX() diff --git a/src/modules/graphic/osggraph/OsgScenery.h b/src/modules/graphic/osggraph/OsgWorld/OsgScenery.h old mode 100644 new mode 100755 similarity index 100% rename from src/modules/graphic/osggraph/OsgScenery.h rename to src/modules/graphic/osggraph/OsgWorld/OsgScenery.h