From fb07556993f7bde6a21c4549379d2ef0bd39f670 Mon Sep 17 00:00:00 2001 From: torcs-ng Date: Tue, 4 Jun 2013 23:13:03 +0000 Subject: [PATCH] maybe fixed bug with shader lightning git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5494 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 8b896658e7c1ad9b2a805f30619b367fcdb5623f Former-commit-id: b9bcaf08ca0d7713c42df1f65b287caea876a070 --- src/modules/graphic/osggraph/OsgCar/OsgCar.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/modules/graphic/osggraph/OsgCar/OsgCar.cpp b/src/modules/graphic/osggraph/OsgCar/OsgCar.cpp index 3934de6f5..f08e46590 100755 --- a/src/modules/graphic/osggraph/OsgCar/OsgCar.cpp +++ b/src/modules/graphic/osggraph/OsgCar/OsgCar.cpp @@ -48,13 +48,13 @@ class SDCarShader{ private : osg::Node *pCar; osg::StateSet* stateset; - osg::Uniform * diffuseMap; + osg::ref_ptr diffuseMap; //osg::Uniform * normalMap; - osg::Uniform * specularColor; - osg::Uniform * lightVector; - osg::Uniform * lightPower; - osg::Uniform * ambientColor; - osg::Uniform * shininess; + osg::ref_ptr specularColor; + osg::ref_ptr lightVector; + osg::ref_ptr lightPower; + osg::ref_ptr ambientColor; + osg::ref_ptr shininess; public : static void initiateShaderProgram(){ @@ -130,9 +130,9 @@ public : - this->lightVector->set(osg::Vec3f(lv.x(),lv.y(),lv.z())); - this->lightPower->set(sun_color); - this->ambientColor->set(scene_color); + lightVector->set(osg::Vec3f(lv.x(),lv.y(),lv.z())); + lightPower->set(sun_color); + ambientColor->set(scene_color); //this->mvmatrix->set(mvm); // this->normalmatrix->set(m);