TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 15:44:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #1067 from Lopuska/patch-13

Browse source 
bugfix #1066
This commit is contained in:
Daniel Buckmaster 2015-03-01 14:17:59 +11:00
commit 6822a78fcf
4 changed files with 38 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Engine/source/shaderGen/GLSL/pixSpecularGLSL.cpp
View file

@ -111,6 +111,20 @@ ShaderFeature::Resources PixelSpecularGLSL::getResources( const MaterialFeatureD
return res; return res;
} }
void SpecularMapGLSL::processVert(Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd)
{
MultiLine *meta = new MultiLine;
// Add the texture coords.
getOutTexCoord("texCoord",
"vec2",
true,
fd.features[MFT_TexAnim],
meta,
componentList);
output = meta;
}
void SpecularMapGLSL::processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) void SpecularMapGLSL::processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd )
{ {
@ -150,4 +164,4 @@ void SpecularMapGLSL::setTexData( Material::StageData &stageDat,
passData.mSamplerNames[ texIndex ] = "specularMap"; passData.mSamplerNames[ texIndex ] = "specularMap";
passData.mTexSlot[ texIndex++ ].texObject = tex; passData.mTexSlot[ texIndex++ ].texObject = tex;
} }
} }

5
Engine/source/shaderGen/GLSL/pixSpecularGLSL.h
View file

@ -58,6 +58,9 @@ class SpecularMapGLSL : public ShaderFeatureGLSL
{ {
public: public:
virtual void processVert( Vector<ShaderComponent*> &componentList,
const MaterialFeatureData &fd );
virtual void processPix( Vector<ShaderComponent*> &componentList, virtual void processPix( Vector<ShaderComponent*> &componentList,
const MaterialFeatureData &fd ); const MaterialFeatureData &fd );
@ -74,4 +77,4 @@ public:
} }
}; };
#endif // _PIXSPECULAR_HLSL_H_ #endif // _PIXSPECULAR_HLSL_H_

16
Engine/source/shaderGen/HLSL/pixSpecularHLSL.cpp
View file

@ -111,6 +111,20 @@ ShaderFeature::Resources PixelSpecularHLSL::getResources( const MaterialFeatureD
return res; return res;
} }
void SpecularMapHLSL::processVert(Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd)
{
MultiLine *meta = new MultiLine;
// Add the texture coords.
getOutTexCoord("texCoord",
"float2",
true,
fd.features[MFT_TexAnim],
meta,
componentList);
output = meta;
}
void SpecularMapHLSL::processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd ) void SpecularMapHLSL::processPix( Vector<ShaderComponent*> &componentList, const MaterialFeatureData &fd )
{ {
@ -150,4 +164,4 @@ void SpecularMapHLSL::setTexData( Material::StageData &stageDat,
passData.mSamplerNames[ texIndex ] = "specularMap"; passData.mSamplerNames[ texIndex ] = "specularMap";
passData.mTexSlot[ texIndex++ ].texObject = tex; passData.mTexSlot[ texIndex++ ].texObject = tex;
} }
} }

5
Engine/source/shaderGen/HLSL/pixSpecularHLSL.h
View file

@ -58,6 +58,9 @@ class SpecularMapHLSL : public ShaderFeatureHLSL
{ {
public: public:
virtual void processVert( Vector<ShaderComponent*> &componentList,
const MaterialFeatureData &fd );
virtual void processPix( Vector<ShaderComponent*> &componentList, virtual void processPix( Vector<ShaderComponent*> &componentList,
const MaterialFeatureData &fd ); const MaterialFeatureData &fd );
@ -74,4 +77,4 @@ public:
} }
}; };
#endif // _PIXSPECULAR_HLSL_H_ #endif // _PIXSPECULAR_HLSL_H_