iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

osggraph: refactoring code

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

Former-commit-id: 993579aff93bb31752fded296373d8569206bdbd
Former-commit-id: e135355c7fd59ae673b158e0ab5d0612ff9cff4a
This commit is contained in:
rvlander 2013-05-09 14:51:51 +00:00
parent c63e7a245c
commit 0e7d744f08
3 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/modules/graphic/osggraph/OsgCar.cpp
View file

@ -71,7 +71,7 @@ public :
stateset->addUniform(diffuseMap);
viewPoint = new osg::Uniform("pv",osg::Vec3());
stateset->addUniform(viewPoint);
specularColor = new osg::Uniform("specularColor", osg::Vec4(0.8,0.8,0.8,1.0));
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());
stateset->addUniform(lightVector);
@ -91,6 +91,10 @@ public :
osg::Vec4f sun_color = ren->getSky()->get_sun_color();
osg::Vec4f scene_color = ren->getSky()->get_scene_color();
/* GfOut("Sun Position : %f %f %f\n",sun_pos._v[0],sun_pos._v[1],sun_pos._v[2]);
GfOut("Sun Color : %f %f %f %f\n",sun_color._v[0],sun_color._v[1],sun_color._v[2],sun_color._v[3]);
GfOut("Scene Color : %f %f %f %f\n",scene_color._v[0],scene_color._v[1],scene_color._v[2],scene_color._v[3]);
*/
//SDScreens * scr= (SDScreens *)getScreens();
//osg::Vec3 c = scr->getActiveView()->getCameras()->getSelectedCamera()->getCameraPosition();
// osg::Matrix modelview = scr->getActiveView()->getOsgCam()->getViewMatrix();
@ -98,6 +102,12 @@ public :
osg::Vec4f pv = v*modelview;
osg::Vec4f lv = osg::Vec4(sun_pos.x(),sun_pos.y(),sun_pos.z(),0.0f);
lv =lv*modelview;
/*
GfOut("View Point : %f %f %f\n",pv.x(),pv.y(),pv.z());
GfOut("Light Vector : %f %f %f\n",lv.x(),lv.y(),lv.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]);
this->viewPoint->set(osg::Vec3f(pv.x(),pv.y(),pv.z()));
@ -298,7 +308,7 @@ void SDCars::addSDCar(SDCar * car)
the_cars.insert(the_cars.end(),car);
}
osg::ref_ptr<osg::Node> SDCars::loadCars(tSituation * pSituation)
void SDCars::loadCars(tSituation * pSituation)
{
tSituation *s = pSituation;
this->situation = pSituation;
@ -310,9 +320,10 @@ osg::ref_ptr<osg::Node> SDCars::loadCars(tSituation * pSituation)
this->cars_branch->addChild(car->loadCar(elt));
}
return cars_branch;
return;;
}
void SDCars::updateCars()
{
std::vector<SDCar *>::iterator it;

5
src/modules/graphic/osggraph/OsgCar.h
View file

@ -57,9 +57,12 @@ class SDCars
SDCars(void);
~SDCars(void);
osg::ref_ptr<osg::Node> loadCars(tSituation * pSituation);
void loadCars(tSituation * pSituation);
void updateCars();
void updateShadingParameters(osg::Vec3f eye,osg::Matrixf modelview);
inline osg::ref_ptr<osg::Node> getCarsNode(){
return cars_branch;
}
};
#endif /* _OSGCAR_H_ */

3
src/modules/graphic/osggraph/OsgMain.cpp
View file

@ -384,7 +384,8 @@ int initCars(tSituation *s)
{
char buf[256];
cars = new SDCars;
m_sceneroot->addChild(cars->loadCars(s));
cars->loadCars(s);
m_sceneroot->addChild(cars->getCarsNode());
osgUtil::Optimizer optimizer;
optimizer.optimize(m_sceneroot);
GfOut("All cars loaded\n");