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

final merge fixes

Browse Source
This commit is contained in:
VB
2017-04-25 15:01:17 +02:00
parent 061be38219
commit e5ce5b001f
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Ground.cpp
View File

@@ -857,10 +857,10 @@ void TSubRect::RaNodeAdd(TGroundNode *Node)
switch (Node->iType) switch (Node->iType)
{ {
case TP_TRACK: case TP_TRACK:
{ {
Node->nNext3 = nRender; Node->nNext3 = nRenderRect;
nRender = Node; nRenderRect = Node;
} // DL: do nieprzezroczystych } // VBO: do nieprzezroczystych z sektora
break; break;
case GL_TRIANGLE_STRIP: case GL_TRIANGLE_STRIP:
case GL_TRIANGLE_FAN: case GL_TRIANGLE_FAN:

8
Texture.cpp
View File

@@ -813,10 +813,10 @@ texture_manager::Bind( texture_manager::size_type const Id ) {
// having it active would lead to some terrain and spline chunks receiving wrong // having it active would lead to some terrain and spline chunks receiving wrong
// (the most recent?) texture, instead of the proper one. It'd also affect negatively // (the most recent?) texture, instead of the proper one. It'd also affect negatively
// light point rendering. // light point rendering.
if( Id == m_activetexture ) { //if( Id == m_activetexture ) {
// don't bind again what's already active // // don't bind again what's already active
return; // return;
} //}
// TODO: do binding in texture object, add support for other types // TODO: do binding in texture object, add support for other types
if( Id != 0 ) { if( Id != 0 ) {

1
Track.cpp
View File

@@ -2865,6 +2865,7 @@ TTrack * TTrack::RaAnimate()
glGetBufferSubData( glGetBufferSubData(
GL_ARRAY_BUFFER, SwitchExtension->iLeftVBO * sizeof(CVertNormTex), GL_ARRAY_BUFFER, SwitchExtension->iLeftVBO * sizeof(CVertNormTex),
2 * 2 * 12 * sizeof(CVertNormTex), &Vert); // pobranie fragmentu bufora VBO 2 * 2 * 12 * sizeof(CVertNormTex), &Vert); // pobranie fragmentu bufora VBO
//m7todo: co to jest?
if (SwitchExtension->RightSwitch) if (SwitchExtension->RightSwitch)
{ // nowa wersja z SPKS, ale odwrotnie lewa/prawa { // nowa wersja z SPKS, ale odwrotnie lewa/prawa
SwitchExtension->Segments[0]->RaAnimate(v, rpts3, -nnumPts, fTexLength, 0, SwitchExtension->Segments[0]->RaAnimate(v, rpts3, -nnumPts, fTexLength, 0,

2
shader.cpp
View File

@@ -132,7 +132,7 @@ gl_program_light::gl_program_light(std::vector<gl_shader> v) : gl_program_mvp(v)
glUseProgram(id); glUseProgram(id);
glUniform3f(ambient_uniform, 1.0f, 1.0f, 1.0f); glUniform3f(ambient_uniform, 1.0f, 1.0f, 1.0f);
glUniform1i(lcount_uniform, 0); glUniform1ui(lcount_uniform, 0);
} }
void gl_program_light::set_ambient(glm::vec3 &ambient) void gl_program_light::set_ambient(glm::vec3 &ambient)