Merge branch 'carbon' into w2c

Author: MaxHwoy

premake5.lua

@@ -1,24 +1,28 @@
 toolset("v143")
 systemversion("10.0.20348.0")
 
-
 local function execute(command)
 	local result, _ = os.outputof(command)
 
 	return result
 end
-local cn = execute("echo %COMPUTERNAME%")
 
-local ta = ".asi"
+local target_extension = ".asi"
+
+local function is_abominator()
+	local name = execute("echo %COMPUTERNAME%")
 
-local a = {
-}
-local function aa()
-	local a = execute("echo %COMPUTERNAME%")
-	return string.find(a,"ABOMINATOR") 
+	return string.find(name,"ABOMINATOR")
+end
+
+local function set_defines()
+	if is_abominator() then
+		defines("ABOMINATOR")
+	end
 end
-function set_name()
-	if aa() then
+
+local function set_name()
+	if is_abominator() then
 		filter "configurations:debug"
 			targetname "%{prj.name}-debug"
 
@@ -32,10 +36,9 @@ function set_name()
 	end
 end
 
-
-if aa() then
+if is_abominator() then
 	print('hi')
-	ta = ".dll"
+	target_extension = ".dll"
 end
 
 workspace "hyperlinked"
@@ -73,6 +76,8 @@ workspace "hyperlinked"
 		"multiprocessorcompile",
 	}
 
+	set_defines()
+
 	defines {
 		"NOMINMAX",
 		"_CRT_SECURE_NO_WARNINGS",
@@ -175,14 +180,14 @@ workspace "hyperlinked"
 	project "hyperlinked"
 		language "c++"
 		kind "sharedlib"
-		targetextension(ta)
 
-			postbuildcommands {
-				-- Copy commands
-				"if \"%COMPUTERNAME%\" == \"ABOMINATOR\" ( copy /y \"$(TargetPath)\" \"D:\\Development\\nfsco\\nfsco\\install\\bin\\\" )",
-			}
+		targetextension(target_extension)
+
+		postbuildcommands {
+			"if \"%COMPUTERNAME%\" == \"ABOMINATOR\" ( copy /y \"$(TargetPath)\" \"D:\\Development\\nfsco\\nfsco\\install\\bin\\\" )",
+		}
 
-			set_name()
+		set_name()
 
 		-- pchheader "stdafx.hpp"
 		-- pchsource "src/hyperlinked/stdafx.cpp"

src/hyperlib/renderer/culling.cpp

@@ -51,7 +51,13 @@ namespace hyper
             case view_id::env_y_neg:
             case view_id::env_z_pos:
             case view_id::env_z_neg:
+                // no idea what nonsense flags were used in HDReflections (0x8002), but literally the ONLY way to make this reflect lights is to set it to...
+                // exclude_main_view, which INCLUDES the main view in the reflections????????
+#if defined(ABOMINATOR)
+                flags = instance_flags::exclude_main_view | instance_flags::exclude_disable_rendering | instance_flags::exclude_group_disable;
+#else
                 flags |= instance_flags::include_reflection_ng | instance_flags::include_reflection | instance_flags::envmap_shadow | instance_flags::environment_map;
+#endif
                 break;
         }
 

src/hyperlib/renderer/effect.cpp

@@ -433,14 +433,32 @@ namespace hyper
             lighting::ingame_light_params.y = lighting::default_ingame_light_y;
             lighting::ingame_light_params.w = lighting::default_ingame_light_w;
 
-            if (game_flow::manager::instance.current_state == game_flow::state::racing)
-            {
-                this->set_vector_unchecked(parameter_type::cvVertexPowerBrightness, lighting::ingame_light_params);
-            }
-            else
+            const auto in_frontend = game_flow::manager::instance.current_state == game_flow::state::in_frontend;
+
+#if defined(ABOMINATOR)
+            // copy the vector.
+            auto vector = (in_frontend) ? lighting::frontend_light_params : lighting::ingame_light_params;
+#else
+            const auto& vector = (in_frontend) ? lighting::frontend_light_params : lighting::ingame_light_params;
+#endif
+
+#if defined(ABOMINATOR)
+            const auto render_target = render_target::current;
+
+            if (render_target->view_id >= view_id::env_z_pos)
             {
-                this->set_vector_unchecked(parameter_type::cvVertexPowerBrightness, lighting::frontend_light_params);
+                if (in_frontend)
+                {
+                    vector.x += 2.5f;
+                    vector.y -= 1.0f;
+                }
+                else
+                {
+                    vector.y -= 0.4f;
+                }
             }
+#endif
+            this->set_vector_unchecked(parameter_type::cvVertexPowerBrightness, vector);
         }
     }
 
@@ -668,7 +686,7 @@ namespace hyper
 
             for (technique* i = this->supported_table_.begin(); i != this->supported_table_.end(); ++i)
             {
-                if (length == i->name.length() && ::memcmp(name, i->name, length))
+                if (length == i->name.length() && !::memcmp(name, i->name, length))
                 {
                     return i;
                 }
@@ -795,7 +813,7 @@ namespace hyper
     {
         for (size_t i = 0u; i < shader_lib::inputs_.length(); ++i)
         {
-            if (::strcmp(name, shader_lib::inputs_[i].effect_name))
+            if (!::strcmp(name, shader_lib::inputs_[i].effect_name))
             {
                 return &shader_lib::inputs_[i];
             }