mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-10 09:32:29 +01:00
Code Issues Releases Wiki Activity

Refactor lightfx.c to C++

Browse Source
This commit is contained in:
Ted John
2018-01-05 21:11:19 +00:00
committed by Michael Steenbeek
parent 559ec8a404
commit 0c3c998177
11 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/drawing/engines/HardwareDisplayDrawingEngine.cpp
View File

@@ -24,7 +24,7 @@
#include <openrct2/ui/UiContext.h>
#include "DrawingEngines.h"
#include <openrct2/drawing/lightfx.h>
#include <openrct2/drawing/LightFX.h>
#include <openrct2/Game.h>
#include <openrct2/paint/Paint.h>

2
src/openrct2-ui/drawing/engines/opengl/OpenGLDrawingEngine.cpp
View File

@@ -33,7 +33,7 @@
#include <openrct2/interface/window.h>
#include <openrct2/Intro.h>
#include <openrct2/drawing/drawing.h>
#include <openrct2/drawing/lightfx.h>
#include <openrct2/drawing/LightFX.h>
#include "../DrawingEngines.h"
#include "GLSLTypes.h"

2
src/openrct2/Context.cpp
View File

@@ -49,7 +49,7 @@
#include "audio/audio.h"
#include "config/Config.h"
#include "drawing/lightfx.h"
#include "drawing/LightFX.h"
#include "Editor.h"
#include "Game.h"
#include "Input.h"

72
src/openrct2/drawing/lightfx.c → src/openrct2/drawing/LightFX.cpp
View File

@@ -16,6 +16,7 @@
#ifdef __ENABLE_LIGHTFX__
#include <algorithm>
#include "../common.h"
#include "../config/Config.h"
#include "../Game.h"
@@ -25,7 +26,10 @@
#include "../util/Util.h"
#include "../world/Climate.h"
#include "drawing.h"
#include "lightfx.h"
#include "LightFX.h"
extern "C"
{
static uint8 _bakedLightTexture_lantern_0[32*32];
static uint8 _bakedLightTexture_lantern_1[64*64];
@@ -78,21 +82,21 @@ static rct_palette gPalette_light;
static uint8 calc_light_intensity_lantern(sint32 x, sint32 y) {
double distance = (double)(x * x + y * y);
double light = 0.03 + pow(10.0 / (1.0 + distance / 100.0), 0.55);
light *= min(1.0, max(0.0f, 2.0 - sqrt(distance) / 64));
double light = 0.03 + std::pow(10.0 / (1.0 + distance / 100.0), 0.55);
light *= std::min(1.0, std::max(0.0, 2.0 - std::sqrt(distance) / 64));
light *= 0.1f;
return (uint8)(min(255.0, light * 255.0));
return (uint8)(std::min(255.0, light * 255.0));
}
static uint8 calc_light_intensity_spot(sint32 x, sint32 y) {
double distance = (double)(x * x + y * y);
double light = 0.3 + pow(10.0 / (1.0 + distance / 100.0), 0.75);
light *= min(1.0, max(0.0f, 2.0 - sqrt(distance) / 64));
double light = 0.3 + std::pow(10.0 / (1.0 + distance / 100.0), 0.75);
light *= std::min(1.0, std::max(0.0, 2.0 - std::sqrt(distance) / 64));
light *= 0.5f;
return (uint8)(min(255.0, light * 255.0)) >> 4;
return (uint8)(std::min(255.0, light * 255.0)) >> 4;
}
static void calc_rescale_light_half( uint8 *target, uint8 *source,uint32 targetWidth, uint32 targetHeight) {
@@ -177,9 +181,9 @@ void lightfx_prepare_light_list()
}
LocationXYZ16 coord_3d = {
.x = entry->x,
.y = entry->y,
.z = entry->z
/* .x = */ entry->x,
/* .y = */ entry->y,
/* .z = */ entry->z
};
LocationXY16 coord_2d = coordinate_3d_to_2d(&coord_3d, _current_view_rotation_front);
@@ -352,13 +356,13 @@ void lightfx_prepare_light_list()
sint32 projDot = (dirVecX * deltaX + dirVecY * deltaY) / 1000;
projDot = max(minDist, projDot);
projDot = std::max(minDist, projDot);
if (projDot < 5) {
lightIntensityOccluded += 100;
}
else {
lightIntensityOccluded += max(0, 200 - (projDot * 20));
lightIntensityOccluded += std::max(0, 200 - (projDot * 20));
}
// log_warning("light %i [%i, %i, %i], [%i, %i] minDist to %i: %i; projdot: %i", light, coord_3d.x, coord_3d.y, coord_3d.z, mapCoord.x, mapCoord.y, baseHeight, minDist, projDot);
@@ -404,8 +408,8 @@ void lightfx_prepare_light_list()
// log_warning("sample-count: %i, occlusion: %i", totalSamplePoints, lightIntensityOccluded / totalSamplePoints);
entry->lightIntensity = min(0xFF, (entry->lightIntensity * lightIntensityOccluded) / (totalSamplePoints * 100));
entry->lightIntensity = max(0x00, entry->lightIntensity - _current_view_zoom_front * 5);
entry->lightIntensity = std::min<uint32>(0xFF, (entry->lightIntensity * lightIntensityOccluded) / (totalSamplePoints * 100));
entry->lightIntensity = std::max<uint32>(0x00, entry->lightIntensity - _current_view_zoom_front * 5);
}
if (_current_view_zoom_front > 0) {
@@ -431,7 +435,7 @@ void lightfx_swap_buffers()
tmp = _LightListBack;
_LightListBack = _LightListFront;
_LightListFront = tmp;
_LightListFront = (lightlist_entry *)tmp;
LightListCurrentCountFront = LightListCurrentCountBack;
LightListCurrentCountBack = 0x0;
@@ -472,7 +476,7 @@ void lightfx_render_lights_to_frontbuffer()
for (uint32 light = 0; light < LightListCurrentCountFront; light++) {
const uint8 *bufReadBase = 0;
uint8 *bufWriteBase = _light_rendered_buffer_front;
uint8 *bufWriteBase = (uint8 *)_light_rendered_buffer_front;
uint32 bufReadWidth, bufReadHeight;
sint32 bufWriteX, bufWriteY;
sint32 bufWriteWidth, bufWriteHeight;
@@ -587,7 +591,7 @@ void lightfx_render_lights_to_frontbuffer()
if (entry->lightIntensity == 0xFF) {
for (sint32 y = 0; y < bufWriteHeight; y++) {
for (sint32 x = 0; x < bufWriteWidth; x++) {
*bufWriteBase = min(0xFF, *bufWriteBase + *bufReadBase);
*bufWriteBase = std::min(0xFF, *bufWriteBase + *bufReadBase);
bufWriteBase++;
bufReadBase++;
}
@@ -599,7 +603,7 @@ void lightfx_render_lights_to_frontbuffer()
else {
for (sint32 y = 0; y < bufWriteHeight; y++) {
for (sint32 x = 0; x < bufWriteWidth; x++) {
*bufWriteBase = min(0xFF, *bufWriteBase + (((*bufReadBase) * (1 + entry->lightIntensity)) >> 8));
*bufWriteBase = std::min(0xFF, *bufWriteBase + (((*bufReadBase) * (1 + entry->lightIntensity)) >> 8));
bufWriteBase++;
bufReadBase++;
}
@@ -825,12 +829,12 @@ void lightfx_apply_palette_filter(uint8 i, uint8 *r, uint8 *g, uint8 *b)
static float fogginess = 0.0f;
static float lightPolution = 0.0f;
float sunLight = max(0.0f, min(1.0f, 2.0f - night * 3.0f));
float sunLight = std::max(0.0f, std::min(1.0f, 2.0f - night * 3.0f));
// Night version
natLightR = flerp(natLightR * 4.0f, 0.635f, (float)(pow(night, 0.035f + sunLight * 10.50f)));
natLightG = flerp(natLightG * 4.0f, 0.650f, (float)(pow(night, 0.100f + sunLight * 5.50f)));
natLightB = flerp(natLightB * 4.0f, 0.850f, (float)(pow(night, 0.200f + sunLight * 1.5f)));
natLightR = flerp(natLightR * 4.0f, 0.635f, (float)(std::pow(night, 0.035f + sunLight * 10.50f)));
natLightG = flerp(natLightG * 4.0f, 0.650f, (float)(std::pow(night, 0.100f + sunLight * 5.50f)));
natLightB = flerp(natLightB * 4.0f, 0.850f, (float)(std::pow(night, 0.200f + sunLight * 1.5f)));
float overExpose = 0.0f;
float lightAvg = (natLightR + natLightG + natLightB) / 3.0f;
@@ -873,7 +877,7 @@ void lightfx_apply_palette_filter(uint8 i, uint8 *r, uint8 *g, uint8 *b)
wetness *= 0.999995f;
wetness += fogginess * 0.001f;
wetness = min(wetness, 1.0f);
wetness = std::min(wetness, 1.0f);
float boost = 1.0f;
float envFog = fogginess;
@@ -886,9 +890,9 @@ void lightfx_apply_palette_filter(uint8 i, uint8 *r, uint8 *g, uint8 *b)
float reduceColourNat = 1.0f;
float reduceColourLit = 1.0f;
reduceColourLit *= night / (float)pow(max(1.01f, 0.4f + lightAvg), 2.0);
reduceColourLit *= night / (float)std::pow(std::max(1.01f, 0.4f + lightAvg), 2.0);
float targetLightPollution = reduceColourLit * max(0.0f, 0.0f + 0.000001f * (float)lightfx_get_light_polution());
float targetLightPollution = reduceColourLit * std::max(0.0f, 0.0f + 0.000001f * (float)lightfx_get_light_polution());
lightPolution -= (lightPolution - targetLightPollution) * 0.001f;
// lightPollution /= 1.0f + fogginess * 1.0f;
@@ -938,7 +942,7 @@ void lightfx_apply_palette_filter(uint8 i, uint8 *r, uint8 *g, uint8 *b)
// This experiment shifts the colour of pixels as-if they are wet, but it is not a pretty solution at all
if ((i % 16)) {
float iVal = ((float)((i + 12) % 16)) / 16.0f;
float eff = (wetness * ((float)pow(iVal, 1.5) * 0.85f));
float eff = (wetness * ((float)std::pow(iVal, 1.5) * 0.85f));
reduceColourNat *= 1.0f - eff;
addLightNatR += fogR * eff * 3.95f;
addLightNatG += fogR * eff * 3.95f;
@@ -950,14 +954,14 @@ void lightfx_apply_palette_filter(uint8 i, uint8 *r, uint8 *g, uint8 *b)
addLightNatG *= 1.0f - envFog;
addLightNatB *= 1.0f - envFog;
*r = (uint8)(min(255.0f, max(0.0f, (-overExpose + (float)(*r) * reduceColourNat * natLightR + envFog * fogR + addLightNatR))));
*g = (uint8)(min(255.0f, max(0.0f, (-overExpose + (float)(*g) * reduceColourNat * natLightG + envFog * fogG + addLightNatG))));
*b = (uint8)(min(255.0f, max(0.0f, (-overExpose + (float)(*b) * reduceColourNat * natLightB + envFog * fogB + addLightNatB))));
*r = (uint8)(std::min(255.0f, std::max(0.0f, (-overExpose + (float)(*r) * reduceColourNat * natLightR + envFog * fogR + addLightNatR))));
*g = (uint8)(std::min(255.0f, std::max(0.0f, (-overExpose + (float)(*g) * reduceColourNat * natLightG + envFog * fogG + addLightNatG))));
*b = (uint8)(std::min(255.0f, std::max(0.0f, (-overExpose + (float)(*b) * reduceColourNat * natLightB + envFog * fogB + addLightNatB))));
rct_palette_entry * dstEntry = &gPalette_light.entries[i];
dstEntry->red = (uint8)(min(0xFF, ((float)(*r) * reduceColourLit * boost + lightFog) * elecMultR));
dstEntry->green = (uint8)(min(0xFF, ((float)(*g) * reduceColourLit * boost + lightFog) * elecMultG));
dstEntry->blue = (uint8)(min(0xFF, ((float)(*b) * reduceColourLit * boost + lightFog) * elecMultB));
dstEntry->red = (uint8)(std::min<float>(0xFF, ((float)(*r) * reduceColourLit * boost + lightFog) * elecMultR));
dstEntry->green = (uint8)(std::min<float>(0xFF, ((float)(*g) * reduceColourLit * boost + lightFog) * elecMultG));
dstEntry->blue = (uint8)(std::min<float>(0xFF, ((float)(*b) * reduceColourLit * boost + lightFog) * elecMultB));
}
}
@@ -966,7 +970,7 @@ static uint8 mix_light(uint32 a, uint32 b, uint32 intensity)
intensity = intensity * 6;
uint32 bMul = (b * intensity) >> 8;
uint32 ab = a + bMul;
uint8 result = min(255, ab);
uint8 result = std::min<uint32>(255, ab);
return result;
}
@@ -1012,4 +1016,6 @@ void lightfx_render_to_texture(
}
}
}
#endif // __ENABLE_LIGHTFX__

0
src/openrct2/drawing/lightfx.h → src/openrct2/drawing/LightFX.h
View File

2
src/openrct2/drawing/X8DrawingEngine.cpp
View File

@@ -31,7 +31,7 @@
#include "../interface/window.h"
#include "../Intro.h"
#include "drawing.h"
#include "lightfx.h"
#include "LightFX.h"
using namespace OpenRCT2;
using namespace OpenRCT2::Drawing;

2
src/openrct2/paint/sprite/Peep.cpp
View File

@@ -15,7 +15,7 @@
#pragma endregion
#include "../../config/Config.h"
#include "../../drawing/lightfx.h"
#include "../../drawing/LightFX.h"
#include "../../interface/viewport.h"
#include "Sprite.h"
#include "../../peep/Peep.h"

2
src/openrct2/paint/tile_element/Entrance.cpp
View File

@@ -24,7 +24,7 @@
#include "../Paint.h"
#include "../Supports.h"
#include "TileElement.h"
#include "../../drawing/lightfx.h"
#include "../../drawing/LightFX.h"
static uint32 _unk9E32BC;

2
src/openrct2/paint/tile_element/Path.cpp
View File

@@ -29,7 +29,7 @@
#include "TileElement.h"
#include "Surface.h"
#include "../../world/Map.h"
#include "../../drawing/lightfx.h"
#include "../../drawing/LightFX.h"
const uint8 byte_98D800[] = {
12, 9, 3, 6

2
src/openrct2/platform/shared.c
View File

@@ -29,7 +29,7 @@
#include "../OpenRCT2.h"
#include "../config/Config.h"
#include "../drawing/drawing.h"
#include "../drawing/lightfx.h"
#include "../drawing/LightFX.h"
#include "../Game.h"
#include "../localisation/currency.h"
#include "../localisation/localisation.h"

2
src/openrct2/ride/vehicle_paint.c
View File

@@ -21,7 +21,7 @@
#include "Track.h"
#include "../interface/viewport.h"
#include "../Game.h"
#include "../drawing/lightfx.h"
#include "../drawing/LightFX.h"
#include "vehicle_paint.h"
// 0x0098E52C: