mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2025-10-30 08:01:01 +00:00
82ca45eeb6
* Lighting engine improvements
Now objects will be affected by the lighting engine. This is
accomplished by passing the renderer the object's model matrix
(uncombined with the view or projection). You can now setup the
lighting engine mode to affect all shaded surfaces, lighting can
be affected by surface normals, and you can control what type of
tone mapping is applied.
added le_set_mode(mode)
By default we retain the previous behavior.
When set to LE_MODE_AFFECT_ALL_SHADED the lighting engine will
affect every shaded material.
This way we don't have to recompile every object and level that
we want shaded with special coop-specific commands
added le_get_mode()
added le_set_tone_mapping(toneMapping)
Tone mapping is what happens when a color value exceeds its 0-255
range.
By default we retain the current tone mapping (called
LE_TONE_MAPPING_TOTAL_WEIGHTED).
LE_TONE_MAPPING_WEIGHTED is now accessible, it was the tone
mapping that was previously left out of the compile through ifdefs.
LE_TONE_MAPPING_CLAMP is just simple additive with a clamp at a
color value of 255.
LE_TONE_MAPPING_REINHARD is reinhard tone mapping
(vout = (vin + 1) / vin).
added le_set_light_use_surface_normals(id, useSurfaceNormals)
By default lights retain their previous behavior (of ignoring
surface normals).
When enabled lights cast on one side of the object will not
appear on the other side of the object.
It is kind of like backface culling, but for lights.
added le_calculate_lighting_color_with_normal(pos, normal, outColor, lightIntensityScalar)
It's just like le_calculate_lighting_color(), but you can pass
in normals now.
* Removed normal calculation from vertex colored surfaces - they don't have normals
* Use packed normals correctly
* made LE_MODE_AFFECT_ALL_SHADED the default
* made useSurfaceNormals the default for lights
* Set ambient color, performed le_is_enabled() checks
The ambient color was black, which is why everything was dark by default.
If we set ambient to white then people will never see the effects of their
lights unless they set ambient to a lower value. So I added checks for
if a light has ever been added. The alternative would be to have something
like le_set_enabled()
* Rewrite how we obtain the model matrix - invert the camera
* run autogen
* Change default tonemapper to weighted, make setting ambient enable LE, fix null deref
* Address Peachy's comments
---------
Co-authored-by: MysterD <myster@d>
95 lines
3.3 KiB
C
95 lines
3.3 KiB
C
#pragma once
|
|
|
|
///////////////////////
|
|
// G_SETGEOMETRYMODE //
|
|
///////////////////////
|
|
|
|
#define G_LIGHT_MAP_EXT 0x00000800
|
|
#define G_LIGHTING_ENGINE_EXT 0x00004000
|
|
#define G_PACKED_NORMALS_EXT 0x00000080
|
|
|
|
//////////
|
|
// DJUI //
|
|
//////////
|
|
|
|
#define G_TEXCLIP_DJUI 0xe1
|
|
#define G_TEXOVERRIDE_DJUI 0xe0
|
|
#define G_VTX_EXT 0x11
|
|
#define G_TRI2_EXT 0x12
|
|
#define G_TEXADDR_DJUI 0x13
|
|
#define G_EXECUTE_DJUI 0xdd
|
|
|
|
#define G_MTX_INVERSE_CAMERA_EXT 0x08
|
|
|
|
#define gsSPTextureAddrDjui(c) \
|
|
{{ \
|
|
(_SHIFTL(G_TEXADDR_DJUI,24,8)|_SHIFTL(~(u32)(c),0,24)),(u32)(0) \
|
|
}}
|
|
|
|
#define gSetClippingDjui(pkt, cmd, x1, y1, x2, y2) \
|
|
{ \
|
|
Gfx *_g = (Gfx *)(pkt); \
|
|
_g->words.w0 = _SHIFTL(cmd, 24, 8) | _SHIFTL( x1, 16, 8) | \
|
|
_SHIFTL( y1, 8, 8) | _SHIFTL(0x00, 0, 8); \
|
|
_g->words.w1 = _SHIFTL(x2, 16, 8) | _SHIFTL(y2, 8, 8); \
|
|
}
|
|
|
|
#define gSetOverrideDjui(pkt, cmd, texture, w, h, bitSize) \
|
|
{ \
|
|
Gfx *_g = (Gfx *)(pkt); \
|
|
_g->words.w0 = _SHIFTL(cmd, 24, 8) | _SHIFTL(w, 16, 8) | \
|
|
_SHIFTL(h, 8, 8) | _SHIFTL(bitSize, 0, 8); \
|
|
_g->words.w1 = (uintptr_t)(texture); \
|
|
}
|
|
|
|
// does not get affected by gVertexColor
|
|
#define gSPVertexNonGlobal(pkt, v, n, v0) \
|
|
{ \
|
|
Gfx *_g = (Gfx *)(pkt); \
|
|
_g->words.w0 = \
|
|
_SHIFTL(G_VTX_EXT,24,8)|_SHIFTL((n),12,8)|_SHIFTL((v0)+(n),1,7); \
|
|
_g->words.w1 = (uintptr_t)(v); \
|
|
}
|
|
|
|
// does not get affected by gVertexColor
|
|
#define gsSPVertexNonGlobal(v, n, v0) \
|
|
{{ \
|
|
(_SHIFTL(G_VTX_EXT,24,8)|_SHIFTL((n),12,8)|_SHIFTL((v0)+(n),1,7)), \
|
|
(uintptr_t)(v) \
|
|
}}
|
|
|
|
#define gSP2TrianglesDjui(pkt, v00, v01, v02, flag0, v10, v11, v12, flag1) \
|
|
{ \
|
|
Gfx *_g = (Gfx *)(pkt); \
|
|
\
|
|
_g->words.w0 = (_SHIFTL(G_TRI2_EXT, 24, 8)| \
|
|
__gsSP1Triangle_w1f(v00, v01, v02, flag0)); \
|
|
_g->words.w1 = __gsSP1Triangle_w1f(v10, v11, v12, flag1); \
|
|
}
|
|
|
|
#define gsSPExecuteDjui(word) \
|
|
{{ \
|
|
_SHIFTL(G_EXECUTE_DJUI, 24, 8), (unsigned int)(word) \
|
|
}}
|
|
|
|
#define gDPLoadTextureBlockWithoutTexture(pkt, timg, fmt, siz, width, height, \
|
|
pal, cms, cmt, masks, maskt, shifts, shiftt) \
|
|
{ \
|
|
gDPSetTile(pkt, fmt, siz##_LOAD_BLOCK, 0, 0, G_TX_LOADTILE, \
|
|
0 , cmt, maskt, shiftt, cms, masks, shifts); \
|
|
gDPLoadSync(pkt); \
|
|
gDPLoadBlock(pkt, G_TX_LOADTILE, 0, 0, \
|
|
(((width)*(height) + siz##_INCR) >> siz##_SHIFT) -1, \
|
|
CALC_DXT(width, siz##_BYTES)); \
|
|
gDPPipeSync(pkt); \
|
|
gDPSetTile(pkt, fmt, siz, \
|
|
(((width) * siz##_LINE_BYTES)+7)>>3, 0, \
|
|
G_TX_RENDERTILE, pal, cmt, maskt, shiftt, cms, masks, \
|
|
shifts); \
|
|
gDPSetTileSize(pkt, G_TX_RENDERTILE, 0, 0, \
|
|
((width)-1) << G_TEXTURE_IMAGE_FRAC, \
|
|
((height)-1) << G_TEXTURE_IMAGE_FRAC) \
|
|
}
|
|
|
|
#define gDPSetTextureClippingDjui(pkt, x1, y1, x2, y2) gSetClippingDjui(pkt, G_TEXCLIP_DJUI, x1, y1, x2, y2)
|
|
#define gDPSetTextureOverrideDjui(pkt, texture, w, h, bitSize) gSetOverrideDjui(pkt, G_TEXOVERRIDE_DJUI, texture, w, h, bitSize)
|