eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 13:39:18 +02:00
Code Issues 123 Wiki Activity

vbo changes, merge

Browse Source
This commit is contained in:
VB
2017-03-09 20:16:54 +01:00
parent a6e3e00e08 b5ae395c42
commit 3941283381
16 changed files with 376 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Track.cpp
View File

@@ -2473,22 +2473,18 @@ void TTrack::RaRenderVBO(int iPtr)
if ((seg = SwitchExtension->Segments[0]->RaSegCount()) > 0)
{
GfxRenderer.Bind( TextureID1 ); // szyny +
for (i = 0; i < seg; ++i)
glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 24 * i, 24);
glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 24 * seg);
iPtr += 24 * seg; // pominięcie lewej szyny
for (i = 0; i < seg; ++i)
glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 24 * i, 24);
glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 24 * seg);
iPtr += 24 * seg; // pominięcie prawej szyny
}
if (TextureID2)
if ((seg = SwitchExtension->Segments[1]->RaSegCount()) > 0)
{
GfxRenderer.Bind( TextureID2 ); // szyny -
for (i = 0; i < seg; ++i)
glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 24 * i, 24);
glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 24 * seg);
iPtr += 24 * seg; // pominięcie lewej szyny
for (i = 0; i < seg; ++i)
glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 24 * i, 24);
glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 24 * seg);
}
}
else // dla toru podsypka plus szyny
@@ -2498,18 +2494,15 @@ void TTrack::RaRenderVBO(int iPtr)
if (TextureID2)
{
GfxRenderer.Bind( TextureID2 ); // podsypka
for (i = 0; i < seg; ++i)
glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 8 * i, 8);
glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 8 * seg);
iPtr += 8 * seg; // pominięcie podsypki
}
if (TextureID1)
{
GfxRenderer.Bind( TextureID1 ); // szyny
for (i = 0; i < seg; ++i)
glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 24 * i, 24);
glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 24 * seg);
iPtr += 24 * seg; // pominięcie lewej szyny
for (i = 0; i < seg; ++i)
glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 24 * i, 24);
glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 24 * seg);
}
}
}
@@ -2520,34 +2513,27 @@ void TTrack::RaRenderVBO(int iPtr)
if (TextureID1)
{
GfxRenderer.Bind( TextureID1 ); // nawierzchnia
for (i = 0; i < seg; ++i)
{
glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 4);
iPtr += 4;
}
glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 4 * seg);
iPtr += 4 * seg;
}
if (TextureID2)
{
GfxRenderer.Bind( TextureID2 ); // pobocze
if (fTexHeight1 >= 0.0)
{ // normalna droga z poboczem
for (i = 0; i < seg; ++i)
glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 6 * i, 6);
glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 6 * seg);
iPtr += 6 * seg; // pominięcie lewego pobocza
for (i = 0; i < seg; ++i)
glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 6 * i, 6);
glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 6 * seg);
}
else
{ // z chodnikami o różnych szerokociach
if (fTexWidth != 0.0)
{
for (i = 0; i < seg; ++i)
glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 6 * i, 6);
glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 6 * seg);
iPtr += 6 * seg; // pominięcie lewego pobocza
}
if (fTexSlope != 0.0)
for (i = 0; i < seg; ++i)
glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 6 * i, 6);
glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 6 * seg);
}
}
}
@@ -2558,20 +2544,15 @@ void TTrack::RaRenderVBO(int iPtr)
if (TextureID1)
{
GfxRenderer.Bind( TextureID1 ); // nawierzchnia
for (i = 0; i < seg; ++i)
{
glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 4);
iPtr += 4;
}
glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 4 * seg);
iPtr += 4 * seg;
}
if (TextureID2)
{
GfxRenderer.Bind( TextureID2 ); // pobocze
for (i = 0; i < seg; ++i)
glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 6 * i, 6);
glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 6 * seg);
iPtr += 6 * seg; // pominięcie lewego pobocza
for (i = 0; i < seg; ++i)
glDrawArrays(GL_TRIANGLE_STRIP, iPtr + 6 * i, 6);
glDrawArrays(GL_TRIANGLE_STRIP, iPtr, 6 * seg);
}
}
break;