TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Roll back the changes to simPath temporarily in order to merge in DX11

Browse source
This commit is contained in:
Areloch 2016-03-29 00:08:18 -05:00
parent b9b11047bf
commit 4d190b1982
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Engine/source/scene/simPath.cpp
View file

@ -273,7 +273,7 @@ DefineEngineMethod( Path, getPathId, S32, (),,
//--------------------------------------------------------------------------
GFXStateBlockRef Marker::smStateBlock;
GFXVertexBufferHandle<GFXVertexPCT> Marker::smVertexBuffer;
GFXVertexBufferHandle<GFXVertexPC> Marker::smVertexBuffer;
GFXPrimitiveBufferHandle Marker::smPrimitiveBuffer;
static Point3F wedgePoints[4] = {
@ -295,14 +295,12 @@ void Marker::initGFXResources()
smStateBlock = GFX->createStateBlock(d);
smVertexBuffer.set(GFX, 4, GFXBufferTypeStatic);
GFXVertexPCT* verts = smVertexBuffer.lock();
verts[0].point = wedgePoints[0] * 1.25f;
verts[1].point = wedgePoints[1] * 1.25f;
verts[2].point = wedgePoints[2] * 1.25f;
verts[3].point = wedgePoints[3] * 1.25f;
verts[1].color = GFXVertexColor(ColorI(255, 0, 0, 255));
verts[0].color = verts[2].color = verts[3].color = GFXVertexColor(ColorI(0, 0, 255, 255));
GFXVertexPC* verts = smVertexBuffer.lock();
verts[0].point = wedgePoints[0] * 0.25f;
verts[1].point = wedgePoints[1] * 0.25f;
verts[2].point = wedgePoints[2] * 0.25f;
verts[3].point = wedgePoints[3] * 0.25f;
verts[0].color = verts[1].color = verts[2].color = verts[3].color = GFXVertexColor(ColorI(0, 255, 0, 255));
smVertexBuffer.unlock();
smPrimitiveBuffer.set(GFX, 24, 12, GFXBufferTypeStatic);
@ -419,7 +417,7 @@ bool Marker::onAdd()
if(!Parent::onAdd())
return false;
mObjBox = Box3F(Point3F(-1.25, -1.25, -1.25), Point3F(1.25, 1.25, 1.25));
mObjBox = Box3F(Point3F(-.25, -.25, -.25), Point3F(.25, .25, .25));
resetWorldBox();
if(gEditingMission)

2
Engine/source/scene/simPath.h
View file

@ -132,7 +132,7 @@ class Marker : public SceneObject
static void initGFXResources();
static GFXStateBlockRef smStateBlock;
static GFXVertexBufferHandle<GFXVertexPCT> smVertexBuffer;
static GFXVertexBufferHandle<GFXVertexPC> smVertexBuffer;
static GFXPrimitiveBufferHandle smPrimitiveBuffer;
public: