WebSVN – Games.Carmageddon – Diff – /src/DETHRACE/common/depth.c

 #include "depth.h"
-#include "brender/brender.h"
+#include "brender.h"
 #include "displays.h"
 #include "errors.h"
 #include "globvars.h"
 #include "globvrkm.h"
 #include "globvrpb.h"
     gHorizon_material = BrMaterialLoad(the_path);
     if (gHorizon_material == NULL) {
         FatalError(kFatalError_FindSkyMaterial_S, "HORIZON.MAT"); // 2nd argument added
+    }
     gHorizon_material->index_blend = BrPixelmapAllocate(BR_PMT_INDEX_8, 256, 256, NULL, 0);
-    // HACK: moved below loop
-    // BrTableAdd(gHorizon_material->index_blend);
+    BrTableAdd(gHorizon_material->index_blend);
     for (i = 0; i < 256; i++) {
         for (j = 0; j < 256; j++) {
             *((tU8*)gHorizon_material->index_blend->pixels + 256 * i + j) = j;
+        }
+    }
-    // HACK: this should be above the for loop. Haven't been able to figure out how this is working in OG, as changes made to the pixelmap
-    // don't update the stored copy without calling `BrTableUpdate`.
-    BrTableAdd(gHorizon_material->index_blend);
     gHorizon_material->flags |= BR_MATF_PERSPECTIVE;
     BrMaterialAdd(gHorizon_material);
     gForward_sky_model = CreateHorizonModel(gCamera);
     gRearview_sky_model = CreateHorizonModel(gRearview_camera);
     BrModelAdd(gForward_sky_model);
         gProgram_state.current_depth_effect.end);
+}
 // IDA: void __usercall DepthEffect(br_pixelmap *pRender_buffer@<EAX>, br_pixelmap *pDepth_buffer@<EDX>, br_actor *pCamera@<EBX>, br_matrix34 *pCamera_to_world@<ECX>)
 void DepthEffect(br_pixelmap* pRender_buffer, br_pixelmap* pDepth_buffer, br_actor* pCamera, br_matrix34* pCamera_to_world) {
     LOG_TRACE("(%p, %p, %p, %p)", pRender_buffer, pDepth_buffer, pCamera, pCamera_to_world);
     if (gProgram_state.current_depth_effect.type == eDepth_effect_darkness) {
         DoDepthCue(pRender_buffer, pDepth_buffer);
+    }
     if (gProgram_state.current_depth_effect.type == eDepth_effect_fog) {
     gProgram_state.default_depth_effect.end = gProgram_state.current_depth_effect.end;
+}
 // IDA: void __cdecl AssertYons()
 void AssertYons(void) {
     br_camera* camera_ptr;
     int i;
     LOG_TRACE("()");
     for (i = 0; i < COUNT_OF(gCamera_list); ++i) {
         camera_ptr = gCamera_list[i]->type_data;
         camera_ptr->field_of_view += 0x1c7;       // 2.4993896484375 degrees
         if (camera_ptr->field_of_view > 0x78e3) { // 169.9969482421875 degrees
             camera_ptr->field_of_view = 0x78e3;
+        }
 #ifdef DETHRACE_FIX_BUGS
-        sprintf(s, "Camera angle increased to %f", (float)BrAngleToDegrees(camera_ptr->field_of_view));
+        sprintf(s, "Camera angle increased to %f", (float)BrAngleToDegree(camera_ptr->field_of_view));
 #else
         sprintf(s, "Camera angle increased to %d", gProgram_state.current_depth_effect.end);
 #endif
         NewTextHeadupSlot(4, 0, 500, -1, s);
+    }
         camera_ptr->field_of_view -= 0x1c7;      // 2.4993896484375 degrees
         if (camera_ptr->field_of_view < 0x71c) { // 9.99755859375 degrees
             camera_ptr->field_of_view = 0x71c;
+        }
 #ifdef DETHRACE_FIX_BUGS
-        sprintf(s, "Camera angle decreased to %f", (float)BrAngleToDegrees(camera_ptr->field_of_view));
+        sprintf(s, "Camera angle decreased to %f", (float)BrAngleToDegree(camera_ptr->field_of_view));
 #else
         sprintf(s, "Camera angle decreased to %d", gProgram_state.current_depth_effect.end);
 #endif
         NewTextHeadupSlot(4, 0, 500, -1, s);
+    }
                 BrMaterialUpdate(gHorizon_material, -1);
+            }
+        }
+    }
     gSky_on = pOn;
 }
 // IDA: void __cdecl ToggleSkyQuietly()
 void ToggleSkyQuietly(void) {
     br_pixelmap* temp;
     LOG_TRACE("()");
+}
 // IDA: void __cdecl ToggleSky()
 void ToggleSky(void) {
     LOG_TRACE("()");
-    NOT_IMPLEMENTED();
+    SetSkyTextureOn(!GetSkyTextureOn());
+    if (gProgram_state.current_depth_effect.sky_texture != NULL) {
+        NewTextHeadupSlot(4, 0, 2000, -4, GetMiscString(kMiscString_SkyTextureOn));
+    } else if (gSwap_sky_texture != NULL) {
+        NewTextHeadupSlot(4, 0, 2000, -4, GetMiscString(kMiscString_SkyTextureOff));
+    } else {
+        NewTextHeadupSlot(4, 0, 2000, -4, GetMiscString(kMiscString_ThereIsNoSkyTextureForThisRace));
+    }
+}
 // IDA: int __cdecl GetDepthCueingOn()
 int GetDepthCueingOn(void) {
     LOG_TRACE("()");
     return gDepth_cueing_on;
 }
 // IDA: void __usercall SetDepthCueingOn(int pOn@<EAX>)
 void SetDepthCueingOn(int pOn) {
     LOG_TRACE("(%d)", pOn);
     if (pOn != gDepth_cueing_on && gHorizon_material) {
         InstantDepthChange(gSwap_depth_effect_type, gProgram_state.current_depth_effect.sky_texture, gSwap_depth_effect_start, gSwap_depth_effect_end);
+}
 // IDA: void __cdecl ToggleDepthCueing()
 void ToggleDepthCueing(void) {
     LOG_TRACE("()");
+    SetDepthCueingOn(!GetDepthCueingOn());
+    if (gProgram_state.current_depth_effect.type != eDepth_effect_none) {
+        NewTextHeadupSlot(4, 0, 2000, -4, GetMiscString(kMiscString_DepthCueingOn));
+    } else if (gSwap_depth_effect_type != eDepth_effect_none) {
+        NewTextHeadupSlot(4, 0, 2000, -4, GetMiscString(kMiscString_DepthCueingOff));
-    NOT_IMPLEMENTED();
+    } else {
+        NewTextHeadupSlot(4, 0, 2000, -4, GetMiscString(kMiscString_ThereIsNoDepthCueingForThisRace));
+    }
+}
 // IDA: void __cdecl ChangeDepthEffect()
 void ChangeDepthEffect(void) {
     //br_scalar x1; // Pierre-Marie Baty -- unused variable
     //br_scalar z1; // Pierre-Marie Baty -- unused variable
     //br_scalar z2; // Pierre-Marie Baty -- unused variable
     //br_scalar distance; // Pierre-Marie Baty -- unused variable
     //tSpecial_volume* special_volume; // Pierre-Marie Baty -- unused variable
     LOG_TRACE("()");
+    gProgram_state.current_depth_effect.type = gProgram_state.default_depth_effect.type;
+    gProgram_state.current_depth_effect.sky_texture = gProgram_state.default_depth_effect.sky_texture;
+    gProgram_state.current_depth_effect.start = gProgram_state.default_depth_effect.start;
-    STUB_ONCE();
+    gProgram_state.current_depth_effect.end = gProgram_state.default_depth_effect.end;
+}
 // IDA: void __cdecl MungeForwardSky()
 void MungeForwardSky(void) {
     LOG_TRACE("()");

Subversion Repositories Games.Carmageddon

Games.Carmageddon/src/DETHRACE/common/depth.c – Rev 1 → 18