Skip to content

Commit 40d3a31

Browse files
GuvaCodeGuvaCode
committed
update for release 5.5
1 parent 9921e88 commit 40d3a31

File tree

27 files changed

+228
-37
lines changed

27 files changed

+228
-37
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Haiku | :heavy_check_mark: |
6363
build and installation raylib
6464
--------
6565

66-
raylib binary releases for Windows, Linux and macOS are available at the [Github Releases page](https://github.com/raysan5/raylib/releases).
66+
raylib binary releases for Windows, Linux and macOS are available at the [Github Releases page](https://github.com/raysan5/raylib/releases),and also in the ray4laz/libs folder.
6767

6868
building raylib on multiple platforms
6969
--------

‎binary/resources/LICENSE.md‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
1-
| resource | author | licence | notes |
2-
| :----------------- | :-----------: | :------ | :---- |
3-
| models/barracks.obj,<br> models/barracks_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
4-
| models/church.obj,<br> models/church_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
5-
| models/watermill.obj,<br> models/watermill_diffuse.png | [Alberto Cano](https://www.artstation.com/albertocano) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
6-
| fudesumi.png | [Eiden Marsal](https://www.artstation.com/marshall_z) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/) | - |
7-
| mask.png | [@raysan5](https://github.com/raysan5) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | Made with [EffectTextureMaker](https://mebiusbox.github.io/contents/EffectTextureMaker/) |
8-
| plasma.png | [@chriscamacho](https://github.com/chriscamacho) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | - |
9-
| raysan.png | [@raysan5](https://github.com/raysan5) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | - |
10-
| space.png | ❔ | ❔ | - |
11-
| texel_checker.png | [@raysan5](https://github.com/raysan5) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | Made with [UV Checker Map Maker](http://uvchecker.byvalle.com/) |
12-
| cubicmap.png | [@raysan5](https://github.com/raysan5) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | - |
13-
| spark_flame.png | [@raysan5](https://github.com/raysan5) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | Made with [EffectTextureMaker](https://mebiusbox.github.io/contents/EffectTextureMaker/) |
1+
| resource | author | licence | notes |
2+
| :------------------- | :---------: | :------ | :---- |
3+
| boom.wav | [@raysan5](https://github.com/raysan5) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | Made with [rFXGen](https://raylibtech.itch.io/rfxgen) |
4+
| buttonfx.wav | [@raysan5](https://github.com/raysan5) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | Made with [rFXGen](https://raylibtech.itch.io/rfxgen) |
5+
| button.png | [@raysan5](https://github.com/raysan5) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | Made with [rFXGen](https://raylibtech.itch.io/rfxgen) |
6+
| spark_flame.png | [@raysan5](https://github.com/raysan5) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) | Made with [EffectTextureMaker](https://mebiusbox.github.io/contents/EffectTextureMaker/) |
7+
| ninepatch_button.png | [@overdev](https://github.com/overdev) | ❔ |
8+
| explosion.png | [Unity Labs Paris](https://blogs.unity3d.com/2016/11/28/free-vfx-image-sequences-flipbooks/) | [CC0](https://creativecommons.org/publicdomain/zero/1.0/) |
9+
| parrots.png | [Kodak set](http://r0k.us/graphics/kodak/) | ❔ | Original name: `kodim23.png`
10+
| cat.png | ❔ | ❔ | - |
11+
| wabbit_alpha.png | ❔ | ❔ | - |
12+
| custom_jupiter_crash.png | [Brian Kent (AEnigma)](https://www.dafont.com/es/aenigma.d188) | [Freeware](https://www.dafont.com/es/jupiter-crash.font) | Atlas created by [@raysan5](https://github.com/raysan5) |
13+
| KAISG.ttf | [Dieter Steffmann](http://www.steffmann.de/wordpress/) | [Freeware](https://www.1001fonts.com/users/steffmann/) | [Kaiserzeit Gotisch](https://www.dafont.com/es/kaiserzeit-gotisch.font) font |
14+
| fudesumi.png | [Eiden Marsal](https://www.artstation.com/marshall_z) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/) | - |
15+
| scarfy.png | [Eiden Marsal](https://www.artstation.com/marshall_z) | [CC-BY-NC](https://creativecommons.org/licenses/by-nc/4.0/legalcode) | - |
16+
| cyberpunk_street_background.png | [Luis Zuno](http://ansimuz.com/site/) | [CC-BY-3.0](http://creativecommons.org/licenses/by/3.0/) | [Cyberpunk Street Environment](https://ansimuz.itch.io/cyberpunk-street-environment) |
17+
| cyberpunk_street_foreground.png | [Luis Zuno](http://ansimuz.com/site/) | [CC-BY-3.0](http://creativecommons.org/licenses/by/3.0/) | [Cyberpunk Street Environment](https://ansimuz.itch.io/cyberpunk-street-environment) |
18+
| cyberpunk_street_midground.png | [Luis Zuno](http://ansimuz.com/site/) | [CC-BY-3.0](http://creativecommons.org/licenses/by/3.0/) | [Cyberpunk Street Environment](https://ansimuz.itch.io/cyberpunk-street-environment) |

‎binary/resources/coin.wav‎

13 KB
Binary file not shown.

‎binary/resources/fudesumi.png‎

-156 Bytes
Loading

‎binary/resources/models/vox/fez.vox‎

1.07 MB
Binary file not shown.

‎binary/resources/shaders/glsl100/lighting.fs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ void main()
4040
vec3 viewD = normalize(viewPos - fragPosition);
4141
vec3 specular = vec3(0.0);
4242

43+
vec4 tint = colDiffuse * fragColor;
44+
4345
// NOTE: Implement here your fragment shader code
4446

4547
for (int i = 0; i < MAX_LIGHTS; i++)
@@ -67,7 +69,7 @@ void main()
6769
}
6870
}
6971

70-
vec4 finalColor = (texelColor*((colDiffuse + vec4(specular, 1.0))*vec4(lightDot, 1.0)));
72+
vec4 finalColor = (texelColor*((tint + vec4(specular, 1.0))*vec4(lightDot, 1.0)));
7173
finalColor += texelColor*(ambient/10.0);
7274

7375
// Gamma correction

‎binary/resources/shaders/glsl100/skinning.fs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#version 100
2+
3+
precision mediump float;
4+
5+
// Input vertex attributes (from vertex shader)
6+
varying vec2 fragTexCoord;
7+
varying vec4 fragColor;
8+
9+
// Input uniform values
10+
uniform sampler2D texture0;
11+
uniform vec4 colDiffuse;
12+
13+
void main()
14+
{
15+
// Fetch color from texture sampler
16+
vec4 texelColor = texture2D(texture0, fragTexCoord);
17+
18+
// Calculate final fragment color
19+
gl_FragColor = texelColor*colDiffuse*fragColor;
20+
}

‎binary/resources/shaders/glsl100/skinning.vs‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
#version 100
2+
3+
#define MAX_BONE_NUM 64
4+
5+
// Input vertex attributes
6+
attribute vec3 vertexPosition;
7+
attribute vec2 vertexTexCoord;
8+
attribute vec4 vertexColor;
9+
attribute vec4 vertexBoneIds;
10+
attribute vec4 vertexBoneWeights;
11+
12+
// Input uniform values
13+
uniform mat4 mvp;
14+
uniform mat4 boneMatrices[MAX_BONE_NUM];
15+
16+
// Output vertex attributes (to fragment shader)
17+
varying vec2 fragTexCoord;
18+
varying vec4 fragColor;
19+
20+
void main()
21+
{
22+
int boneIndex0 = int(vertexBoneIds.x);
23+
int boneIndex1 = int(vertexBoneIds.y);
24+
int boneIndex2 = int(vertexBoneIds.z);
25+
int boneIndex3 = int(vertexBoneIds.w);
26+
27+
// WARNING: OpenGL ES 2.0 does not support automatic matrix transposing, neither transpose() function
28+
mat4 boneMatrixTransposed0 = mat4(
29+
vec4(boneMatrices[boneIndex0][0].x, boneMatrices[boneIndex0][1].x, boneMatrices[boneIndex0][2].x, boneMatrices[boneIndex0][3].x),
30+
vec4(boneMatrices[boneIndex0][0].y, boneMatrices[boneIndex0][1].y, boneMatrices[boneIndex0][2].y, boneMatrices[boneIndex0][3].y),
31+
vec4(boneMatrices[boneIndex0][0].z, boneMatrices[boneIndex0][1].z, boneMatrices[boneIndex0][2].z, boneMatrices[boneIndex0][3].z),
32+
vec4(boneMatrices[boneIndex0][0].w, boneMatrices[boneIndex0][1].w, boneMatrices[boneIndex0][2].w, boneMatrices[boneIndex0][3].w));
33+
mat4 boneMatrixTransposed1 = mat4(
34+
vec4(boneMatrices[boneIndex1][0].x, boneMatrices[boneIndex1][1].x, boneMatrices[boneIndex1][2].x, boneMatrices[boneIndex1][3].x),
35+
vec4(boneMatrices[boneIndex1][0].y, boneMatrices[boneIndex1][1].y, boneMatrices[boneIndex1][2].y, boneMatrices[boneIndex1][3].y),
36+
vec4(boneMatrices[boneIndex1][0].z, boneMatrices[boneIndex1][1].z, boneMatrices[boneIndex1][2].z, boneMatrices[boneIndex1][3].z),
37+
vec4(boneMatrices[boneIndex1][0].w, boneMatrices[boneIndex1][1].w, boneMatrices[boneIndex1][2].w, boneMatrices[boneIndex1][3].w));
38+
mat4 boneMatrixTransposed2 = mat4(
39+
vec4(boneMatrices[boneIndex2][0].x, boneMatrices[boneIndex2][1].x, boneMatrices[boneIndex2][2].x, boneMatrices[boneIndex2][3].x),
40+
vec4(boneMatrices[boneIndex2][0].y, boneMatrices[boneIndex2][1].y, boneMatrices[boneIndex2][2].y, boneMatrices[boneIndex2][3].y),
41+
vec4(boneMatrices[boneIndex2][0].z, boneMatrices[boneIndex2][1].z, boneMatrices[boneIndex2][2].z, boneMatrices[boneIndex2][3].z),
42+
vec4(boneMatrices[boneIndex2][0].w, boneMatrices[boneIndex2][1].w, boneMatrices[boneIndex2][2].w, boneMatrices[boneIndex2][3].w));
43+
mat4 boneMatrixTransposed3 = mat4(
44+
vec4(boneMatrices[boneIndex3][0].x, boneMatrices[boneIndex3][1].x, boneMatrices[boneIndex3][2].x, boneMatrices[boneIndex3][3].x),
45+
vec4(boneMatrices[boneIndex3][0].y, boneMatrices[boneIndex3][1].y, boneMatrices[boneIndex3][2].y, boneMatrices[boneIndex3][3].y),
46+
vec4(boneMatrices[boneIndex3][0].z, boneMatrices[boneIndex3][1].z, boneMatrices[boneIndex3][2].z, boneMatrices[boneIndex3][3].z),
47+
vec4(boneMatrices[boneIndex3][0].w, boneMatrices[boneIndex3][1].w, boneMatrices[boneIndex3][2].w, boneMatrices[boneIndex3][3].w));
48+
49+
vec4 skinnedPosition =
50+
vertexBoneWeights.x*(boneMatrixTransposed0*vec4(vertexPosition, 1.0)) +
51+
vertexBoneWeights.y*(boneMatrixTransposed1*vec4(vertexPosition, 1.0)) +
52+
vertexBoneWeights.z*(boneMatrixTransposed2*vec4(vertexPosition, 1.0)) +
53+
vertexBoneWeights.w*(boneMatrixTransposed3*vec4(vertexPosition, 1.0));
54+
55+
fragTexCoord = vertexTexCoord;
56+
fragColor = vertexColor;
57+
58+
gl_Position = mvp*skinnedPosition;
59+
}

‎binary/resources/shaders/glsl120/lighting.fs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ void main()
3838
vec3 viewD = normalize(viewPos - fragPosition);
3939
vec3 specular = vec3(0.0);
4040

41+
vec4 tint = colDiffuse * fragColor;
42+
4143
// NOTE: Implement here your fragment shader code
4244

4345
for (int i = 0; i < MAX_LIGHTS; i++)
@@ -65,7 +67,7 @@ void main()
6567
}
6668
}
6769

68-
vec4 finalColor = (texelColor*((colDiffuse + vec4(specular, 1.0))*vec4(lightDot, 1.0)));
70+
vec4 finalColor = (texelColor*((tint + vec4(specular, 1.0))*vec4(lightDot, 1.0)));
6971
finalColor += texelColor*(ambient/10.0);
7072

7173
// Gamma correction

‎binary/resources/shaders/glsl330/lighting.fs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Input vertex attributes (from vertex shader)
44
in vec3 fragPosition;
55
in vec2 fragTexCoord;
6-
//in vec4 fragColor;
6+
in vec4 fragColor;
77
in vec3 fragNormal;
88

99
// Input uniform values
@@ -41,6 +41,8 @@ void main()
4141
vec3 viewD = normalize(viewPos - fragPosition);
4242
vec3 specular = vec3(0.0);
4343

44+
vec4 tint = colDiffuse * fragColor;
45+
4446
// NOTE: Implement here your fragment shader code
4547

4648
for (int i = 0; i < MAX_LIGHTS; i++)
@@ -68,8 +70,8 @@ void main()
6870
}
6971
}
7072

71-
finalColor = (texelColor*((colDiffuse + vec4(specular, 1.0))*vec4(lightDot, 1.0)));
72-
finalColor += texelColor*(ambient/10.0)*colDiffuse;
73+
finalColor = (texelColor*((tint + vec4(specular, 1.0))*vec4(lightDot, 1.0)));
74+
finalColor += texelColor*(ambient/10.0)*tint;
7375

7476
// Gamma correction
7577
finalColor = pow(finalColor, vec4(1.0/2.2));

0 commit comments

Comments
 (0)