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

Use shader data for get sampler register in CloudLayer and BasicClouds.

Browse source
This commit is contained in:
LuisAntonRebollo 2014-04-17 14:18:58 +02:00
parent 2142d452d4
commit cb8b8b7316
4 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/environment/basicClouds.cpp
View file

@ -129,6 +129,7 @@ bool BasicClouds::onAdd()
mTexScaleSC = mShader->getShaderConstHandle( "$texScale" ); mTexScaleSC = mShader->getShaderConstHandle( "$texScale" );
mTexDirectionSC = mShader->getShaderConstHandle( "$texDirection" ); mTexDirectionSC = mShader->getShaderConstHandle( "$texDirection" );
mTexOffsetSC = mShader->getShaderConstHandle( "$texOffset" ); mTexOffsetSC = mShader->getShaderConstHandle( "$texOffset" );
mDiffuseMapSC = mShader->getShaderConstHandle( "$diffuseMap" );
// Create StateBlocks // Create StateBlocks
GFXStateBlockDesc desc; GFXStateBlockDesc desc;
@ -312,7 +313,7 @@ void BasicClouds::renderObject( ObjectRenderInst *ri, SceneRenderState *state, B
mShaderConsts->setSafe( mTexDirectionSC, mTexDirection[i] * mTexSpeed[i] ); mShaderConsts->setSafe( mTexDirectionSC, mTexDirection[i] * mTexSpeed[i] );
mShaderConsts->setSafe( mTexOffsetSC, mTexOffset[i] ); mShaderConsts->setSafe( mTexOffsetSC, mTexOffset[i] );
GFX->setTexture( 0, mTexture[i] ); GFX->setTexture( mDiffuseMapSC->getSamplerRegister(), mTexture[i] );
GFX->setVertexBuffer( mVB[i] ); GFX->setVertexBuffer( mVB[i] );
GFX->drawIndexedPrimitive( GFXTriangleList, 0, 0, smVertCount, 0, smTriangleCount ); GFX->drawIndexedPrimitive( GFXTriangleList, 0, 0, smVertCount, 0, smTriangleCount );

1
Engine/source/environment/basicClouds.h
View file

@ -103,6 +103,7 @@ protected:
GFXShaderConstHandle *mTexScaleSC; GFXShaderConstHandle *mTexScaleSC;
GFXShaderConstHandle *mTexDirectionSC; GFXShaderConstHandle *mTexDirectionSC;
GFXShaderConstHandle *mTexOffsetSC; GFXShaderConstHandle *mTexOffsetSC;
GFXShaderConstHandle *mDiffuseMapSC;
GFXVertexBufferHandle<GFXVertexPT> mVB[TEX_COUNT]; GFXVertexBufferHandle<GFXVertexPT> mVB[TEX_COUNT];
GFXPrimitiveBufferHandle mPB; GFXPrimitiveBufferHandle mPB;

3
Engine/source/environment/cloudLayer.cpp
View file

@ -143,6 +143,7 @@ bool CloudLayer::onAdd()
mCoverageSC = mShader->getShaderConstHandle( "$cloudCoverage" ); mCoverageSC = mShader->getShaderConstHandle( "$cloudCoverage" );
mExposureSC = mShader->getShaderConstHandle( "$cloudExposure" ); mExposureSC = mShader->getShaderConstHandle( "$cloudExposure" );
mBaseColorSC = mShader->getShaderConstHandle( "$cloudBaseColor" ); mBaseColorSC = mShader->getShaderConstHandle( "$cloudBaseColor" );
mNormalHeightMapSC = mShader->getShaderConstHandle( "$normalHeightMap" );
// Create StateBlocks // Create StateBlocks
GFXStateBlockDesc desc; GFXStateBlockDesc desc;
@ -365,7 +366,7 @@ void CloudLayer::renderObject( ObjectRenderInst *ri, SceneRenderState *state, Ba
mShaderConsts->setSafe( mExposureSC, mExposure ); mShaderConsts->setSafe( mExposureSC, mExposure );
GFX->setTexture( 0, mTexture ); GFX->setTexture( mNormalHeightMapSC->getSamplerRegister(), mTexture );
GFX->setVertexBuffer( mVB ); GFX->setVertexBuffer( mVB );
GFX->setPrimitiveBuffer( mPB ); GFX->setPrimitiveBuffer( mPB );

1
Engine/source/environment/cloudLayer.h
View file

@ -110,6 +110,7 @@ protected:
GFXShaderConstHandle *mCoverageSC; GFXShaderConstHandle *mCoverageSC;
GFXShaderConstHandle *mExposureSC; GFXShaderConstHandle *mExposureSC;
GFXShaderConstHandle *mEyePosWorldSC; GFXShaderConstHandle *mEyePosWorldSC;
GFXShaderConstHandle *mNormalHeightMapSC;
GFXVertexBufferHandle<GFXCloudVertex> mVB; GFXVertexBufferHandle<GFXCloudVertex> mVB;
GFXPrimitiveBufferHandle mPB; GFXPrimitiveBufferHandle mPB;