reverted sky shader

RigsOfRods · May 27, 2024 · 806214d · 806214d
1 parent 7f1e5c0
commit 806214d
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 417 deletions.
diff --git a/resources/materials/SkyGLSL.frag b/resources/materials/SkyGLSL.frag
diff --git a/resources/materials/SkyGLSL.vert b/resources/materials/SkyGLSL.vert
diff --git a/resources/materials/SkyHLSL.frag b/resources/materials/SkyHLSL.frag
diff --git a/resources/materials/SkyHLSL.vert b/resources/materials/SkyHLSL.vert
diff --git a/resources/materials/ror.material b/resources/materials/ror.material
@@ -1901,79 +1901,21 @@ material tracks/abflame
 	}
 }
 
-vertex_program SkyHLSLVertex hlsl
-{
-    source SkyHLSL.vert
-    entry_point mainVP
-    target vs_3_0
-
-    default_params
-    {
-        param_named_auto worldViewProj worldviewproj_matrix
-    }
-}
-
-fragment_program SkyHLSLFragment hlsl
-{
-    source SkyHLSL.frag
-    entry_point mainFP
-    target ps_3_0
-}
-
-vertex_program SkyGLSLVertex glsl
-{
-    source SkyGLSL.vert
-
-    default_params
-    {
-        param_named_auto worldViewProj worldviewproj_matrix
-    }
-}
-
-fragment_program SkyGLSLFragment glsl
-{
-    source SkyGLSL.frag
-}
-
-vertex_program SkyVS unified
-{
-    delegate SkyHLSLVertex
-    delegate SkyGLSLVertex
-}
-
-fragment_program SkyFS unified
-{
-    delegate SkyHLSLFragment
-    delegate SkyGLSLFragment
-}
-
 material tracks/skyboxcol
 {
     technique
     {
         pass
         {
-	    receive_shadows off
+            fog_override true
             lighting off
             depth_write off
-            depth_check off
+//         depth_check off
 
-            vertex_program_ref SkyVS
-            {
-            }
-            fragment_program_ref SkyFS
+            texture_unit
             {
-                param_named_auto iTime time
-                param_named_auto iResolution_x viewport_width
-                param_named_auto iResolution_y viewport_height
-
-                param_named sun_size float 1.0
-                param_named sky_yaw float 1.0
-                param_named sky_pitch float 1.0
-                param_named sky_roll float 1.0
-                param_named sky_fov float 60.0
-                param_named cloud_density float 0.0
-                param_named sky_light float 0.7
+                cubic_texture cloudy_noon.dds separateUV
+                tex_address_mode clamp
             }
         }
     }

diff --git a/source/main/Application.cpp b/source/main/Application.cpp
@@ -421,7 +421,7 @@ std::string ToLocalizedString(GfxSkyMode e)
 {
     switch (e)
     {
-    case GfxSkyMode::BASIC: return _LC("GfxSkyMode", "Basic (fastest)");
+    case GfxSkyMode::SANDSTORM: return _LC("GfxSkyMode", "Sandstorm (fastest)");
     case GfxSkyMode::CAELUM:    return _LC("GfxSkyMode", "Caelum (best looking, slower)");
     case GfxSkyMode::SKYX:      return _LC("GfxSkyMode", "SkyX (best looking, slower)");
     default:                    return "";

diff --git a/source/main/Application.h b/source/main/Application.h
@@ -244,7 +244,7 @@ std::string ToLocalizedString(GfxWaterMode e);
 
 enum class GfxSkyMode
 {
-    BASIC,  //!< Basic (fastest)
+    SANDSTORM,  //!< Sandstorm (fastest)
     CAELUM,     //!< Caelum (best looking, slower)
     SKYX,       //!< SkyX (best looking, slower)
 };

diff --git a/source/main/GameContext.cpp b/source/main/GameContext.cpp
@@ -1197,39 +1197,6 @@ void GameContext::UpdateSimInputEvents(float dt)
 
 void GameContext::UpdateSkyInputEvents(float dt)
 {
-  if (App::gfx_sky_mode->getEnum<GfxSkyMode>() == GfxSkyMode::BASIC)
-  {
-      float light = App::GetGuiManager()->TopMenubar.sky_light;
-      Ogre::MaterialPtr sky_material = Ogre::MaterialManager::getSingleton().getByName("tracks/skyboxcol", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
-      Ogre::GpuProgramParametersSharedPtr sky_params = sky_material->getTechnique(0)->getPass(0)->getFragmentProgramParameters();
-
-      if (RoR::App::GetInputEngine()->getEventBoolValue(EV_SKY_INCREASE_TIME))
-      {
-          light += 0.001;
-      }
-      else if (RoR::App::GetInputEngine()->getEventBoolValue(EV_SKY_DECREASE_TIME))
-      {
-          light -= 0.001;
-      }
-      if (RoR::App::GetInputEngine()->getEventBoolValue(EV_SKY_INCREASE_TIME_FAST))
-      {
-          light += 0.01;
-      }
-      else if (RoR::App::GetInputEngine()->getEventBoolValue(EV_SKY_DECREASE_TIME_FAST))
-      {
-          light -= 0.01;
-      }
-
-      if (App::GetGuiManager()->TopMenubar.sky_light != light && light >= 0.0 && light <= 1.0)
-      {
-          App::GetGuiManager()->TopMenubar.sky_light = light;
-          sky_params->setNamedConstant("sky_light", light);
-          sky_material->getTechnique(0)->getPass(0)->setFragmentProgramParameters(sky_params);
-          App::GetGfxScene()->GetSceneManager()->setAmbientLight(Ogre::ColourValue(light, light, light));
-          App::GetConsole()->putMessage(Console::CONSOLE_MSGTYPE_INFO, Console::CONSOLE_SYSTEM_NOTICE, fmt::format("Ambient light set to {:.1f}", light), "lightbulb.png");
-      }
-}
-
 #ifdef USE_CAELUM
     if (App::gfx_sky_mode->getEnum<GfxSkyMode>() == GfxSkyMode::CAELUM &&
         m_terrain->getSkyManager())