Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/fbx/fbxRMesh.cpp
- Timestamp:
- 03/21/12 18:36:20 (14 months ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
OpenSceneGraph/trunk/src/osgPlugins/fbx/fbxRMesh.cpp
r12583 r13041 149 149 osg::Geometry* getGeometry(osg::Geode* pGeode, GeometryMap& geometryMap, 150 150 std::vector<StateSetContent>& stateSetList, 151 GeometryType gt, 152 unsigned int mti, 153 bool bNormal, 151 GeometryType gt, 152 unsigned int mti, 153 bool bNormal, 154 154 bool useDiffuseMap, 155 155 bool useOpacityMap, 156 156 bool useEmissiveMap, 157 157 // more here... 158 bool bColor, 158 bool bColor, 159 159 const osgDB::Options& options, 160 160 bool lightmapTextures) … … 225 225 { 226 226 double factor = ssc.diffuseFactor; 227 osg::ref_ptr<osg::TexEnvCombine> texenv = new osg::TexEnvCombine(); 227 osg::ref_ptr<osg::TexEnvCombine> texenv = new osg::TexEnvCombine(); 228 228 texenv->setCombine_RGB(osg::TexEnvCombine::INTERPOLATE); 229 229 texenv->setSource0_RGB(osg::TexEnvCombine::TEXTURE); … … 255 255 256 256 // setup combiner to ignore RGB... 257 osg::ref_ptr<osg::TexEnvCombine> texenv = new osg::TexEnvCombine(); 257 osg::ref_ptr<osg::TexEnvCombine> texenv = new osg::TexEnvCombine(); 258 258 texenv->setCombine_RGB(osg::TexEnvCombine::REPLACE); 259 259 texenv->setSource0_RGB(osg::TexEnvCombine::PREVIOUS); … … 277 277 // setup combiner for factor... 278 278 double factor = ssc.reflectionFactor; 279 osg::ref_ptr<osg::TexEnvCombine> texenv = new osg::TexEnvCombine(); 279 osg::ref_ptr<osg::TexEnvCombine> texenv = new osg::TexEnvCombine(); 280 280 texenv->setCombine_RGB(osg::TexEnvCombine::INTERPOLATE); 281 281 texenv->setSource0_RGB(osg::TexEnvCombine::TEXTURE); … … 518 518 return uv; 519 519 } 520 } 520 } 521 521 522 522 return 0; … … 747 747 osg::Geometry* pGeometry = getGeometry(pGeode, geometryMap, 748 748 stateSetList, geomType, materialIndex, 749 pFbxNormals != 0, 749 pFbxNormals != 0, 750 750 pFbxUVs_diffuse != 0, 751 751 pFbxUVs_opacity != 0,
