Skip to content

Commit ab874e9

Browse files
committed
syncronize to raylib-dev
1 parent 9b64113 commit ab874e9

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

binary/resources/distortion100.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ uniform vec2 leftScreenCenter;
1717
uniform vec2 rightScreenCenter;
1818
uniform vec2 scale;
1919
uniform vec2 scaleIn;
20-
uniform vec4 hmdWarpParam;
20+
uniform vec4 deviceWarpParam;
2121
uniform vec4 chromaAbParam;
2222

2323
void main()
@@ -27,7 +27,7 @@ void main()
2727
vec2 screenCenter = fragTexCoord.x < 0.5? leftScreenCenter : rightScreenCenter;
2828
vec2 theta = (fragTexCoord - lensCenter)*scaleIn;
2929
float rSq = theta.x*theta.x + theta.y*theta.y;
30-
vec2 theta1 = theta*(hmdWarpParam.x + hmdWarpParam.y*rSq + hmdWarpParam.z*rSq*rSq + hmdWarpParam.w*rSq*rSq*rSq);
30+
vec2 theta1 = theta*(deviceWarpParam.x + deviceWarpParam.y*rSq + deviceWarpParam.z*rSq*rSq + deviceWarpParam.w*rSq*rSq*rSq);
3131
vec2 thetaBlue = theta1*(chromaAbParam.z + chromaAbParam.w*rSq);
3232
vec2 tcBlue = lensCenter + scale*thetaBlue;
3333

binary/resources/distortion330.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ uniform vec2 leftScreenCenter = vec2(0.25, 0.5);
1818
uniform vec2 rightScreenCenter = vec2(0.75, 0.5);
1919
uniform vec2 scale = vec2(0.25, 0.45);
2020
uniform vec2 scaleIn = vec2(4, 2.2222);
21-
uniform vec4 hmdWarpParam = vec4(1, 0.22, 0.24, 0);
21+
uniform vec4 deviceWarpParam = vec4(1, 0.22, 0.24, 0);
2222
uniform vec4 chromaAbParam = vec4(0.996, -0.004, 1.014, 0.0);
2323

2424
void main()
@@ -28,7 +28,7 @@ void main()
2828
vec2 screenCenter = fragTexCoord.x < 0.5? leftScreenCenter : rightScreenCenter;
2929
vec2 theta = (fragTexCoord - lensCenter)*scaleIn;
3030
float rSq = theta.x*theta.x + theta.y*theta.y;
31-
vec2 theta1 = theta*(hmdWarpParam.x + hmdWarpParam.y*rSq + hmdWarpParam.z*rSq*rSq + hmdWarpParam.w*rSq*rSq*rSq);
31+
vec2 theta1 = theta*(deviceWarpParam.x + deviceWarpParam.y*rSq + deviceWarpParam.z*rSq*rSq + deviceWarpParam.w*rSq*rSq*rSq);
3232
vec2 thetaBlue = theta1*(chromaAbParam.z + chromaAbParam.w*rSq);
3333
vec2 tcBlue = lensCenter + scale*thetaBlue;
3434

-4.73 MB
Binary file not shown.

source/ray_header.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ TMesh = record
234234
// Animation vertex data
235235
animVertices : Psingle; // Animated vertex positions (after bones transformations)
236236
animNormals : Psingle; // Animated normals (after bones transformations)
237-
boneIds : Plongint; // Vertex bone ids, up to 4 bones influence by vertex (skinning)
237+
boneIds : Pbyte; // Vertex bone ids, up to 4 bones influence by vertex (skinning)
238238
boneWeights : Psingle; // Vertex bone weight, up to 4 bones influence by vertex (skinning)
239239
// OpenGL identifiers
240240
vaoId : dword; // OpenGL Vertex Array Object id

0 commit comments

Comments
 (0)