diff --git a/project/include/Graphics.h b/project/include/Graphics.h index 38aea3bae..f64829063 100644 --- a/project/include/Graphics.h +++ b/project/include/Graphics.h @@ -308,7 +308,7 @@ public: const QuickVec &inIndixes, const QuickVec &inUVT, int inCull, const QuickVec &inColours, - int blendMode, const QuickVec &inViewport ); + int blendMode); VertexType mType; int mTriangleCount; @@ -316,7 +316,6 @@ public: QuickVec mUVT; QuickVec mColours; int mBlendMode; - QuickVec mViewport; }; // ---------------------------------------------------------------------- @@ -509,7 +508,6 @@ struct HardwareArrays Vertices mVertices; TexCoords mTexCoords; Colours mColours; - QuickVec mViewport; Surface *mSurface; unsigned int mFlags; //unsigned int mVertexBO; @@ -669,7 +667,7 @@ public: void drawPoints(QuickVec inXYs, QuickVec inRGBAs, unsigned int inDefaultRGBA=0xffffffff, double inSize=-1.0 ); void drawTriangles(const QuickVec &inXYs, const QuickVec &inIndixes, const QuickVec &inUVT, int inCull, const QuickVec &inColours, - int blendMode, const QuickVec &inViewport ); + int blendMode); const Extent2DF &GetExtent0(double inRotation); bool HitTest(const UserPoint &inPoint); diff --git a/project/src/common/ExternalInterface.cpp b/project/src/common/ExternalInterface.cpp index 2bc323f3f..791fb2c0b 100644 --- a/project/src/common/ExternalInterface.cpp +++ b/project/src/common/ExternalInterface.cpp @@ -2289,7 +2289,7 @@ DEFINE_PRIM_MULT(lime_gfx_draw_round_rect); value lime_gfx_draw_triangles(value *arg, int args ) { - enum { aGfx, aVertices, aIndices, aUVData, aCull, aColours, aBlend, aViewport }; + enum { aGfx, aVertices, aIndices, aUVData, aCull, aColours, aBlend }; Graphics *gfx; if (AbstractToObject(arg[aGfx],gfx)) @@ -2298,15 +2298,13 @@ value lime_gfx_draw_triangles(value *arg, int args ) QuickVec indices; QuickVec uvt; QuickVec colours; - QuickVec viewport; FillArrayDouble(vertices,arg[aVertices]); FillArrayInt(indices,arg[aIndices]); FillArrayDouble(uvt,arg[aUVData]); FillArrayInt(colours, arg[aColours]); - FillArrayDoubleN(viewport, arg[aViewport] ); - gfx->drawTriangles(vertices, indices, uvt, val_int(arg[aCull]), colours, val_int( arg[ aBlend ] ), viewport ); + gfx->drawTriangles(vertices, indices, uvt, val_int(arg[aCull]), colours, val_int( arg[ aBlend ] ) ); } return alloc_null(); diff --git a/project/src/common/Graphics.cpp b/project/src/common/Graphics.cpp index 0c2d3567e..c60c54756 100644 --- a/project/src/common/Graphics.cpp +++ b/project/src/common/Graphics.cpp @@ -439,7 +439,7 @@ void Graphics::drawTriangles(const QuickVec &inXYs, const QuickVec &inIndices, const QuickVec &inUVT, int inCull, const QuickVec &inColours, - int blendMode, const QuickVec &inViewport ) + int blendMode) { Flush( ); @@ -451,7 +451,7 @@ void Graphics::drawTriangles(const QuickVec &inXYs, IGraphicsFill *fill = mFillJob.mFill; GraphicsTrianglePath *path = new GraphicsTrianglePath(inXYs, - inIndices, inUVT, inCull, inColours, blendMode, inViewport ); + inIndices, inUVT, inCull, inColours, blendMode ); GraphicsJob job; path->IncRef(); diff --git a/project/src/common/GraphicsData.cpp b/project/src/common/GraphicsData.cpp index 8e23c4ae8..4f0db2873 100644 --- a/project/src/common/GraphicsData.cpp +++ b/project/src/common/GraphicsData.cpp @@ -172,7 +172,7 @@ GraphicsTrianglePath::GraphicsTrianglePath( const QuickVec &inXYs, const QuickVec &inIndices, const QuickVec &inUVT, int inCull, const QuickVec &inColours, - int inBlendMode, const QuickVec &inViewport ) + int inBlendMode) { UserPoint *v = (UserPoint *) &inXYs[0]; uint32 *c = (uint32 *) &inColours[0]; @@ -183,7 +183,6 @@ GraphicsTrianglePath::GraphicsTrianglePath( const QuickVec &inXYs, const float *uvt = &inUVT[0]; mBlendMode = inBlendMode; - mViewport = inViewport; if (inIndices.empty()) { diff --git a/project/src/common/Hardware.cpp b/project/src/common/Hardware.cpp index 56aa46f95..fd0b07dfb 100644 --- a/project/src/common/Hardware.cpp +++ b/project/src/common/Hardware.cpp @@ -253,9 +253,6 @@ public: mElement.mFirst = vertices.size() / (persp?2:1); mElement.mPrimType = ptTriangles; - //Just overwriting viewport - mArrays->mViewport = inPath->mViewport; - const float *t = &inPath->mUVT[0]; for(int v=0;vmVertices.size();v++) { @@ -293,9 +290,6 @@ public: mElement.mFirst = vertices.size(); mElement.mPrimType = ptLines; - //Just overwriting blend mode and viewport - mArrays->mViewport = inPath->mViewport; - int tri_count = inPath->mVertices.size()/3; UserPoint *tri = &inPath->mVertices[0]; for(int v=0;v