mse / RSOD (public) (License: CC0 and other licenses) (since 2025-03-01) (hash sha1)
Free software FPS engine
Clone URLs: https://rocketgit.com/user/mse/RSOD ssh://rocketgit@ssh.rocketgit.com/user/mse/RSOD git://git.rocketgit.com/user/mse/RSOD
master
List of commits:
Subject Hash Author Date (UTC)
Add non-PBR rendering mode 73e514a9ee1d293da1882be089e063299efb58ed MSE 2025-02-08 00:36:59
Support non-square particle textures c89c63128d49d85411cb734580ad3bcfe972ba84 MSE 2025-01-02 08:41:59
Add aggressive/non-aggressive states to AI 2d34985bb1de0e18b1362471b53febf52a06fa23 MSE 2024-12-31 19:28:15
Emit particles within discRadius on XZ plane 2dc76026bf72da5951acf460de7dba9e7a4ac176 MSE 2024-12-30 20:25:52
Fix particle system regression 3711cfc1cfb24de67a75c5327b71825cad86f730 MSE 2024-12-24 02:08:06
Bugfix: clear particles on world unload 7b324698fce599637dd36c8e2e22056b2102c98f MSE 2024-12-20 02:20:25
Support vertical billboard particles 30d41a303b59d60439e30607b3345f5485fb1eb5 MSE 2024-12-20 02:12:41
Add continuous particle emitters 60abc606556ec80c0c930a504da4c24e1571fbc5 MSE 2024-12-18 06:45:42
Add defaultRain field (for later use) ecb27b40a1f17abdcdfb72f38945d1f98fabc648 MSE 2024-12-15 02:42:08
Support negative mass particles 37a0a4bfc78adb26ba4b9ba69688738c6c7467dc MSE 2024-12-13 17:35:01
Prevent Avatar::blendTo from freezing on same animation d990a5b32602a879e405c5e527ce3047e346bfba MSE 2024-09-25 02:37:26
Restructure Avatar::simulate 9519e901631ea04a1a93e24504d8f37c521164d1 MSE 2024-09-24 06:51:15
Blend avatar jump animations 8d26db0ecd4ef6a48546684e4bf2200bfea0f41b MSE 2024-09-20 08:19:20
Work on animation blending system eb5cfcf1387131b1ec8449e671d30efd787363b2 MSE 2024-09-20 06:40:35
Update stb_truetype 4948f1d29f33a33dc126d842d8d20f732f4cdef0 MSE 2024-09-18 17:38:06
Allow joystick to override mouse 6aba7a71ebe0dbd67717ae5a37e1729ebfe9895c MSE 2024-09-15 23:13:30
Add weapon switching via D-pad db14ce946f4c65ab6625875f00f82ee1b8052374 MSE 2024-09-15 20:10:20
Allow crouch to be turned off via playerCrouch flag 024d43d877ca16d21e0feeb50d70f82acd449335 MSE 2024-09-15 03:02:29
Add configurable third-person camera pitch constraints 9e2ebdd325515a5bc83cd49229cb099738fb9e0e MSE 2024-09-11 21:02:38
Add configurable thirdPersonCameraAutoRotateSpeed c3104421a4df91fbda573dadcce135f8016fa40e MSE 2024-09-11 19:27:17
Commit 73e514a9ee1d293da1882be089e063299efb58ed - Add non-PBR rendering mode
Author: MSE
Author date (UTC): 2025-02-08 00:36
Committer name: MSE
Committer date (UTC): 2025-02-08 00:36
Parent(s): c89c63128d49d85411cb734580ad3bcfe972ba84
Signer:
Signing key:
Signing status: N
Tree: 7817cbac3396a2f28537310307c84c7d2070cf07
File Lines added Lines deleted
base/glsl/dungeon_sky_low.frag 21 74
base/glsl/dungeon_sky_low.vert 0 0
src/fdungeon.cpp 3 3
src/rsod.cpp 12 1
File base/glsl/dungeon_sky_low.frag copied from file base/glsl/dungeon_sky_high.frag (similarity 68%) (mode: 100644) (index f90b543..1c6e2e1)
... ... in vec4 v_LightDirection;
30 30 in float v_bloodFactor; in float v_bloodFactor;
31 31 layout(location = 0) out vec4 fragColor; layout(location = 0) out vec4 fragColor;
32 32
33 // Are we using metallic/roughness textures? In RSOD, almost always no.
34 // Turning this off saves a texture lookup for most samples on the screen.
35 const bool pbrTextures = false;
36
37 33 const float VSM_MINIMUM_VARIANCE = 0.00001; const float VSM_MINIMUM_VARIANCE = 0.00001;
38 34 const float VSM_LEAK_REDUCTION = 0.4; const float VSM_LEAK_REDUCTION = 0.4;
39 35
 
... ... float VSM(){
62 58 return min( max( p, pMax ), 1.0 ); return min( max( p, pMax ), 1.0 );
63 59 } }
64 60
65 float DistributionGGX( vec3 N, vec3 H, float roughness ){
66 float a = roughness * roughness;
67 float a2 = a * a;
68 float clampedNdotH = max( dot( N, H ), 0.0 );
69 float denom = ( clampedNdotH * clampedNdotH * ( a2 - 1.0 ) + 1.0 );
70 denom = 3.14159 * denom * denom;
71 return a2 / denom;
72 }
73
74 float GeometrySchlickGGX(float NdotV, float roughness){
75 float r = roughness + 1.0;
76 float k = ( r * r ) / 8.0;
77 return NdotV / ( NdotV * ( 1.0 - k ) + k );
78 }
79
80 float GeometrySmith(vec3 N, vec3 V, vec3 L, float roughness){
81 float clampedNdotV = max( dot( N, V ), 0.0 );
82 float clampedNdotL = max( dot( N, L ), 0.0 );
83 float ggx2 = GeometrySchlickGGX( clampedNdotV, roughness );
84 float ggx1 = GeometrySchlickGGX( clampedNdotL, roughness );
85 return ggx1 * ggx2;
86 }
87
88 61 vec3 FresnelSchlickRoughness( float cosTheta, vec3 F0, float roughness ){ vec3 FresnelSchlickRoughness( float cosTheta, vec3 F0, float roughness ){
89 62 return F0 + ( max( vec3( 1.0 - roughness ), F0 ) - F0 ) * pow( 1.0 - cosTheta, 5.0 ); return F0 + ( max( vec3( 1.0 - roughness ), F0 ) - F0 ) * pow( 1.0 - cosTheta, 5.0 );
90 63 } }
 
... ... void main(){
130 103 // Apply color and blood factor before posterization to make it look more splotchy than glowy. // Apply color and blood factor before posterization to make it look more splotchy than glowy.
131 104 baseColor.rgb = mix( baseColor.rgb * v_Color, vec3(1.0, 0.0, 0.0), v_bloodFactor ); baseColor.rgb = mix( baseColor.rgb * v_Color, vec3(1.0, 0.0, 0.0), v_bloodFactor );
132 105
133 // Soft-posterize the base color.
134 float levels = 10.0;
135 float brightness = max( max( baseColor.r, max( baseColor.g, baseColor.b) ), 0.001 );
136 float lower = floor( brightness * levels ) / levels;
137 float upper = ceil( brightness * levels ) / levels;
138 float level = mix(
139 lower,
140 upper,
141 clamp( ( brightness - lower ) / ( upper - lower ) * 11.0 - 5.0, 0.0, 1.0 )
142 );
143 float adjustment = level / brightness;
106 // Approximation of posterization. Relatively cheap.
107 float brightness = max( max( baseColor.r, baseColor.g ), 0.001 );
144 108 // Apply the base color factor after posterization to allow a fuller range of colors. // Apply the base color factor after posterization to allow a fuller range of colors.
145 baseColor *= vec4( vec3( adjustment ), 1.0 ) * u_baseColorFactor;
109 baseColor *= vec4(vec3(floor(brightness * 10.0) * 0.1 / brightness), 1.0) * u_baseColorFactor;
146 110
147 vec2 mr = pbrTextures ? texture( u_metallicRoughness, v_UV ).xy : vec2( 1.0, 1.0 );
148 float metallic = mr.x * u_metallicFactor;
149 float roughness = mr.y * u_roughnessFactor;
111 float metallic = u_metallicFactor;
112 float roughness = u_roughnessFactor;
150 113
151 114 vec3 F0 = mix( vec3( 0.04 ), baseColor.rgb, metallic ); vec3 F0 = mix( vec3( 0.04 ), baseColor.rgb, metallic );
152 115
 
... ... void main(){
180 143 vec3 diffuseColor = baseColor.rgb * kD * SkyColor( N, 0.5, 1.0 - shadow ); vec3 diffuseColor = baseColor.rgb * kD * SkyColor( N, 0.5, 1.0 - shadow );
181 144
182 145 // Punctual color. This combines diffuse and specular for punctual lights. // Punctual color. This combines diffuse and specular for punctual lights.
146 // This shader uses an approximation of PBR punctual lighting with no concept of a distribution function.
183 147 vec3 punctualColor = vec3( 0.0, 0.0, 0.0 ); vec3 punctualColor = vec3( 0.0, 0.0, 0.0 );
184 148
185 149 // Loop through the punctual point lights. // Loop through the punctual point lights.
 
... ... void main(){
200 164 vec3 L = normalize( pos.xyz - v_AbsolutePos.xyz ); vec3 L = normalize( pos.xyz - v_AbsolutePos.xyz );
201 165 vec3 H = normalize( V + L ); vec3 H = normalize( V + L );
202 166
203 vec3 radiance = color.rgb * attenuation;
167 // Skip lighting if unlit.
168 if( dot( N, L ) < 0.0 ) continue;
204 169
205 // Cook-Torrance BRDF.
206 float NDF = DistributionGGX( N, H, roughness );
207 float G = GeometrySmith( N, V, L, roughness );
170 vec3 radiance = color.rgb * attenuation;
208 171
209 // Find new kS and kD based on light angle. Clamp glitched-out values.
210 kS = min( F0 + ( 1.0 - F0 ) * pow( 1.0 - max(dot(H, V), 0.0), 5.0 ), 10.0 );
211 kD = ( 1.0 - kS ) * ( 1.0 - metallic );
172 // Find kS and kD based on light angle. Clamp glitched-out values.
173 vec3 kS = min( F0 + ( 1.0 - F0 ) * pow( 1.0 - max(dot(H, V), 0.0), 5.0 ), 10.0 );
174 vec3 kD = ( 1.0 - kS ) * ( 1.0 - metallic );
212 175
213 float NdotL = dot( N, L );
214 vec3 specular = ( NDF * G * kS )
215 / ( 4 * max( dot(N, V), 0.0 ) * max(NdotL, 0.0) + 0.001 );
216 punctualColor += ( kD * baseColor.rgb + specular )
217 * radiance * linstep( -0.1, 0.0, NdotL );
176 punctualColor += ( kD * baseColor.rgb + kS ) * radiance;
218 177 } }
219 178
220 179 // Loop through the punctual spotlights. // Loop through the punctual spotlights.
 
... ... void main(){
240 199 float cd = dot( dir.xyz, L ); float cd = dot( dir.xyz, L );
241 200 float angularAttenuation = clamp(cd * spotAngle.x + spotAngle.y, 0.0, 1.0); float angularAttenuation = clamp(cd * spotAngle.x + spotAngle.y, 0.0, 1.0);
242 201 // Skip lighting if unlit. // Skip lighting if unlit.
243 if( angularAttenuation == 0.0 ) continue;
202 if( angularAttenuation == 0.0 || dot( N, L ) < 0.0 ) continue;
244 203 angularAttenuation *= angularAttenuation; angularAttenuation *= angularAttenuation;
245 204 attenuation *= angularAttenuation; attenuation *= angularAttenuation;
246 205 vec3 radiance = color.rgb * attenuation; vec3 radiance = color.rgb * attenuation;
247 206
248 // Cook-Torrance BRDF.
249 float NDF = DistributionGGX( N, H, roughness );
250 float G = GeometrySmith( N, V, L, roughness );
251
252 // Find new kS and kD based on light angle. Clamp glitched-out values.
253 kS = min( F0 + ( 1.0 - F0 ) * pow( 1.0 - max(dot(H, V), 0.0), 5.0 ), 10.0 );
254 kD = ( 1.0 - kS ) * ( 1.0 - metallic );
207 // Find kS and kD based on light angle. Clamp glitched-out values.
208 vec3 kS = min( F0 + ( 1.0 - F0 ) * pow( 1.0 - max(dot(H, V), 0.0), 5.0 ), 10.0 );
209 vec3 kD = ( 1.0 - kS ) * ( 1.0 - metallic );
255 210
256 float NdotL = dot( N, L );
257 vec3 specular = ( NDF * G * kS )
258 / ( 4 * max( dot(N, V), 0.0 ) * max(NdotL, 0.0) + 0.001 );
259 punctualColor += ( kD * baseColor.rgb + specular )
260 * radiance * linstep( -0.1, 0.0, NdotL );
211 punctualColor += ( kD * baseColor.rgb + kS ) * radiance;
261 212 } }
262 213
263 // Combine specular, diffuse, and shadow. TODO: Replace this ambient color term and IBL with global ambient GI.
214 // Combine specular, diffuse, and shadow.
264 215 vec3 litColor = (diffuseColor + specularColor + punctualColor * punctualFactor) * 0.3 * u_ambient.rgb * (1.0 - shadow); vec3 litColor = (diffuseColor + specularColor + punctualColor * punctualFactor) * 0.3 * u_ambient.rgb * (1.0 - shadow);
265 216
266 // Add a sheen where the water meets the surface.
267 vec3 sheen = vec3(min(max(0.5 - abs((u_waterHeights.x - v_AbsolutePos.y - 0.09) * 5.0 + 0.3) - shadow * 0.5, 0.0), 0.35)) * vec3(1.0, 1.0, 1.2);
268
269 217 // Tint the lit color when underwater. // Tint the lit color when underwater.
270 218 litColor = mix( litColor = mix(
271 219 litColor, litColor,
272 u_underwater.rgb + sheen,
220 u_underwater.rgb,
273 221 u_underwater.a * f * f u_underwater.a * f * f
274 222 ); );
275 223
 
... ... void main(){
277 225 litColor += emissiveColor; litColor += emissiveColor;
278 226
279 227 // Interpolate between lit color and fog. // Interpolate between lit color and fog.
280 //fragColor = vec4( mix(u_fog.rgb, litColor.rgb, visibility), baseColor.a );
281 fragColor = vec4( mix(SkyColor(-V, 0.65, 0.0), litColor.rgb, visibility), baseColor.a );
228 fragColor = vec4( mix(u_fog.rgb, litColor.rgb, visibility), baseColor.a );
282 229
283 230 // Debug normals. // Debug normals.
284 231 //fragColor = vec4( N * 0.5 + vec3( 0.5 ), 1.0 ); //fragColor = vec4( N * 0.5 + vec3( 0.5 ), 1.0 );
File base/glsl/dungeon_sky_low.vert copied from file base/glsl/dungeon_sky_high.vert (similarity 100%)
File src/fdungeon.cpp changed (mode: 100644) (index 84bce67..e921865)
... ... class Dungeon {
364 364 bool thirdPerson = false; bool thirdPerson = false;
365 365 // Top-down view. // Top-down view.
366 366 bool topDown = false; bool topDown = false;
367 // High-quality rendering. TODO: Non-PBR is currently non-functional.
367 // High-quality (PBR) rendering.
368 368 bool pbr = true; bool pbr = true;
369 369 // High-resolution shadowing. // High-resolution shadowing.
370 370 bool shadowHighRes = true; bool shadowHighRes = true;
 
... ... void Dungeon::initGraphics( std::string shaderPath ){
778 778 if( !shadowBlurPipeline.success ) if( !shadowBlurPipeline.success )
779 779 shadowBlurPipeline = loadShaders( pre + "shadow_blur.vert", pre + "shadow_blur.frag", shadowBlurSamplers ); shadowBlurPipeline = loadShaders( pre + "shadow_blur.vert", pre + "shadow_blur.frag", shadowBlurSamplers );
780 780 // Load the dungeon shader pipelines. // Load the dungeon shader pipelines.
781 //if( !dungeonPipeline.success )
782 // dungeonPipeline = loadShaders( pre + "dungeon_sky_low.vert", pre + "dungeon_sky_low.frag", dungeonSamplers );
781 if( !dungeonPipeline.success )
782 dungeonPipeline = loadShaders( pre + "dungeon_sky_low.vert", pre + "dungeon_sky_low.frag", dungeonSamplers );
783 783 if( !pbrDungeonPipeline.success ) if( !pbrDungeonPipeline.success )
784 784 pbrDungeonPipeline = loadShaders( pre + "dungeon_sky_high.vert", pre + "dungeon_sky_high.frag", pbrDungeonSamplers ); pbrDungeonPipeline = loadShaders( pre + "dungeon_sky_high.vert", pre + "dungeon_sky_high.frag", pbrDungeonSamplers );
785 785 if( !skinPipeline.success ) if( !skinPipeline.success )
File src/rsod.cpp changed (mode: 100644) (index 9db7cef..f65ceb1)
... ... float max_resolution_scale = 1.0f;
367 367 // VR settings. use_xr = OpenXR drivers, use_stereogram = side-by-side or anaglyph // VR settings. use_xr = OpenXR drivers, use_stereogram = side-by-side or anaglyph
368 368 bool use_xr = false, use_stereogram = false, use_anaglyph = true; bool use_xr = false, use_stereogram = false, use_anaglyph = true;
369 369
370 // Use high-quality (PBR) shaders?
371 bool use_pbr = true;
372
370 373 // Draw black outlines around objects? // Draw black outlines around objects?
371 374 bool draw_outlines = true; bool draw_outlines = true;
372 375
 
... ... void ParseSettings(){
1242 1245 // Get the MSAA value only before fb_left is initialized. // Get the MSAA value only before fb_left is initialized.
1243 1246 int msaa_val = std::strtol(misc->get("msaa").c_str(), &p, 10); int msaa_val = std::strtol(misc->get("msaa").c_str(), &p, 10);
1244 1247 if(!*p && !fb_left.success) msaa = msaa_val; if(!*p && !fb_left.success) msaa = msaa_val;
1248 // PBR toggle.
1249 std::string pbr_str = misc->get( "pbr" );
1250 if(pbr_str == "true" || pbr_str == "True" || pbr_str == "TRUE"){
1251 use_pbr = true;
1252 }else{
1253 use_pbr = false;
1254 }
1245 1255 // 3D mode toggle. // 3D mode toggle.
1246 1256 std::string anaglyph_3d = misc->get( "anaglyph_3d" ); std::string anaglyph_3d = misc->get( "anaglyph_3d" );
1247 1257 if(anaglyph_3d == "true" || anaglyph_3d == "True" || anaglyph_3d == "TRUE"){ if(anaglyph_3d == "true" || anaglyph_3d == "True" || anaglyph_3d == "TRUE"){
 
... ... void InitSettings(){
1413 1423 misc.set( "max_draw_distance", "1000.0" ); misc.set( "max_draw_distance", "1000.0" );
1414 1424 misc.set( "max_resolution_scale", "1.0" ); misc.set( "max_resolution_scale", "1.0" );
1415 1425 misc.set( "msaa", "2" ); misc.set( "msaa", "2" );
1426 misc.set( "pbr", "true" );
1416 1427 misc.set( "anaglyph_3d", "false" ); misc.set( "anaglyph_3d", "false" );
1417 1428 misc.set( "always_run", player_default_always_run ? "true" : "false" ); misc.set( "always_run", player_default_always_run ? "true" : "false" );
1418 1429 char* http_proxy = std::getenv( "http_proxy" ); char* http_proxy = std::getenv( "http_proxy" );
 
... ... void FirstPersonLoop( double d ){
3906 3917 } }
3907 3918
3908 3919 // Simulate and draw the dungeon to the screen. // Simulate and draw the dungeon to the screen.
3909 //dungeon.pbr = std::stoi( settings.sections.get( "Misc" ).get( "PBR" ) );
3920 dungeon.pbr = use_pbr;
3910 3921 dungeon.outline = draw_outlines; dungeon.outline = draw_outlines;
3911 3922 dungeon.frameBuf = &fb_left; dungeon.frameBuf = &fb_left;
3912 3923 fdungeon::Agent *last_parent = fdungeon::Agent *last_parent =
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/mse/RSOD

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/mse/RSOD

Clone this repository using git:
git clone git://git.rocketgit.com/user/mse/RSOD

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main