From d05a3db5e514c76f2ec9041f5406fb56d836a5d1 Mon Sep 17 00:00:00 2001 From: Robert Beckebans Date: Thu, 21 Mar 2024 22:14:30 +0100 Subject: [PATCH] More renderdemo code removed --- neo/renderer/ModelDecal.cpp | 11 +---------- neo/renderer/ModelDecal.h | 4 ---- neo/renderer/ModelOverlay.cpp | 12 ++---------- neo/renderer/ModelOverlay.h | 6 ------ neo/renderer/RenderCommon.h | 2 -- neo/renderer/RenderEntity.cpp | 1 - neo/renderer/RenderWorld.cpp | 7 ------- neo/renderer/ResolutionScale.cpp | 7 +++++-- neo/renderer/tr_frontend_addmodels.cpp | 2 -- 9 files changed, 8 insertions(+), 44 deletions(-) diff --git a/neo/renderer/ModelDecal.cpp b/neo/renderer/ModelDecal.cpp index ad1244a2..7fee6840 100644 --- a/neo/renderer/ModelDecal.cpp +++ b/neo/renderer/ModelDecal.cpp @@ -4,7 +4,6 @@ Doom 3 BFG Edition GPL Source Code Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company. Copyright (C) 2014-2016 Robert Beckebans -Copyright (C) 2014-2016 Kot in Action Creative Artel This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code"). @@ -55,10 +54,7 @@ idRenderModelDecal::idRenderModelDecal() : nextDecal( 0 ), firstDeferredDecal( 0 ), nextDeferredDecal( 0 ), - numDecalMaterials( 0 ), - index( -1 ), - demoSerialWrite( 0 ), - demoSerialCurrent( 0 ) + numDecalMaterials( 0 ) { // SRS - initialize decals so members are defined for logical tests in CreateDecalFromWinding() memset( decals, 0, sizeof( decals ) ); @@ -218,7 +214,6 @@ void idRenderModelDecal::ReUse() firstDeferredDecal = 0; nextDeferredDecal = 0; numDecalMaterials = 0; - demoSerialCurrent++; } /* @@ -251,8 +246,6 @@ void idRenderModelDecal::CreateDecalFromWinding( const idWinding& w, const idMat } } - demoSerialCurrent++; - decal_t& decal = decals[decalIndex]; const float invFadeDepth = -1.0f / fadeDepth; @@ -300,8 +293,6 @@ void idRenderModelDecal::CreateDecalFromWinding( const idWinding& w, const idMat decal.indexes[decal.numIndexes + 1] = 0; decal.indexes[decal.numIndexes + 2] = 0; } - - decal.writtenToDemo = false; } /* diff --git a/neo/renderer/ModelDecal.h b/neo/renderer/ModelDecal.h index 61ab56a6..0c7c7ef0 100644 --- a/neo/renderer/ModelDecal.h +++ b/neo/renderer/ModelDecal.h @@ -91,7 +91,6 @@ struct decalProjectionParms_t int numIndexes; int startTime; const idMaterial* material; - mutable bool writtenToDemo; } #if !defined(_WIN32) ALIGNTYPE16 @@ -126,9 +125,6 @@ public: unsigned int GetNumDecalDrawSurfs(); struct drawSurf_t* CreateDecalDrawSurf( const struct viewEntity_t* space, unsigned int index ); - qhandle_t index; // Used for Demo files. - int demoSerialWrite; - int demoSerialCurrent; private: decal_t decals[MAX_DECALS]; unsigned int firstDecal; diff --git a/neo/renderer/ModelOverlay.cpp b/neo/renderer/ModelOverlay.cpp index 54d17c63..175d073d 100644 --- a/neo/renderer/ModelOverlay.cpp +++ b/neo/renderer/ModelOverlay.cpp @@ -3,8 +3,7 @@ Doom 3 BFG Edition GPL Source Code Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company. -Copyright (C) 2013-2016 Robert Beckebans -Copyright (C) 2014-2016 Kot in Action Creative Artel +Copyright (C) 2013 Robert Beckebans This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code"). @@ -46,10 +45,7 @@ idRenderModelOverlay::idRenderModelOverlay() : nextOverlay( 0 ), firstDeferredOverlay( 0 ), nextDeferredOverlay( 0 ), - numOverlayMaterials( 0 ), - index( -1 ), - demoSerialWrite( 0 ), - demoSerialCurrent( 0 ) + numOverlayMaterials( 0 ) { memset( overlays, 0, sizeof( overlays ) ); } @@ -79,7 +75,6 @@ void idRenderModelOverlay::ReUse() firstDeferredOverlay = 0; nextDeferredOverlay = 0; numOverlayMaterials = 0; - demoSerialCurrent++; for( unsigned int i = 0; i < MAX_OVERLAYS; i++ ) { @@ -496,8 +491,6 @@ void idRenderModelOverlay::CreateOverlay( const idRenderModel* model, const idPl overlayIndexes[numIndexes + 2] = 0; } - demoSerialCurrent++; - // allocate a new overlay overlay_t& overlay = overlays[nextOverlay++ & ( MAX_OVERLAYS - 1 )]; FreeOverlay( overlay ); @@ -511,7 +504,6 @@ void idRenderModelOverlay::CreateOverlay( const idRenderModel* model, const idPl overlay.verts = ( overlayVertex_t* )Mem_Alloc( numVerts * sizeof( overlay.verts[0] ), TAG_MODEL ); memcpy( overlay.verts, overlayVerts.Ptr(), numVerts * sizeof( overlay.verts[0] ) ); overlay.maxReferencedVertex = maxReferencedVertex; - overlay.writtenToDemo = false; if( nextOverlay - firstOverlay > MAX_OVERLAYS ) { diff --git a/neo/renderer/ModelOverlay.h b/neo/renderer/ModelOverlay.h index 89cda506..a490b583 100644 --- a/neo/renderer/ModelOverlay.h +++ b/neo/renderer/ModelOverlay.h @@ -3,8 +3,6 @@ Doom 3 BFG Edition GPL Source Code Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company. -Copyright (C) 2014-2016 Robert Beckebans -Copyright (C) 2014-2016 Kot in Action Creative Artel This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code"). @@ -78,7 +76,6 @@ struct overlay_t int numVerts; overlayVertex_t* verts; const idMaterial* material; - mutable bool writtenToDemo; }; class idRenderModelOverlay @@ -95,9 +92,6 @@ public: unsigned int GetNumOverlayDrawSurfs(); struct drawSurf_t* CreateOverlayDrawSurf( const struct viewEntity_t* space, const idRenderModel* baseModel, unsigned int index ); - int index; - int demoSerialWrite; - int demoSerialCurrent; private: overlay_t overlays[MAX_OVERLAYS]; unsigned int firstOverlay; diff --git a/neo/renderer/RenderCommon.h b/neo/renderer/RenderCommon.h index f45f845c..d797a631 100644 --- a/neo/renderer/RenderCommon.h +++ b/neo/renderer/RenderCommon.h @@ -284,14 +284,12 @@ public: int lastModifiedFrameNum; // to determine if it is constantly changing, // and should go in the dynamic frame memory, or kept // in the cached memory - bool archived; // for demo writing idRenderModel* dynamicModel; // if parms.model->IsDynamicModel(), this is the generated data int dynamicModelFrameCount; // continuously animating dynamic models will recreate // dynamicModel if this doesn't == tr.viewCount idRenderModel* cachedDynamicModel; - // the local bounds used to place entityRefs, either from parms for dynamic entities, or a model bounds idBounds localReferenceBounds; diff --git a/neo/renderer/RenderEntity.cpp b/neo/renderer/RenderEntity.cpp index d1ac4b0a..dc9d8bc7 100644 --- a/neo/renderer/RenderEntity.cpp +++ b/neo/renderer/RenderEntity.cpp @@ -41,7 +41,6 @@ idRenderEntityLocal::idRenderEntityLocal() world = NULL; index = 0; lastModifiedFrameNum = 0; - archived = false; dynamicModel = NULL; dynamicModelFrameCount = 0; cachedDynamicModel = NULL; diff --git a/neo/renderer/RenderWorld.cpp b/neo/renderer/RenderWorld.cpp index 0ff43a78..30844ce7 100644 --- a/neo/renderer/RenderWorld.cpp +++ b/neo/renderer/RenderWorld.cpp @@ -4,7 +4,6 @@ Doom 3 BFG Edition GPL Source Code Copyright (C) 1993-2012 id Software LLC, a ZeniMax Media company. Copyright (C) 2014-2016 Robert Beckebans -Copyright (C) 2014-2016 Kot in Action Creative Artel This file is part of the Doom 3 BFG Edition GPL Source Code ("Doom 3 BFG Edition Source Code"). @@ -166,7 +165,6 @@ idRenderWorldLocal::idRenderWorldLocal() decals[i].entityHandle = -1; decals[i].lastStartTime = 0; decals[i].decals = new( TAG_MODEL ) idRenderModelDecal(); - decals[i].decals->index = i; } for( int i = 0; i < overlays.Num(); i++ ) @@ -174,7 +172,6 @@ idRenderWorldLocal::idRenderWorldLocal() overlays[i].entityHandle = -1; overlays[i].lastStartTime = 0; overlays[i].overlays = new( TAG_MODEL ) idRenderModelOverlay(); - overlays[ i ].overlays->index = i; } } @@ -353,7 +350,6 @@ void idRenderWorldLocal::UpdateEntityDef( qhandle_t entityHandle, const renderEn def->parms = *re; def->lastModifiedFrameNum = tr.frameCount; - def->archived = false; // optionally immediately issue any callbacks if( !r_useEntityCallbacks.GetBool() && def->parms.callback != NULL ) @@ -804,7 +800,6 @@ void idRenderWorldLocal::ProjectDecalOntoWorld( const idFixedWinding& winding, c def->decals = AllocDecal( def->index, startTime ); } def->decals->AddDeferredDecal( localParms ); - def->archived = false; } } } @@ -860,7 +855,6 @@ void idRenderWorldLocal::ProjectDecal( qhandle_t entityHandle, const idFixedWind def->decals = AllocDecal( def->index, startTime ); } def->decals->AddDeferredDecal( localParms ); - def->archived = false; } /* @@ -899,7 +893,6 @@ void idRenderWorldLocal::ProjectOverlay( qhandle_t entityHandle, const idPlane l def->overlays = AllocOverlay( def->index, startTime ); } def->overlays->AddDeferredOverlay( localParms ); - def->archived = false; } /* diff --git a/neo/renderer/ResolutionScale.cpp b/neo/renderer/ResolutionScale.cpp index 22c26487..e0c80ffb 100644 --- a/neo/renderer/ResolutionScale.cpp +++ b/neo/renderer/ResolutionScale.cpp @@ -207,8 +207,11 @@ void idResolutionScale::GetConsoleText( idStr& s ) GetCurrentResolutionScale( x, y ); if( rs_display.GetInteger() > 0 ) { - x *= 1280.0f; - y *= 720.0f; + // x *= 1280.0f; + // y *= 720.0f; + x *= renderSystem->GetWidth(); + y *= renderSystem->GetHeight(); + if( rs_enable.GetInteger() == 1 ) { y = 1.0f; diff --git a/neo/renderer/tr_frontend_addmodels.cpp b/neo/renderer/tr_frontend_addmodels.cpp index 64e9d68b..00d17fda 100644 --- a/neo/renderer/tr_frontend_addmodels.cpp +++ b/neo/renderer/tr_frontend_addmodels.cpp @@ -140,8 +140,6 @@ bool R_IssueEntityDefCallback( idRenderEntityLocal* def ) { idBounds oldBounds = def->localReferenceBounds; - def->archived = false; // will need to be written to the demo file - bool update; if( tr.viewDef != NULL ) {