Context Navigation

MORIA

Timestamp:

05/28/07 17:00:18 (18 years ago)

Author:

szirmay

Message:

Location:

GTP/trunk/App/Demos/Illum/Ogre/Media/MORIA

Files:

r2392	r2398
30	30	depth_write off
31	31	scene_blend src_alpha one
	32	scene_blend_alpha zero one
32	33	//scene_blend alpha_blend
33	34	vertex_program_ref Moria/MoriaDust_VS

-                      r2386
+                      r2398
         float4 Color = 0;
         float3 N = NormalMap(IN.wTangent, IN.wBinormal, IN.wNormal, IN.texCoord2.xy, bumpMap);
+        float3 V = normalize(IN.wView);
+        float dist = length(IN.wView);
+        float3 V = IN.wView / dist;
         // read textures
         float4 diffuseColor = tex2D(tileTexture, IN.texCoord.zw) * tex2D(detailTexture, IN.texCoord.xy);
 …
 float shadow;
 if(dot(lightColor1, lightColor1) != 0)
+{
+//if(dot(lightColor1, lightColor1) != 0)
+//{
         L = wLightPos1.xyz - IN.wPos * wLightPos1.w;
         //illumination
 …
         shadow = shadowPoint(ShadowMap1Point, lightCPos, lightFarPlane1);
         Color += col * shadow;
+}
+        //Color = col;
+//}
 //----------------------------------------------------------------------------------------------------------------
 …
         //gather caustics for all casters
         //return diffuseColor;
+        Color.a = dist;
         return Color;
+}

-                      r2376
+                      r2398
         float3 H = normalize(L + V);
         float4 Lighting = lit(dot(N, L), dot(N, H), specularity);
+        Lighting = saturate(Lighting);
         return   lightColor * (Lighting.y * diffuseColor + Lighting.z * specularColor) //color
                          / (lightRange.y + d * lightRange.z + d * d * lightRange.w) //attenuation
+                         ;
+        //return lightColor * (Lighting.y * diffuseColor);
+}
 …
         float3 mNormal;
         float3 tNormal = tex2D(normalMap, texCoord).rgb;
+        if(length(tNormal == 0))
+                mNormal = normal;
+    else
+    {
+        tangent = normalize(tangent);
+                binormal = normalize(binormal);
+                float3x3 TangentToModel = float3x3(tangent, binormal, normal );
+        //tNormal = float3(0.5,0.5,1.0);
+    tangent = normalize(tangent);
+        binormal = normalize(binormal);
+        float3x3 TangentToModel = float3x3(tangent, binormal, normal );
         tNormal.xy = (tNormal.xy *2.0) - 1.0;
         mNormal = normalize( mul( tNormal, TangentToModel ) );
+        }
+        tNormal.xy = (tNormal.xy *2.0) - 1.0;
+        mNormal = normalize( mul( tNormal, TangentToModel ) );
     return mNormal;
+}

r2386	r2398
26	26	// start_tex_id 3
27	27	//}
	28	//RenderTechnique SphericalBillboard
	29	//{
	30	// bind_texture false
	31	//}
28	32	RenderTechnique DepthShadowReceiver
29	33	{
…	…
68	72	texture_unit displace
69	73	{
	74	texture nullbump.bmp
	75	//filtering none
	76	//tex_address_mode clamp
70	77	}
71	78	texture_unit pathMap
…	…
104	111	texture_unit displace
105	112	{
106		texture greatpillardisplace.dds
	113	texture greatpillarbump.bmp
	114	//texture nullbump.bmp
	115	//tex_address_mode mirror
107	116	}
108	117	}
…	…
150	159	texture greatHallWallDetail.png
151	160	}
	161	texture_unit displace
	162	{
	163	texture morialwalldetailbump.bmp
	164	}
152	165	}
153	166	}
…	…
167	180	texture pillarheaddetail.png
168	181	}
	182	texture_unit displace
	183	{
	184	texture greatpillarheadbump.bmp
	185	}
	186
169	187	}
170	188	}

-                      r2389
+                      r2398
         float4 Color = 0;
         float3 N = normalize(IN.normal);//NormalMap(IN.tangent, IN.binormal, IN.normal, IN.texCoord, bumpMap);
+        float3 V = normalize(IN.V);
+        float dist = length(IN.V);
+        float3 V = IN.V /dist;
         float3 L = IN.L;
 …
         Color = Illumination(N, L, V, lightColor * lightPower, lightRange, diffuseColor, specularity, specularColor);
+        return diffuseColor * 0.1 + Color;
+        float4 ret =  diffuseColor * 0.1 + Color;
+        return float4(ret.xyz, dist);
+}

Note: See TracChangeset for help on using the changeset viewer.