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

Merge pull request #1570 from Areloch/SimPathTempRollback

Browse source 
Roll back the changes to simPath temporarily in order to merge in DX11
This commit is contained in:
Areloch 2016-03-29 00:09:13 -05:00
commit 2cc08c6664
2 changed files with 9 additions and 11 deletions
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; GFXStateBlockRef Marker::smStateBlock;
GFXVertexBufferHandle<GFXVertexPCT> Marker::smVertexBuffer; GFXVertexBufferHandle<GFXVertexPC> Marker::smVertexBuffer;
GFXPrimitiveBufferHandle Marker::smPrimitiveBuffer; GFXPrimitiveBufferHandle Marker::smPrimitiveBuffer;
static Point3F wedgePoints[4] = { static Point3F wedgePoints[4] = {
@ -295,14 +295,12 @@ void Marker::initGFXResources()
smStateBlock = GFX->createStateBlock(d); smStateBlock = GFX->createStateBlock(d);
smVertexBuffer.set(GFX, 4, GFXBufferTypeStatic); smVertexBuffer.set(GFX, 4, GFXBufferTypeStatic);
GFXVertexPCT* verts = smVertexBuffer.lock(); GFXVertexPC* verts = smVertexBuffer.lock();
verts[0].point = wedgePoints[0] * 1.25f; verts[0].point = wedgePoints[0] * 0.25f;
verts[1].point = wedgePoints[1] * 1.25f; verts[1].point = wedgePoints[1] * 0.25f;
verts[2].point = wedgePoints[2] * 1.25f; verts[2].point = wedgePoints[2] * 0.25f;
verts[3].point = wedgePoints[3] * 1.25f; verts[3].point = wedgePoints[3] * 0.25f;
verts[1].color = GFXVertexColor(ColorI(255, 0, 0, 255)); verts[0].color = verts[1].color = verts[2].color = verts[3].color = GFXVertexColor(ColorI(0, 255, 0, 255));
verts[0].color = verts[2].color = verts[3].color = GFXVertexColor(ColorI(0, 0, 255, 255));
smVertexBuffer.unlock(); smVertexBuffer.unlock();
smPrimitiveBuffer.set(GFX, 24, 12, GFXBufferTypeStatic); smPrimitiveBuffer.set(GFX, 24, 12, GFXBufferTypeStatic);
@ -419,7 +417,7 @@ bool Marker::onAdd()
if(!Parent::onAdd()) if(!Parent::onAdd())
return false; 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(); resetWorldBox();
if(gEditingMission) if(gEditingMission)

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

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