speed-dreams/speed-dreams-code
6
0
Fork 1
Code Issues 8 Pull requests 1 Projects Releases Packages Wiki Activity Actions

update light scene with sun position (first work)

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

Former-commit-id: e4464fe47a5666fd713950e3012f20ec18fc7ab8
Former-commit-id: 50ed6a4f5b265f2f8145ae9f5eacae723ed89126
This commit is contained in:
torcs-ng 2013-04-10 22:03:08 +00:00
parent 8bd42af8f0
commit 914245f99f
4 changed files with 37 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/modules/graphic/osggraph/OsgMoon.cpp
View file

@ -59,7 +59,7 @@ osg::Node* SDMoon::build( std::string path, double dist, double size )
moon_size = size;
moon_dist = dist;
path = TmpPath+"data/textures/moon.rgba";
path = TmpPath+"data/textures/moon.png";
osg::ref_ptr<osg::Image> image = osgDB::readImageFile(path);
osg::ref_ptr<osg::Texture2D> texture = new osg::Texture2D(image.get());
stateSet->setTextureAttributeAndModes(0, texture, osg::StateAttribute::ON);
@ -69,14 +69,10 @@ osg::Node* SDMoon::build( std::string path, double dist, double size )
orb_material = new osg::Material;
orb_material->setColorMode(osg::Material::DIFFUSE);
orb_material->setDiffuse(osg::Material::FRONT_AND_BACK,
osg::Vec4(1, 1, 1, 1));
orb_material->setAmbient(osg::Material::FRONT_AND_BACK,
osg::Vec4(0, 0, 0, 1));
orb_material->setEmission(osg::Material::FRONT_AND_BACK,
osg::Vec4(0, 0, 0, 1));
orb_material->setSpecular(osg::Material::FRONT_AND_BACK,
osg::Vec4(0, 0, 0, 1));
orb_material->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4(1, 1, 1, 1));
orb_material->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4(0, 0, 0, 1));
orb_material->setEmission(osg::Material::FRONT_AND_BACK,osg::Vec4(0, 0, 0, 1));
orb_material->setSpecular(osg::Material::FRONT_AND_BACK,osg::Vec4(0, 0, 0, 1));
orb_material->setShininess(osg::Material::FRONT_AND_BACK, 0);
stateSet->setAttribute(orb_material.get());
stateSet->setMode(GL_LIGHTING, osg::StateAttribute::ON);

39
src/modules/graphic/osggraph/OsgRender.cpp
View file

@ -193,11 +193,23 @@ osg::ref_ptr<osg::Node> SDRender::Init(osg::Group *m_sceneroot, tTrack *track)
osg::StateSet* stateSet = sceneGroup->getOrCreateStateSet();
stateSet->setMode(GL_DEPTH_TEST, osg::StateAttribute::ON);
osg::Material* material = new osg::Material;
material->setColorMode(osg::Material::OFF); // switch glColor usage off
// turn all lighting off
//material->setAmbient(osg::Material::FRONT_AND_BACK, osg::Vec4(SceneAmbiant));
//material->setDiffuse(osg::Material::FRONT_AND_BACK, osg::Vec4(SceneDiffuse));
//material->setSpecular(osg::Material::FRONT_AND_BACK, osg::Vec4(SceneSpecular));
// except emission... in which we set the color we desire
//material->setEmission(osg::Material::FRONT_AND_BACK, osg::Vec4(0.0,1.0f,0.0f,1.0f));
stateSet->setAttributeAndModes(material,osg::StateAttribute::OVERRIDE|osg::StateAttribute::ON);
stateSet->setMode(GL_LIGHTING,osg::StateAttribute::OVERRIDE|osg::StateAttribute::ON);
osg::LightSource* lightSource = new osg::LightSource;
lightSource->getLight()->setDataVariance(osg::Object::DYNAMIC);
// relative because of CameraView being just a clever transform node
lightSource->setReferenceFrame(osg::LightSource::RELATIVE_RF);
lightSource->setLocalStateSetModes(osg::StateAttribute::ON);
//lightSource->setUpdateCallback(new FGLightSourceUpdateCallback);
// we need a white diffuse light for the phase of the moon
@ -206,6 +218,13 @@ osg::ref_ptr<osg::Node> SDRender::Init(osg::Group *m_sceneroot, tTrack *track)
sunLight->getLight()->setLightNum(1);
sunLight->setReferenceFrame(osg::LightSource::RELATIVE_RF);
sunLight->setLocalStateSetModes(osg::StateAttribute::ON);
sunLight->getLight()->setAmbient(SceneAmbiant);
sunLight->getLight()->setDiffuse(SceneDiffuse);
sunLight->getLight()->setSpecular(SceneSpecular);
osg::Vec3f sun_position = thesky->sunposition();
osg::Vec4f position(sun_position, 0);
sunLight->getLight()->setPosition(position);
osg::Group* skyGroup = new osg::Group;
osg::StateSet* skySS = skyGroup->getOrCreateStateSet();
@ -232,21 +251,21 @@ void SDRender::UpdateLight( void )
moon_angle = (float)thesky->getMA();
float sky_brightness = (float)(1.0 + cos(sol_angle)) / 2.0f;
GfOut("Sun Angle in Render = %f\n", sol_angle);
GfOut("Sun Angle in Render = %f - sky brightness = %f\n", sol_angle, sky_brightness);
if (grTrack->local.rain > 0) // TODO: Different values for each rain strength value ?
{
BaseFogColor[0] = 0.42f;
BaseFogColor[1] = 0.44f;
BaseFogColor[2] = 0.50f;
BaseFogColor[0] = 0.31f;
BaseFogColor[1] = 0.36f;
BaseFogColor[2] = 0.44f;
sky_brightness = (float)pow(sky_brightness, 0.5f);
}
else
{
BaseFogColor[0] = 0.84f;
BaseFogColor[1] = 0.84f;
BaseFogColor[2] = 1.00f;
BaseFogColor[0] = 0.63f;
BaseFogColor[1] = 0.72f;
BaseFogColor[2] = 0.88f;
}
SkyColor[0] = BaseSkyColor[0] * sky_brightness;
@ -372,14 +391,14 @@ void SDRender::UpdateFogColor(double sol_angle)
av = 45000;
float avf = 0.87 - (45000 - av) / 83333.33;
float sif = 0.5 - cos( sol_angle * 2)/2;
float sif = 0.5 - cos( (sol_angle * SD_RADIANS_TO_DEGREES)* 2)/2;
if (sif < 1e-4)
sif = 1e-4;
float rf1 = fabs((rotation - SD_PI) / SD_PI); // 0.0 .. 1.0
float rf2 = avf * pow(rf1 * rf1, 1 /sif);
float rf3 = 0.94 - rf2;
float rf2 = avf * pow(rf1 * rf1, 1 /sif)* 1.0639;
float rf3 = 1.0 - rf2;
FogColor[0] = rf3 * BaseFogColor[0] + rf2 * s_red;
FogColor[1] = rf3 * BaseFogColor[1] + rf2 * s_green;

1
src/modules/graphic/osggraph/OsgSky.h
View file

@ -174,6 +174,7 @@ public:
inline void set_visibility( float v ) { effective_visibility = visibility = (v <= 25.0) ? 25.0 : v; }
inline SDSun * getSun(){return sun;}
inline osg::Vec3f sunposition() {return sun->getSunPosition();}
//virtual double get_3dCloudDensity() const;
//virtual void set_3dCloudDensity(double density);

5
src/modules/graphic/osggraph/OsgSphere.cpp
View file

@ -17,7 +17,6 @@
* *
***************************************************************************/
#include <tgf.h>
#include <iostream>
#include <osg/Node>
#include <osg/Geometry>
@ -60,7 +59,7 @@ osg::Node* SDMakeSphere(double radius, int slices, int stacks)
double y = cos(theta) * sin(rho);
double z = nsign * cos(rho);
osg::Vec3 normal(x*nsign, y*nsign, z*nsign);
osg::Vec3 normal(x*nsign, y*nsign, z*nsign);
normal.normalize();
nl->push_back(normal);
@ -71,7 +70,7 @@ osg::Node* SDMakeSphere(double radius, int slices, int stacks)
y = cos(theta) * sin(rho+drho);
z = nsign * cos(rho+drho);
normal = osg::Vec3(x*nsign, y*nsign, z*nsign);
normal = osg::Vec3(x*nsign, y*nsign, z*nsign);
normal.normalize();
nl->push_back(normal);