From af9ad17ad6faeb258fee9ab5a580776185d3283f Mon Sep 17 00:00:00 2001 From: rextimmy Date: Mon, 19 Oct 2015 21:15:59 +1000 Subject: [PATCH] Replaced ScatterSkyVertex declaration with default GFXVertexP in ScatterSky. --- Engine/source/environment/scatterSky.cpp | 7 +------ Engine/source/environment/scatterSky.h | 8 +------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/Engine/source/environment/scatterSky.cpp b/Engine/source/environment/scatterSky.cpp index 1db1afc43..aebf9c617 100644 --- a/Engine/source/environment/scatterSky.cpp +++ b/Engine/source/environment/scatterSky.cpp @@ -82,11 +82,6 @@ const F32 ScatterSky::smEarthRadius = (6378.0f * 1000.0f); const F32 ScatterSky::smAtmosphereRadius = 200000.0f; const F32 ScatterSky::smViewerHeight = 1.0f; -GFXImplementVertexFormat( ScatterSkyVertex ) -{ - addElement( "POSITION", GFXDeclType_Float3 ); -} - ScatterSky::ScatterSky() { mPrimCount = 0; @@ -759,7 +754,7 @@ void ScatterSky::_initVBIB() F32 zOffset = -( mCos( mSqrt( 1.0f ) ) + 0.01f ); mVB.set( GFX, mVertCount, GFXBufferTypeStatic ); - ScatterSkyVertex *pVert = mVB.lock(); + GFXVertexP *pVert = mVB.lock(); if(!pVert) return; for ( U32 y = 0; y < vertStride; y++ ) diff --git a/Engine/source/environment/scatterSky.h b/Engine/source/environment/scatterSky.h index d6c252e1b..287f6db1a 100644 --- a/Engine/source/environment/scatterSky.h +++ b/Engine/source/environment/scatterSky.h @@ -57,12 +57,6 @@ class TimeOfDay; class CubemapData; class MatrixSet; - -GFXDeclareVertexFormat( ScatterSkyVertex ) -{ - Point3F point; -}; - class ScatterSky : public SceneObject, public ISceneLight { typedef SceneObject Parent; @@ -226,7 +220,7 @@ protected: // Prim buffer, vertex buffer and shader for rendering. GFXPrimitiveBufferHandle mPrimBuffer; - GFXVertexBufferHandle mVB; + GFXVertexBufferHandle mVB; GFXShaderRef mShader; GFXStateBlockRef mStateBlock;