update readme.md

fix some shader bugs + cleanup
fix sky ambient bug

Author: firoball

Assets/Wm3Util/Editor/LevelTexture.cs

@@ -55,7 +55,16 @@ public bool Construct(Wm3Texture texture, float ambient, LevelTextureType textur
         public bool Has(Wm3Texture texture, float ambient, LevelTextureType textureType)
         {
             bool ret = false;
-            ambient = CalculateAmbient(texture, ambient, textureType);
+            //sky requires special ambient treatment
+            if (texture.Flags.IsSet(Wm3Flags.Sky))
+            {
+                ambient = CalculateAmbient(texture, ambient, LevelTextureType.SKY);
+            }
+            else
+            {
+                ambient = CalculateAmbient(texture, ambient, textureType);
+            }
+
             if (
                 (m_textureReference != null) && (m_textureReference == texture)
                 && (Convert.ToInt32((ambient * 100) - (m_ambient * 100)) == 0)
@@ -115,6 +124,8 @@ private bool BuildMaterial(Wm3Texture texture, float ambient)
 
                     else if (texture.Flags.IsSet(Wm3Flags.Sky))
                     {
+                        //recalculate ambient for sky (special treatment necessary)
+                        m_ambient = CalculateAmbient(texture, ambient, LevelTextureType.SKY);
                         m_material = new Material(TemplateMaterials.GetSky());
                         albedo = 0;
                     }
@@ -151,16 +162,29 @@ private bool BuildMaterial(Wm3Texture texture, float ambient)
         private float CalculateAmbient(Wm3Texture texture, float ambient, LevelTextureType textureType)
         {
             float ambient_sum;
-            if (textureType == LevelTextureType.SPRITE)
-            {
-                //WM3 format already merges texture and object ambient (special treatment for A8 engine)
-                //--> only use object ambient and drop any texture ambient
-                ambient_sum = (ambient * 0.01f) + 0.5f;
-            }
-            else
+            switch (textureType)
             {
-                //add mesh specific ambient to texture ambient
-                ambient_sum = ((texture.Ambient + ambient) * 0.01f) + 0.5f;
+                case LevelTextureType.SPRITE:
+                    {
+                        //WM3 format already merges texture and object ambient (special treatment for A8 engine)
+                        //--> only use object ambient and drop any texture ambient
+                        ambient_sum = (ambient * 0.01f) + 0.5f;
+                        break;
+                    }
+
+                case LevelTextureType.SKY:
+                    {
+                        //sky does not receive mesh specific ambient
+                        ambient_sum = (texture.Ambient * 0.01f) + 0.5f;
+                        break;
+                    }
+
+                default:
+                    {
+                        //add mesh specific ambient to texture ambient
+                        ambient_sum = ((texture.Ambient + ambient) * 0.01f) + 0.5f;
+                        break;
+                    }
             }
 
             return ambient_sum;

Assets/Wm3Util/Editor/LevelTextureType.cs

@@ -5,6 +5,7 @@ public enum LevelTextureType : int
     {
         STANDARD = 0,
         SPRITE = 1,
-        OVERLAY = 2
+        OVERLAY = 2,
+        SKY = 3
     }
 }

Assets/Wm3Util/Shaders/Wm3Overlay.shader

@@ -39,7 +39,6 @@
 				float2 tex : TEXCOORD0;
 				float3 worldPos : TEXCOORD1;
 				float3 normal : NORMAL;
-				//float fog : TEXCOORD2;
 			};
 
 			vs_out vert(vs_in IN)
@@ -49,25 +48,14 @@
 				OUT.worldPos = mul(unity_ObjectToWorld, IN.pos);
 				OUT.normal = normalize(mul(unity_ObjectToWorld, IN.normal));
 				OUT.tex = IN.tex;
-				//OUT.fog = OUT.pos.z;
 				return OUT;
 			}
 
 			float4 frag(vs_out IN) : COLOR
 			{
 				float4 colortex = tex2D(_MainTex, IN.tex);
-				float trans = (colortex == _TransColor) & (_Overlay > 0);
+				float trans = all(all(colortex.rgb == _TransColor.rgb)) & (_Overlay > 0);
 				clip(-trans);
-				/*float4 diffuse = 0.9 + 0.1 *_Albedo * saturate(dot(_WorldSpaceLightPos0, IN.normal));
-				diffuse.a = 1;
-
-				float viewDistance = distance( _WorldSpaceCameraPos, IN.worldPos);
-				float fogFactor =  saturate((viewDistance - 50) / (100 - 50));
-
-				float4 color;
-				color = saturate(colortex * diffuse * _Color);// *unity_AmbientSky);
-				color = lerp(color, unity_FogColor, fogFactor);
-				color.a = _Color.a;*/
 				float4 color = Wm3Lighting(colortex, IN.normal, IN.worldPos, _Diffuse, _Color);
 				return color;
 			}

Assets/Wm3Util/Shaders/Wm3Sky.shader

@@ -45,7 +45,7 @@
 				vs_out OUT;
 				OUT.pos = UnityObjectToClipPos(IN.pos);
 				OUT.normal = normalize(mul(UNITY_MATRIX_M, IN.normal));
-				OUT.tex = OUT.pos;// mul(UNITY_MATRIX_M, IN.pos);
+				OUT.tex = OUT.pos;
 				OUT.dir = mul(unity_CameraToWorld, float3(0, 0, 1));
 				return OUT;
 			}
@@ -74,7 +74,7 @@
 				float4 colortex = tex2D(_MainTex, screenUV);
 				float4 light = _Color + unity_AmbientSky;
 				float4 color = saturate(colortex * light);
-				color.a = 0; //sky is always opaque
+				color.a = 1; //sky is always opaque
 				return color;
 			}
 			ENDCG

Assets/Wm3Util/Shaders/Wm3Solid.shader

@@ -8,7 +8,6 @@
 		SubShader{
 		Tags{ "Queue" = "Geometry" "RenderType" = "Opaque" "IgnoreProjector" = "True"}
 		Fog { Mode off }
-		Blend SrcAlpha OneMinusSrcAlpha
 		ZWrite on
 
 		Pass{
@@ -35,7 +34,6 @@
 				float2 tex : TEXCOORD0;
 				float3 worldPos : TEXCOORD1;
 				float3 normal : NORMAL;
-				//float fog : TEXCOORD2;
 			};
 
 			vs_out vert(vs_in IN)
@@ -45,22 +43,14 @@
 				OUT.worldPos = mul(unity_ObjectToWorld, IN.pos);
 				OUT.normal = normalize(mul(unity_ObjectToWorld, IN.normal));
 				OUT.tex = IN.tex;
-				//OUT.fog = OUT.pos.z;
 				return OUT;
 			}
 
 			float4 frag(vs_out IN) : COLOR
 			{
 				float4 colortex = tex2D(_MainTex, IN.tex);
 				float4 color = Wm3Lighting(colortex, IN.normal, IN.worldPos, _Diffuse, _Color);
-				/*float4 diffuse = _Diffuse * saturate(dot(_WorldSpaceLightPos0, IN.normal));
-				diffuse.a = 0;
-
-				float viewDistance = distance( _WorldSpaceCameraPos, IN.worldPos);
-				float fogFactor = saturate(viewDistance * unity_FogParams.z + unity_FogParams.w);
-				float4 light = _Color + diffuse + unity_AmbientSky;
-				float4 color = saturate(colortex * light);
-				color = lerp(unity_FogColor, color, fogFactor);*/
+				color.a = 1;
 				return color;
 			}
 			ENDCG

Assets/Wm3Util/Shaders/Wm3Sprite.shader

@@ -74,17 +74,8 @@
 			float4 frag(vs_out IN) : COLOR
 			{
 				float4 colortex = tex2D(_MainTex, IN.tex);
-				float trans = (colortex == _TransColor);
+				float trans = all(colortex.rgb == _TransColor.rgb);
 				clip(-trans);
-				/*float4 diffuse = 0.9 + 0.1 *_Albedo * saturate(dot(_WorldSpaceLightPos0, IN.normal));
-				diffuse.a = 1;
-
-				float viewDistance = distance( _WorldSpaceCameraPos, IN.worldPos);
-				float fogFactor =  saturate((viewDistance - 50) / (100 - 50));
-
-				float4 color;
-				color = saturate(colortex * diffuse * _Color);// *unity_AmbientSky);
-				color = lerp(color, unity_FogColor, fogFactor);*/
 				float4 color = Wm3Lighting(colortex, IN.normal, IN.worldPos, _Diffuse, _Color);
 				return color;
 			}

readme.md

@@ -58,7 +58,17 @@ They are built in a way to imitate the Acknex3 look as close as possible. Custom
 
 ## Give me Samples!
 
-A sample project will be forked soon.
+Kandoria is a sample project with several .wm3 files imported into several scenes.
+
+Some manual changes were done:
+* Doors and enemies were made passable
+* Pitfalls were covered with invisible planes
+* Levels spread over several .wm3 files were merged
+* Simple level hub system was added
+* Fog and sky shader setup
+* FPSController for easy navigation added
+
+Github: [https://github.com/firoball/Wm3Util_sample](https://github.com/firoball/Wm3Util_sample)
 
 
 ## Future Development