sanitize file path

Author: polymonster

assets/shaders/forward_render.pmfx

@@ -56,12 +56,30 @@ struct vs_input_skinned
 
 struct vs_instance_input
 {
-    float4 world_matrix_0      : TEXCOORD6;
-    float4 world_matrix_1      : TEXCOORD7;
-    float4 world_matrix_2      : TEXCOORD8;
-    float4 world_matrix_3      : TEXCOORD9;
-    float4 user_data           : TEXCOORD10;
-    float4 user_data2          : TEXCOORD11;
+    if:(INSTANCED)
+    {
+        float4 world_matrix_0      : TEXCOORD6;
+        float4 world_matrix_1      : TEXCOORD7;
+        float4 world_matrix_2      : TEXCOORD8;
+        float4 world_matrix_3      : TEXCOORD9;
+        float4 user_data           : TEXCOORD10;
+        float4 user_data2          : TEXCOORD11;
+    }
+};
+
+struct vs_input_multi
+{
+    float4 position : POSITION;
+    float4 normal : TEXCOORD0;
+    float4 texcoord : TEXCOORD1;
+    float4 tangent : TEXCOORD2;
+    float4 bitangent : TEXCOORD3;
+    
+    if:(SKINNED)
+    {
+        float4 blend_indices : TEXCOORD4;
+        float4 blend_weights : TEXCOORD5;
+    }
 };
 
 struct ps_output
@@ -212,6 +230,39 @@ vs_output vs_main_instanced( vs_input input, vs_instance_input instance_input )
     return output;
 }
 
+vs_output vs_main_multi( vs_input_multi input, vs_instance_input instance_input )
+{
+    vs_output output;
+    
+    float4x4 wvp = mul( world_matrix, vp_matrix );
+    
+    output.position = mul( input.position, wvp );
+    output.world_pos = mul( input.position, world_matrix );
+    
+    float3x3 world_rot_mat = to_3x3(world_matrix);
+    world_rot_mat[0] = normalize(world_rot_mat[0]);
+    world_rot_mat[1] = normalize(world_rot_mat[1]);
+    world_rot_mat[2] = normalize(world_rot_mat[2]);
+            
+    float3x3 rotation_matrix = world_rot_mat;
+        
+    output.normal = mul( input.normal.xyz, rotation_matrix );
+    output.tangent = mul( input.tangent.xyz, rotation_matrix );
+    output.bitangent = mul( input.bitangent.xyz, rotation_matrix );
+        
+    output.texcoord = float4(input.texcoord.x, 1.0f - input.texcoord.y, 
+                             input.texcoord.z, 1.0f - input.texcoord.w );
+        
+    if:(UV_SCALE)
+    {
+        output.texcoord *= float4(m_uv_scale.x, m_uv_scale.y, m_uv_scale.x, m_uv_scale.y);
+    }
+        
+    output.colour = m_albedo;
+        
+    return output;
+}
+
 float3 transform_ts_normal( float3 t, float3 b, float3 n, float3 ts_normal )
 {
     float3x3 tbn;
@@ -553,6 +604,18 @@ pmfx:
         }
     },
 
+    "forward_lit_multi":
+    {
+        "inherit" : "forward_lit",
+        "vs" : "vs_main_multi",
+        
+        "permutations":
+        {
+            "SKINNED": [31, [0,1]],
+            "INSTANCED": [30, [0,1]]
+        }
+    },
+    
     "forward_lit_uv_scale":
     {
         "inherit"  : "forward_lit",
@@ -583,6 +646,8 @@ pmfx:
         "vs": "vs_main_instanced",
         "ps": "ps_forward_lit",
 
+        "defines": ["INSTANCED"],
+        
         "inherit_constants": ["forward_lit"]
     },
 

examples/shader_structs/forward_render.h

@@ -6,6 +6,38 @@ struct forward_lit
 	float3 m_padding;
 };
 
+struct forward_lit_multi
+{
+	float4 m_albedo;
+	float m_roughness;
+	float m_reflectivity;
+	float3 m_padding;
+};
+
+struct forward_lit_multi
+{
+	float4 m_albedo;
+	float m_roughness;
+	float m_reflectivity;
+	float3 m_padding;
+};
+
+struct forward_lit_multi
+{
+	float4 m_albedo;
+	float m_roughness;
+	float m_reflectivity;
+	float3 m_padding;
+};
+
+struct forward_lit_multi
+{
+	float4 m_albedo;
+	float m_roughness;
+	float m_reflectivity;
+	float3 m_padding;
+};
+
 struct forward_lit_uv_scale
 {
 	float4 m_albedo;

tools/build.py

@@ -9,6 +9,7 @@
 import platform
 import build_scripts.util as util
 
+
 def display_help():
     print("run with no arguments for prompted input")
     print("commandline arguments")

tools/build_scripts/build_shaders.py

@@ -673,6 +673,7 @@ def find_includes(file_text, root):
             break
         include_name = file_text[start:end]
         include_path = os.path.join(root, include_name)
+        include_path = util.sanitize_file_path(include_path)
         if include_path not in added_includes:
             include_list.append(include_path)
             added_includes.append(include_path)
@@ -718,7 +719,6 @@ def add_files_recursive(filename, root):
     shader_source = clean_spaces(shader_source)
     sub_root = os.path.dirname(file_path)
     include_list = find_includes(shader_source, sub_root)
-    print(include_list)
     for include_file in reversed(include_list):
         included_source, sub_includes = add_files_recursive(include_file, sub_root)
         shader_source = included_source + "\n" + shader_source

tools/build_scripts/util.py

@@ -29,5 +29,11 @@ def correct_path(path):
     return path
 
 
+def sanitize_file_path(path):
+    path = path.replace("/", os.sep)
+    path = path.replace("\\", os.sep)
+    return path
+
+
 if __name__ == "__main__":
     print("util")