Przeglądaj źródła

Merge pull request #2266 from chaigler/scattersky_zoffset_fix

Resolves #1721 - ScatterSky zOffset
Areloch 7 lat temu
rodzic
commit
e32de9b6bf
1 zmienionych plików z 2 dodań i 2 usunięć
  1. 2 2
      Engine/source/environment/scatterSky.cpp

+ 2 - 2
Engine/source/environment/scatterSky.cpp

@@ -955,8 +955,9 @@ void ScatterSky::_render( ObjectRenderInst *ri, SceneRenderState *state, BaseMat
 
 
    Point3F camPos2 = state->getCameraPosition();
    Point3F camPos2 = state->getCameraPosition();
    MatrixF xfm(true);
    MatrixF xfm(true);
-   
+   xfm.setPosition(camPos2 - Point3F(0, 0, mZOffset));
    GFX->multWorld(xfm);
    GFX->multWorld(xfm);
+
    MatrixF xform(proj);//GFX->getProjectionMatrix());
    MatrixF xform(proj);//GFX->getProjectionMatrix());
    xform *= GFX->getViewMatrix();
    xform *= GFX->getViewMatrix();
    xform *=  GFX->getWorldMatrix();
    xform *=  GFX->getWorldMatrix();
@@ -968,7 +969,6 @@ void ScatterSky::_render( ObjectRenderInst *ri, SceneRenderState *state, BaseMat
       rotMat.set(EulerF(M_PI_F, 0.0, 0.0));
       rotMat.set(EulerF(M_PI_F, 0.0, 0.0));
       xform.mul(rotMat);
       xform.mul(rotMat);
    }
    }
-   xform.setPosition(xform.getPosition() - Point3F(0, 0, mZOffset));
 
 
    mShaderConsts->setSafe( mModelViewProjSC, xform );
    mShaderConsts->setSafe( mModelViewProjSC, xform );
    mShaderConsts->setSafe( mMiscSC, miscParams );
    mShaderConsts->setSafe( mMiscSC, miscParams );