diff LightmapBuilder.cpp @ 2274:90f56da08d76

small cleaning
author Ritor1
date Fri, 14 Mar 2014 09:32:25 +0600
parents 2e02c384c62b
children 25f771e528f0
line wrap: on
line diff
--- a/LightmapBuilder.cpp	Thu Feb 27 00:36:31 2014 +0100
+++ b/LightmapBuilder.cpp	Fri Mar 14 09:32:25 2014 +0600
@@ -856,7 +856,7 @@
   {
     if ( pSlot >= 20 )
       break;
-    ApplyLight_ODM(pStationaryLightsStack[i].pLights, pFace, (unsigned int *)&pSlot, 0);
+    ApplyLight_ODM(&pStationaryLightsStack->pLights[i], pFace, (unsigned int *)&pSlot, 0);
   }
   result = pSlot;
   stru_F8AD28.uNumLightsApplied = pSlot;
@@ -1088,7 +1088,7 @@
     pLight = (StationaryLight *)LODWORD(a1[1].vWorldPosition.x);
     v12 = a1[2].vWorldPosition.x;
   }
-  uStripType = LODWORD(v12);
+  //uStripType = LODWORD(v12);
   a1 = (RenderVertexSoft *)LODWORD(a1[1].vWorldPosition.y);
   v13 = v11->vWorldPosition.y;
 LABEL_5:
@@ -1096,7 +1096,7 @@
 LABEL_11:
   //v60 = v10;
   v59 = (const char *)v11;
-  v60 = uStripType;
+  v60 = v12;//uStripType;
   minz = pGame->pIndoorCameraD3D->GetPolygonMinZ(v11, uStripType);
   maxz = pGame->pIndoorCameraD3D->GetPolygonMaxZ(v11, uStripType);
   result = v8->vPosition.x;
@@ -1173,13 +1173,13 @@
   stru_F8AD28._blv_lights_xs[*v53] = v8->vPosition.x;
   stru_F8AD28._blv_lights_ys[*v53] = v8->vPosition.y;
   stru_F8AD28._blv_lights_zs[*v53] = v8->vPosition.z;
-  a3 = (float *)v8->uLightColorR;
-  stru_F8AD28._blv_lights_rs[*v53] = (double)(signed int)a3 * 0.003921568859368563;
-  a3 = (float *)v8->uLightColorG;
-  stru_F8AD28._blv_lights_gs[*v53] = (double)(signed int)a3 * 0.003921568859368563;
-  a3 = (float *)v8->uLightColorB;
-  stru_F8AD28._blv_lights_bs[*v53] = (double)(signed int)a3 * 0.003921568859368563;
-  v54 = abs(v60);
+  //a3 = (float *)v8->uLightColorR;
+  stru_F8AD28._blv_lights_rs[*v53] = v8->uLightColorR / 255.0f;
+  //a3 = (float *)v8->uLightColorG;
+  stru_F8AD28._blv_lights_gs[*v53] = v8->uLightColorG / 255.0f;
+  //a3 = (float *)v8->uLightColorB;
+  stru_F8AD28._blv_lights_bs[*v53] = v8->uLightColorB / 255.0f;
+  v54 = abs(v63);
   v55 = pRenderer->bUsingSpecular;
   stru_F8AD28._blv_lights_light_dot_faces[*v53] = v54;
   stru_F8AD28._blv_lights_types[*v53] = v8->uLightType;
@@ -1193,12 +1193,9 @@
   {
     if ( stru_F8AD28._blv_lights_types[*v53] & 4 )
     {
-      *(float *)((char *)stru_F8AD28._blv_lights_rs + result) = *(float *)((char *)stru_F8AD28._blv_lights_rs + result)
-                                                              * 0.3300000131130219;
-      *(float *)((char *)stru_F8AD28._blv_lights_gs + result) = *(float *)((char *)stru_F8AD28._blv_lights_gs + result)
-                                                              * 0.3300000131130219;
-      *(float *)((char *)stru_F8AD28._blv_lights_bs + result) = *(float *)((char *)stru_F8AD28._blv_lights_bs + result)
-                                                              * 0.3300000131130219;
+      stru_F8AD28._blv_lights_rs[result] = stru_F8AD28._blv_lights_rs[result] * 0.3300000131130219;
+      stru_F8AD28._blv_lights_gs[result] = stru_F8AD28._blv_lights_gs[result] * 0.3300000131130219;
+      stru_F8AD28._blv_lights_bs[result] = stru_F8AD28._blv_lights_bs[result] * 0.3300000131130219;
     }
   }
   ++*v53;