diff --git a/HGGraphics.cpp b/HGGraphics.cpp index 40fdddb51..2b21244c7 100644 --- a/HGGraphics.cpp +++ b/HGGraphics.cpp @@ -26,6 +26,19 @@ namespace hg if(get3D()) { status.drawing3D = true; + + float effect{styleData.get3DSkew() * get3DMultiplier() * status.pulse3D}; + Vector2f skew{1.f, 1.f + effect}; + backgroundCamera.setSkew(skew); + + for(unsigned int i{0}; i < depthCameras.size(); ++i) + { + Camera& depthCamera(depthCameras[i]); + depthCamera.setView(backgroundCamera.getView()); + depthCamera.setSkew(skew); + depthCamera.setOffset({0, styleData.get3DSpacing() * (i * styleData.get3DPerspectiveMultiplier()) * (effect * 3.6f)}); + } + for(unsigned int i{0}; i < depthCameras.size(); ++i) { status.overrideColor = getColorDarkened(styleData.get3DOverrideColor(), styleData.get3DDarkenMultiplier()); diff --git a/HGUpdate.cpp b/HGUpdate.cpp index d07248919..5140c7ace 100644 --- a/HGUpdate.cpp +++ b/HGUpdate.cpp @@ -147,16 +147,6 @@ namespace hg if(status.pulse3D > styleData.get3DPulseMax()) status.pulse3DDirection = -1; else if(status.pulse3D < styleData.get3DPulseMin()) status.pulse3DDirection = 1; - float effect{styleData.get3DSkew() * get3DMultiplier() * status.pulse3D}; - Vector2f skew{1.f, 1.f + effect}; - backgroundCamera.setSkew(skew); - - for(unsigned int i{0}; i < depthCameras.size(); ++i) - { - Camera& depthCamera(depthCameras[i]); - depthCamera.setView(backgroundCamera.getView()); - depthCamera.setSkew(skew); - depthCamera.setOffset({0, styleData.get3DSpacing() * (i * styleData.get3DPerspectiveMultiplier()) * (effect * 3.6f)}); - } + } } diff --git a/_RELEASE/config.json b/_RELEASE/config.json index 3e8698495..80cbc529c 100644 --- a/_RELEASE/config.json +++ b/_RELEASE/config.json @@ -35,8 +35,8 @@ "flash_enabled": true, // Audio options - "no_sound": true, - "no_music": true, + "no_sound": false, + "no_music": false, "sound_volume": 100, "music_volume": 75,