Skip to content

Commit 99aa489

Browse files
RicardoLuis0madame-rachelle
authored andcommitted
4.14.2 model refactor cherry pick
* split frame info calculation from RenderFrameModels * clean up FindModelFrame * refactor model overrides into its own function * refactor frame rendering into RenderModelFrame * split frame processing into ProcessModelFrame
1 parent 3befb3f commit 99aa489

File tree

5 files changed

+276
-179
lines changed

5 files changed

+276
-179
lines changed

src/common/models/model.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
TDeletingArray<FModel*> Models;
4747
TArray<FSpriteModelFrame> SpriteModelFrames;
48-
TMap<void*, FSpriteModelFrame> BaseSpriteModelFrames;
48+
TMap<const PClass*, FSpriteModelFrame> BaseSpriteModelFrames;
4949

5050

5151
/////////////////////////////////////////////////////////////////////////////

src/common/models/model.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@ class FModelRenderer;
1616
class FGameTexture;
1717
class IModelVertexBuffer;
1818
class FModel;
19+
class PClass;
1920
struct FSpriteModelFrame;
2021

2122
FTextureID LoadSkin(const char* path, const char* fn);
2223
void FlushModels();
2324

25+
2426
extern TDeletingArray<FModel*> Models;
2527
extern TArray<FSpriteModelFrame> SpriteModelFrames;
26-
extern TMap<void*, FSpriteModelFrame> BaseSpriteModelFrames;
28+
extern TMap<const PClass*, FSpriteModelFrame> BaseSpriteModelFrames;
2729

2830
#define MD3_MAX_SURFACES 32
2931
#define MIN_MODELS 4

0 commit comments

Comments
 (0)