Apply patch to fix OSX compilation
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14591 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
parent
5899a26aad
commit
8cf0030a27
@ -1,7 +1,7 @@
|
|||||||
varying vec4 offset[2];
|
varying vec4 offset[2];
|
||||||
|
|
||||||
uniform sampler2D colorMapG;
|
uniform sampler2D colorMapG;
|
||||||
const float threshold = 0.1f;
|
const float threshold = 0.1;
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
vec3 weights = vec3(0.2126,0.7152, 0.0722); // ITU-R BT. 709
|
vec3 weights = vec3(0.2126,0.7152, 0.0722); // ITU-R BT. 709
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
|
|
||||||
uniform float speed;
|
uniform float speed;
|
||||||
uniform float height;
|
uniform float height;
|
||||||
uniform float length;
|
uniform float waveLength;
|
||||||
|
|
||||||
uniform vec3 lightdir;
|
uniform vec3 lightdir;
|
||||||
|
|
||||||
@ -15,7 +15,7 @@ void main()
|
|||||||
{
|
{
|
||||||
vec4 pos = gl_Vertex;
|
vec4 pos = gl_Vertex;
|
||||||
|
|
||||||
pos.y += (sin(pos.x/length + speed) + cos(pos.z/length + speed)) * height;
|
pos.y += (sin(pos.x/waveLength + speed) + cos(pos.z/waveLength + speed)) * height;
|
||||||
|
|
||||||
vec3 vertexPosition = vec3(gl_ModelViewMatrix * pos);
|
vec3 vertexPosition = vec3(gl_ModelViewMatrix * pos);
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_)
|
#elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_)
|
||||||
#include "CIrrDeviceMacOSX.h"
|
#include "MacOSX/CIrrDeviceMacOSX.h"
|
||||||
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
|
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
|
||||||
#define GL_GLEXT_LEGACY 1
|
#define GL_GLEXT_LEGACY 1
|
||||||
#endif
|
#endif
|
||||||
|
@ -10,9 +10,9 @@
|
|||||||
|
|
||||||
#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
|
#ifdef _IRR_COMPILE_WITH_OSX_DEVICE_
|
||||||
|
|
||||||
#include "CIrrDeviceStub.h"
|
#include "../CIrrDeviceStub.h"
|
||||||
#include "IrrlichtDevice.h"
|
#include "IrrlichtDevice.h"
|
||||||
#include "IImagePresenter.h"
|
#include "../IImagePresenter.h"
|
||||||
#include "IGUIEnvironment.h"
|
#include "IGUIEnvironment.h"
|
||||||
#include "ICursorControl.h"
|
#include "ICursorControl.h"
|
||||||
|
|
||||||
|
@ -85,7 +85,7 @@ void WaterShaderProvider::OnSetConstants(IMaterialRendererServices *srv, int)
|
|||||||
|
|
||||||
srv->setVertexShaderConstant("height", &height, 1);
|
srv->setVertexShaderConstant("height", &height, 1);
|
||||||
srv->setVertexShaderConstant("speed", &speed, 1);
|
srv->setVertexShaderConstant("speed", &speed, 1);
|
||||||
srv->setVertexShaderConstant("length", &m_length, 1);
|
srv->setVertexShaderConstant("waveLength", &m_length, 1);
|
||||||
|
|
||||||
// Can't use the firstdone optimization, as the callback is shared
|
// Can't use the firstdone optimization, as the callback is shared
|
||||||
//if (!firstdone)
|
//if (!firstdone)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user