Changeset 2232 for trunk/src/easymeshTweet

Timestamp:

Jan 18, 2013, 12:16:52 AM (7 years ago)

Author:

lolbot

Message:

fixed 27 files out of 2315:

• removed 0 CR characters
• removed 188 trailing whitespaces
• replaced 537 tabs with spaces

Location:

trunk/src/easymesh

Files:

• csgbsp.cpp (modified) (2 diffs)
• easymesh-scanner.l (modified) (1 diff)
• easymesh.cpp (modified) (1 diff)
• shiny.lolfx (modified) (3 diffs)

trunk/src/easymesh/csgbsp.cpp

@@ -140 +140 @@
 
             tri_to_process.Pop();
-                
+
 #if 1
             if (m_tree[leaf_idx].m_leaves[leaf_type] == LEAF_CURRENT)
@@ -499 +499 @@
             int res_total = 0;
             int res_nb[3] = { 0, 0, 0 };
-            
+
             int res_Leaf[4] = { 0, 0, 0, 0 };
             int res_side[4] = { -1, -1, -1, -1 };

trunk/src/easymesh/easymesh-scanner.l

@@ -67 +67 @@
 sz    { return token::T_SCALEZ; }
 s     { return token::T_SCALE; }
-tsw       { return token::T_TOGGLESCALEWINDING; }
+tsw      { return token::T_TOGGLESCALEWINDING; }
 mx    { return token::T_MIRRORX; }
 my    { return token::T_MIRRORY; }

trunk/src/easymesh/easymesh.cpp

@@ -176 +176 @@
     {
         int CurIdx = FindVertexInDict(i, vertex_dict);
-        
+
         //go through all vertices and do the match-up.
         if (CurIdx == -1)

trunk/src/easymesh/shiny.lolfx

@@ -77 +77 @@
     vec3 r = vec3(0.0, 0.0, 0.0);
     float sdotn = 0.0;
-        float light_radius_mod = 0.0;
+    float light_radius_mod = 0.0;
 
     //Light calculation for directional light
@@ -89 +89 @@
         specular += specular_color * specular_reflect
                  * pow(max(dot(r, v), 0.0), specular_power);
-        //----------
-    
+    //----------
+
     //Light calculation for point light
-        vec3 tmpLightDir = (in_View * in_Light2_Pos).xyz - pass_Vertex.xyz;
-        light_radius_mod = max(0.0, 1.0 - (length(tmpLightDir) / in_Light2_Radius));
+    vec3 tmpLightDir = (in_View * in_Light2_Pos).xyz - pass_Vertex.xyz;
+    light_radius_mod = max(0.0, 1.0 - (length(tmpLightDir) / in_Light2_Radius));
     s = normalize(tmpLightDir);
     v = normalize(-pass_Vertex.xyz);
@@ -103 +103 @@
         specular += specular_color * min(specular_reflect, light_radius_mod)
                  * pow(max(dot(r, v), 0.0), specular_power);
-        //----------
-    
+    //----------
+
     //Light calculation for cube light
-        vec3 Local_Vertex = (in_Inv_View * pass_Vertex).xyz - (in_Light3_Pos).xyz;
-        vec3 Proj_Vertex = clamp(Local_Vertex.xyz, -in_Light3_Size_Inner, in_Light3_Size_Inner);
-        vec3 new_LightDir = Local_Vertex - Proj_Vertex;
-
-        vec3 light_radius = max(vec3(0.0,0.0,0.0), vec3(1.0,1.0,1.0) - abs(new_LightDir / in_Light3_Size_Outer));
-        light_radius_mod = min(light_radius.x, min(light_radius.y, light_radius.z));
-
-        if (length(new_LightDir) == 0.0)
-                sdotn = 1.0;
-        else
-        {
-                new_LightDir = normalize((in_View * vec4(Proj_Vertex + in_Light3_Pos.xyz,1.0)).xyz - pass_Vertex.xyz);
-                sdotn = max(dot(new_LightDir, pass_TNormal), 0.0);
-            r = reflect(-new_LightDir, pass_TNormal);
-                if (sdotn > 0.0 && light_radius_mod > 0.0)
-                        specular += specular_color * min(specular_reflect, light_radius_mod)
-                                         * pow(max(dot(r, v), 0.0), specular_power);
-        }
+    vec3 Local_Vertex = (in_Inv_View * pass_Vertex).xyz - (in_Light3_Pos).xyz;
+    vec3 Proj_Vertex = clamp(Local_Vertex.xyz, -in_Light3_Size_Inner, in_Light3_Size_Inner);
+    vec3 new_LightDir = Local_Vertex - Proj_Vertex;
+
+    vec3 light_radius = max(vec3(0.0,0.0,0.0), vec3(1.0,1.0,1.0) - abs(new_LightDir / in_Light3_Size_Outer));
+    light_radius_mod = min(light_radius.x, min(light_radius.y, light_radius.z));
+
+    if (length(new_LightDir) == 0.0)
+        sdotn = 1.0;
+    else
+    {
+        new_LightDir = normalize((in_View * vec4(Proj_Vertex + in_Light3_Pos.xyz,1.0)).xyz - pass_Vertex.xyz);
+        sdotn = max(dot(new_LightDir, pass_TNormal), 0.0);
+        r = reflect(-new_LightDir, pass_TNormal);
+        if (sdotn > 0.0 && light_radius_mod > 0.0)
+            specular += specular_color * min(specular_reflect, light_radius_mod)
+                     * pow(max(dot(r, v), 0.0), specular_power);
+    }
     diffuse += in_Light3_diffuse * min(sdotn, light_radius_mod);
-        //----------
+    //----------
 
     vec3 light = ambient + diffuse + specular;