mirror of
https://github.com/halpz/re3.git
synced 2025-07-26 00:02:45 +00:00
Merge branch 'miami' into lcs
# Conflicts: # README.md # premake5.lua # src/audio/MusicManager.cpp # src/core/main.cpp # src/core/re3.cpp # src/extras/postfx.cpp # src/render/Font.cpp
This commit is contained in:
@ -1,5 +1,6 @@
|
||||
#include "common.h"
|
||||
|
||||
#include "main.h"
|
||||
#include "Antennas.h"
|
||||
|
||||
CAntenna CAntennas::aAntennas[NUMANTENNAS];
|
||||
@ -70,6 +71,7 @@ CAntennas::Render(void)
|
||||
{
|
||||
int i, j;
|
||||
|
||||
PUSH_RENDERGROUP("CAntennas::Render");
|
||||
for(i = 0; i < NUMANTENNAS; i++){
|
||||
if(!aAntennas[i].active)
|
||||
continue;
|
||||
@ -101,6 +103,8 @@ CAntennas::Render(void)
|
||||
}
|
||||
|
||||
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
|
||||
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -1,5 +1,6 @@
|
||||
#include "common.h"
|
||||
|
||||
#include "main.h"
|
||||
#include "Sprite.h"
|
||||
#include "Sprite2d.h"
|
||||
#include "General.h"
|
||||
@ -119,6 +120,8 @@ CClouds::Render(void)
|
||||
if(!CGame::CanSeeOutSideFromCurrArea())
|
||||
return;
|
||||
|
||||
PUSH_RENDERGROUP("CClouds::Render");
|
||||
|
||||
CCoronas::SunBlockedByClouds = false;
|
||||
|
||||
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
|
||||
@ -301,6 +304,8 @@ CClouds::Render(void)
|
||||
RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)TRUE);
|
||||
RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
|
||||
RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
|
||||
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
bool
|
||||
@ -313,6 +318,8 @@ void
|
||||
CClouds::RenderBackground(int16 topred, int16 topgreen, int16 topblue,
|
||||
int16 botred, int16 botgreen, int16 botblue, int16 alpha)
|
||||
{
|
||||
PUSH_RENDERGROUP("CClouds::RenderBackground");
|
||||
|
||||
CVector right = CrossProduct(TheCamera.GetUp(), TheCamera.GetForward());
|
||||
right.Normalise();
|
||||
float c = right.Magnitude2D();
|
||||
@ -415,6 +422,8 @@ CClouds::RenderBackground(int16 topred, int16 topgreen, int16 topblue,
|
||||
ms_colourBottom.g = fogg;
|
||||
ms_colourBottom.b = fogb;
|
||||
}
|
||||
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
void
|
||||
@ -423,6 +432,8 @@ CClouds::RenderHorizon(void)
|
||||
if(UseDarkBackground())
|
||||
return;
|
||||
|
||||
PUSH_RENDERGROUP("CClouds::RenderHorizon");
|
||||
|
||||
ms_colourBottom.a = 230;
|
||||
ms_colourTop.a = 80;
|
||||
|
||||
@ -457,4 +468,6 @@ CClouds::RenderHorizon(void)
|
||||
|
||||
CSprite2d::DrawAnyRect(0.0f, topleft, SCREEN_WIDTH, topright, 0.0f, botleft, SCREEN_WIDTH, botright,
|
||||
ms_colourBkGrd, ms_colourBkGrd, ms_colourBkGrd, ms_colourBkGrd);
|
||||
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
@ -249,6 +249,8 @@ CCoronas::Render(void)
|
||||
int i, j;
|
||||
int screenw, screenh;
|
||||
|
||||
PUSH_RENDERGROUP("CCoronas::Render");
|
||||
|
||||
screenw = RwRasterGetWidth(RwCameraGetRaster(Scene.camera));
|
||||
screenh = RwRasterGetHeight(RwCameraGetRaster(Scene.camera));
|
||||
|
||||
@ -432,6 +434,8 @@ CCoronas::Render(void)
|
||||
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
|
||||
RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)TRUE);
|
||||
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
|
||||
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
void
|
||||
@ -442,6 +446,8 @@ CCoronas::RenderReflections(void)
|
||||
CEntity *entity;
|
||||
|
||||
if(CWeather::WetRoads > 0.0f){
|
||||
PUSH_RENDERGROUP("CCoronas::RenderReflections");
|
||||
|
||||
CSprite::InitSpriteBuffer();
|
||||
|
||||
RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
|
||||
@ -517,6 +523,8 @@ CCoronas::RenderReflections(void)
|
||||
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
|
||||
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
|
||||
RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)TRUE);
|
||||
|
||||
POP_RENDERGROUP();
|
||||
}else{
|
||||
for(i = 0; i < NUMCORONAS; i++)
|
||||
aCoronas[i].renderReflection = false;
|
||||
|
@ -460,6 +460,7 @@ void CMovingThings::Update()
|
||||
|
||||
void CMovingThings::Render()
|
||||
{
|
||||
PUSH_RENDERGROUP("CMovingThings::Render");
|
||||
CSmokeTrails::Update();
|
||||
|
||||
int i;
|
||||
@ -472,6 +473,7 @@ void CMovingThings::Render()
|
||||
CPlaneTrails::Render();
|
||||
CSmokeTrails::Render();
|
||||
CPlaneBanners::Render();
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
void CMovingThings::RegisterOne(CEntity *pEnt, uint16 nType) {
|
||||
|
@ -126,7 +126,7 @@ enum
|
||||
class CFont
|
||||
{
|
||||
#ifdef MORE_LANGUAGES
|
||||
static int16 Size[LANGSET_MAX][MAX_FONTS][193];
|
||||
static int16 Size[LANGSET_MAX][MAX_FONTS][210];
|
||||
static uint8 LanguageSet;
|
||||
static int32 Slot;
|
||||
#else
|
||||
@ -158,11 +158,11 @@ public:
|
||||
#endif
|
||||
static int GetNumberLines(float xstart, float ystart, wchar *s);
|
||||
static void GetTextRect(CRect *rect, float xstart, float ystart, wchar *s);
|
||||
#ifdef MORE_LANGUAGES
|
||||
static bool PrintString(float x, float y, wchar *start, wchar* &end, float spwidth, float japX);
|
||||
#else
|
||||
//#ifdef MORE_LANGUAGES
|
||||
// static bool PrintString(float x, float y, wchar *start, wchar* &end, float spwidth, float japX);
|
||||
//#else
|
||||
static void PrintString(float x, float y, uint32, wchar *start, wchar *end, float spwidth);
|
||||
#endif
|
||||
//#endif
|
||||
static void PrintStringFromBottom(float x, float y, wchar *str);
|
||||
static float GetCharacterWidth(wchar c, bool forceProportional = false);
|
||||
static float GetCharacterSize(wchar c);
|
||||
@ -171,12 +171,12 @@ public:
|
||||
static float GetStringWidth_Jap(wchar* s);
|
||||
#endif
|
||||
static uint16 *GetNextSpace(wchar *s);
|
||||
#ifdef MORE_LANGUAGES
|
||||
static uint16 *ParseToken(wchar *s, bool japShit = false);
|
||||
#else
|
||||
//#ifdef MORE_LANGUAGES
|
||||
// static uint16 *ParseToken(wchar *s, bool japShit = false);
|
||||
//#else
|
||||
static uint16 *ParseToken(wchar *s);
|
||||
static uint16 *ParseToken(wchar *s, CRGBA &color, bool &flash, bool &bold);
|
||||
#endif
|
||||
//#endif
|
||||
static void DrawFonts(void);
|
||||
static void RenderFontBuffer(void);
|
||||
static uint16 character_code(uint8 c);
|
||||
@ -221,6 +221,6 @@ public:
|
||||
static bool IsAnsiCharacter(wchar* s);
|
||||
static bool IsJapanesePunctuation(wchar* str);
|
||||
static bool IsJapanese() { return LanguageSet == FONT_LANGSET_JAPANESE; }
|
||||
static bool IsJapaneseFont() { return IsJapanese() && (Details.style == FONT_JAPANESE || Details.style == FONT_PAGER); }
|
||||
static bool IsJapaneseFont() { return IsJapanese() && (Details.style == FONT_JAPANESE); }
|
||||
#endif
|
||||
};
|
||||
|
@ -276,6 +276,8 @@ CGlass::Render(void)
|
||||
RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void *)rwBLENDONE);
|
||||
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void *)TRUE);
|
||||
|
||||
PUSH_RENDERGROUP("CGlass::Render");
|
||||
|
||||
for ( int32 i = 0; i < NUM_GLASSPANES; i++ )
|
||||
{
|
||||
if ( aGlassPanes[i].m_bActive )
|
||||
@ -285,6 +287,8 @@ CGlass::Render(void)
|
||||
for ( uint32 i = 0; i < NumGlassEntities; i++ )
|
||||
RenderEntityInGlass(apEntitiesToBeRendered[i]);
|
||||
|
||||
POP_RENDERGROUP();
|
||||
|
||||
NumGlassEntities = 0;
|
||||
|
||||
RenderHiLightPolys();
|
||||
|
@ -6,6 +6,7 @@
|
||||
#include <d3d8caps.h>
|
||||
#endif
|
||||
|
||||
#include "main.h"
|
||||
#include "General.h"
|
||||
#include "RwHelper.h"
|
||||
#include "Camera.h"
|
||||
@ -333,6 +334,7 @@ CMBlur::MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, u
|
||||
#ifdef EXTENDED_COLOURFILTER
|
||||
CPostFX::Render(cam, red, green, blue, blur, type, bluralpha);
|
||||
#else
|
||||
PUSH_RENDERGROUP("CMBlur::MotionBlurRender");
|
||||
RwRGBA color = { (RwUInt8)red, (RwUInt8)green, (RwUInt8)blue, (RwUInt8)blur };
|
||||
#ifdef GTA_PS2
|
||||
if( pFrontBuffer )
|
||||
@ -348,6 +350,7 @@ CMBlur::MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, u
|
||||
RwRasterPopContext();
|
||||
}
|
||||
#endif
|
||||
POP_RENDERGROUP();
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -1,5 +1,6 @@
|
||||
#include "common.h"
|
||||
|
||||
#include "main.h"
|
||||
#include "General.h"
|
||||
#include "Timer.h"
|
||||
#include "TxdStore.h"
|
||||
@ -1749,6 +1750,8 @@ void CParticle::Update()
|
||||
|
||||
void CParticle::Render()
|
||||
{
|
||||
PUSH_RENDERGROUP("CParticle::Render");
|
||||
|
||||
RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void *)rwTEXTUREADDRESSWRAP);
|
||||
RwRenderStateSet(rwRENDERSTATETEXTUREPERSPECTIVE, (void *)TRUE);
|
||||
RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void *)FALSE);
|
||||
@ -2105,6 +2108,8 @@ void CParticle::Render()
|
||||
RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void *)TRUE);
|
||||
RwRenderStateSet(rwRENDERSTATESRCBLEND, (void *)rwBLENDSRCALPHA);
|
||||
RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void *)rwBLENDINVSRCALPHA);
|
||||
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
void CParticle::RemovePSystem(tParticleType type)
|
||||
|
@ -159,6 +159,8 @@ CPointLights::RenderFogEffect(void)
|
||||
if(CCutsceneMgr::IsRunning())
|
||||
return;
|
||||
|
||||
PUSH_RENDERGROUP("CPointLights::RenderFogEffect");
|
||||
|
||||
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
|
||||
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
|
||||
RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDONE);
|
||||
@ -302,6 +304,8 @@ CPointLights::RenderFogEffect(void)
|
||||
}
|
||||
|
||||
CSprite::FlushSpriteBuffer();
|
||||
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
bool
|
||||
|
@ -134,8 +134,13 @@ CRenderer::RenderOneRoad(CEntity *e)
|
||||
return;
|
||||
if(gbShowCollisionPolys)
|
||||
CCollision::DrawColModel_Coloured(e->GetMatrix(), *CModelInfo::GetModelInfo(e->GetModelIndex())->GetColModel(), e->GetModelIndex());
|
||||
else
|
||||
else{
|
||||
PUSH_RENDERGROUP(CModelInfo::GetModelInfo(e->GetModelIndex())->GetModelName());
|
||||
|
||||
e->Render();
|
||||
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
@ -182,6 +187,8 @@ CRenderer::RenderOneNonRoad(CEntity *e)
|
||||
}
|
||||
#endif
|
||||
|
||||
PUSH_RENDERGROUP(CModelInfo::GetModelInfo(e->GetModelIndex())->GetModelName());
|
||||
|
||||
resetLights = e->SetupLighting();
|
||||
|
||||
if(e->IsVehicle()){
|
||||
@ -210,6 +217,8 @@ CRenderer::RenderOneNonRoad(CEntity *e)
|
||||
}
|
||||
|
||||
e->RemoveLighting(resetLights);
|
||||
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
void
|
||||
@ -235,6 +244,7 @@ CRenderer::RenderRoads(void)
|
||||
int i;
|
||||
CEntity *e;
|
||||
|
||||
PUSH_RENDERGROUP("CRenderer::RenderRoads");
|
||||
RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)TRUE);
|
||||
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
|
||||
SetCullMode(rwCULLMODECULLBACK);
|
||||
@ -246,6 +256,7 @@ CRenderer::RenderRoads(void)
|
||||
if(IsRoad(e))
|
||||
RenderOneRoad(e);
|
||||
}
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
inline bool PutIntoSortedVehicleList(CVehicle *veh)
|
||||
@ -268,6 +279,7 @@ CRenderer::RenderEverythingBarRoads(void)
|
||||
CEntity *e;
|
||||
EntityInfo ei;
|
||||
|
||||
PUSH_RENDERGROUP("CRenderer::RenderEverythingBarRoads");
|
||||
RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)TRUE);
|
||||
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
|
||||
SetCullMode(rwCULLMODECULLBACK);
|
||||
@ -299,6 +311,7 @@ CRenderer::RenderEverythingBarRoads(void)
|
||||
}else
|
||||
RenderOneNonRoad(e);
|
||||
}
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
void
|
||||
@ -306,6 +319,7 @@ CRenderer::RenderBoats(void)
|
||||
{
|
||||
CLink<EntityInfo> *node;
|
||||
|
||||
PUSH_RENDERGROUP("CRenderer::RenderBoats");
|
||||
RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)TRUE);
|
||||
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
|
||||
SetCullMode(rwCULLMODECULLBACK);
|
||||
@ -334,6 +348,7 @@ CRenderer::RenderBoats(void)
|
||||
CVehicle *v = (CVehicle*)node->item.ent;
|
||||
RenderOneNonRoad(v);
|
||||
}
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
#ifdef NEW_RENDERER
|
||||
@ -437,6 +452,7 @@ CRenderer::RenderWorld(int pass)
|
||||
switch(pass){
|
||||
case 0:
|
||||
// Roads
|
||||
PUSH_RENDERGROUP("CRenderer::RenderWorld - Roads");
|
||||
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
|
||||
for(i = 0; i < ms_nNoOfVisibleBuildings; i++){
|
||||
e = ms_aVisibleBuildingPtrs[i];
|
||||
@ -450,9 +466,11 @@ CRenderer::RenderWorld(int pass)
|
||||
if(e->bIsBIGBuilding || IsRoad(e))
|
||||
RenderOneBuilding(e, node->item.sort);
|
||||
}
|
||||
POP_RENDERGROUP();
|
||||
break;
|
||||
case 1:
|
||||
// Opaque
|
||||
PUSH_RENDERGROUP("CRenderer::RenderWorld - Opaque");
|
||||
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
|
||||
for(i = 0; i < ms_nNoOfVisibleBuildings; i++){
|
||||
e = ms_aVisibleBuildingPtrs[i];
|
||||
@ -473,14 +491,17 @@ CRenderer::RenderWorld(int pass)
|
||||
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, FALSE);
|
||||
WorldRender::RenderBlendPass(PASS_NOZ);
|
||||
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
|
||||
POP_RENDERGROUP();
|
||||
break;
|
||||
case 2:
|
||||
// Transparent
|
||||
PUSH_RENDERGROUP("CRenderer::RenderWorld - Transparent");
|
||||
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
|
||||
RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDONE);
|
||||
WorldRender::RenderBlendPass(PASS_ADD);
|
||||
RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
|
||||
WorldRender::RenderBlendPass(PASS_BLEND);
|
||||
POP_RENDERGROUP();
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -491,11 +512,13 @@ CRenderer::RenderPeds(void)
|
||||
int i;
|
||||
CEntity *e;
|
||||
|
||||
PUSH_RENDERGROUP("CRenderer::RenderPeds");
|
||||
for(i = 0; i < ms_nNoOfVisibleVehicles; i++){
|
||||
e = ms_aVisibleVehiclePtrs[i];
|
||||
if(e->IsPed())
|
||||
RenderOneNonRoad(e);
|
||||
}
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
void
|
||||
@ -506,6 +529,7 @@ CRenderer::RenderVehicles(void)
|
||||
EntityInfo ei;
|
||||
CLink<EntityInfo> *node;
|
||||
|
||||
PUSH_RENDERGROUP("CRenderer::RenderVehicles");
|
||||
// not the real thing
|
||||
for(i = 0; i < ms_nNoOfVisibleVehicles; i++){
|
||||
e = ms_aVisibleVehiclePtrs[i];
|
||||
@ -522,6 +546,7 @@ CRenderer::RenderVehicles(void)
|
||||
node != &gSortedVehiclesAndPeds.head;
|
||||
node = node->prev)
|
||||
RenderOneNonRoad(node->item.ent);
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
void
|
||||
@ -530,6 +555,7 @@ CRenderer::RenderTransparentWater(void)
|
||||
int i;
|
||||
CEntity *e;
|
||||
|
||||
PUSH_RENDERGROUP("CRenderer::RenderTransparentWater");
|
||||
RwRenderStateSet(rwRENDERSTATETEXTURERASTER, nil);
|
||||
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
|
||||
RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
|
||||
@ -553,6 +579,7 @@ CRenderer::RenderTransparentWater(void)
|
||||
CWaterLevel::RenderTransparentWater();
|
||||
|
||||
SetStencilState(0);
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
void
|
||||
@ -573,20 +600,24 @@ CRenderer::ClearForFrame(void)
|
||||
void
|
||||
CRenderer::RenderFadingInEntities(void)
|
||||
{
|
||||
PUSH_RENDERGROUP("CRenderer::RenderFadingInEntities");
|
||||
RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)TRUE);
|
||||
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
|
||||
SetCullMode(rwCULLMODECULLBACK);
|
||||
DeActivateDirectional();
|
||||
SetAmbientColours();
|
||||
CVisibilityPlugins::RenderFadingEntities();
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
void
|
||||
CRenderer::RenderFadingInUnderwaterEntities(void)
|
||||
{
|
||||
PUSH_RENDERGROUP("CRenderer::RenderFadingInUnderwaterEntities");
|
||||
DeActivateDirectional();
|
||||
SetAmbientColours();
|
||||
CVisibilityPlugins::RenderFadingUnderwaterEntities();
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -54,6 +54,8 @@ CRubbish::Render(void)
|
||||
if(RubbishVisibility == 0)
|
||||
return;
|
||||
|
||||
PUSH_RENDERGROUP("CRubbish::Render");
|
||||
|
||||
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
|
||||
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
|
||||
RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)TRUE);
|
||||
@ -150,6 +152,8 @@ CRubbish::Render(void)
|
||||
RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
|
||||
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
|
||||
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
|
||||
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -1068,6 +1068,8 @@ CShadows::SetRenderModeForShadowType(uint8 ShadowType)
|
||||
void
|
||||
CShadows::RenderStoredShadows(void)
|
||||
{
|
||||
PUSH_RENDERGROUP("CShadows::RenderStoredShadows");
|
||||
|
||||
RenderBuffer::ClearRenderBuffer();
|
||||
|
||||
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void *)FALSE);
|
||||
@ -1241,12 +1243,16 @@ CShadows::RenderStoredShadows(void)
|
||||
RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void *)rwTEXTUREADDRESSWRAP);
|
||||
|
||||
ShadowsStoredToBeRendered = 0;
|
||||
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
CShadows::RenderStaticShadows(void)
|
||||
{
|
||||
PUSH_RENDERGROUP("CShadows::RenderStaticShadows");
|
||||
|
||||
RenderBuffer::ClearRenderBuffer();
|
||||
|
||||
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void *)FALSE);
|
||||
@ -1313,6 +1319,8 @@ CShadows::RenderStaticShadows(void)
|
||||
|
||||
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void *)FALSE);
|
||||
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void *)TRUE);
|
||||
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
|
||||
|
@ -96,6 +96,8 @@ CSkidmarks::Render(void)
|
||||
{
|
||||
int i, j;
|
||||
|
||||
PUSH_RENDERGROUP("CSkidmarks::Render");
|
||||
|
||||
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
|
||||
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
|
||||
RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
|
||||
@ -152,6 +154,8 @@ CSkidmarks::Render(void)
|
||||
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
|
||||
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
|
||||
RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)TRUE);
|
||||
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -164,6 +164,7 @@ CSpecialFX::Shutdown(void)
|
||||
void
|
||||
CSpecialFX::Render(void)
|
||||
{
|
||||
PUSH_RENDERGROUP("CSpecialFX::Render");
|
||||
CMotionBlurStreaks::Render();
|
||||
CBulletTraces::Render();
|
||||
CBrightLights::Render();
|
||||
@ -173,6 +174,7 @@ CSpecialFX::Render(void)
|
||||
if(!(gbNewRenderer && FredIsInFirstPersonCam()))
|
||||
#endif
|
||||
C3dMarkers::Render();
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -331,9 +331,11 @@ void CWaterCannons::Update(void)
|
||||
|
||||
void CWaterCannons::Render(void)
|
||||
{
|
||||
PUSH_RENDERGROUP("CWaterCannons::Render");
|
||||
for ( int32 i = 0; i < NUM_WATERCANNONS; i++ )
|
||||
{
|
||||
if ( aCannons[i].m_nId != 0 )
|
||||
aCannons[i].Render();
|
||||
}
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
@ -611,14 +611,14 @@ CWaterLevel::TestVisibilityForFineWaterBlocks(const CVector &worldPos)
|
||||
|
||||
if ((lineEnd.x > WORLD_MIN_X && lineEnd.x < WORLD_MAX_X) && (lineEnd.y > WORLD_MIN_Y && lineEnd.y < WORLD_MAX_Y))
|
||||
{
|
||||
if (!CWorld::ProcessLineOfSight(lineStart, lineEnd, col, entity, true, false, false, false, true, false, nil))
|
||||
if (!CWorld::ProcessLineOfSight(lineStart, lineEnd, col, entity, true, false, false, false, true, false))
|
||||
{
|
||||
lineStart.x += 0.4f;
|
||||
lineStart.y += 0.4f;
|
||||
lineEnd.x += 0.4f;
|
||||
lineEnd.y += 0.4f;
|
||||
|
||||
if (!CWorld::ProcessLineOfSight(lineStart, lineEnd, col, entity, true, false, false, false, true, false, nil))
|
||||
if (!CWorld::ProcessLineOfSight(lineStart, lineEnd, col, entity, true, false, false, false, true, false))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
@ -1202,6 +1202,8 @@ CWaterLevel::RenderTransparentWater(void)
|
||||
if ( !CGame::CanSeeWaterFromCurrArea() )
|
||||
return;
|
||||
|
||||
PUSH_RENDERGROUP("CWaterLevel::RenderTransparentWater");
|
||||
|
||||
float fWaterDrawDist = _GetWavyDrawDist();
|
||||
float fWaterDrawDistLarge = fWaterDrawDist + 90.0f;
|
||||
float fWavySectorMaxRenderDistSqr = SQR(fWaterDrawDist);
|
||||
@ -1485,6 +1487,8 @@ CWaterLevel::RenderTransparentWater(void)
|
||||
|
||||
DefinedState();
|
||||
#endif
|
||||
|
||||
POP_RENDERGROUP();
|
||||
}
|
||||
|
||||
void CWaterLevel::RenderOneFlatSmallWaterPoly(float fX, float fY, float fZ, RwRGBA const &color)
|
||||
|
Reference in New Issue
Block a user