summaryrefslogtreecommitdiffstats
path: root/src/modelinfo
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-12-03 16:04:59 +0100
committeraap <aap@papnet.eu>2020-12-03 16:04:59 +0100
commit13cefd329390c119126af6dcf0558ceb7c720e59 (patch)
treefa6f5344fe2e0f590d135515e40a5e673fcbf39a /src/modelinfo
parentlittle fixes for animviewer (diff)
downloadre3-13cefd329390c119126af6dcf0558ceb7c720e59.tar
re3-13cefd329390c119126af6dcf0558ceb7c720e59.tar.gz
re3-13cefd329390c119126af6dcf0558ceb7c720e59.tar.bz2
re3-13cefd329390c119126af6dcf0558ceb7c720e59.tar.lz
re3-13cefd329390c119126af6dcf0558ceb7c720e59.tar.xz
re3-13cefd329390c119126af6dcf0558ceb7c720e59.tar.zst
re3-13cefd329390c119126af6dcf0558ceb7c720e59.zip
Diffstat (limited to 'src/modelinfo')
-rw-r--r--src/modelinfo/BaseModelInfo.h4
-rw-r--r--src/modelinfo/SimpleModelInfo.h12
2 files changed, 14 insertions, 2 deletions
diff --git a/src/modelinfo/BaseModelInfo.h b/src/modelinfo/BaseModelInfo.h
index 2505967b..4c274aaf 100644
--- a/src/modelinfo/BaseModelInfo.h
+++ b/src/modelinfo/BaseModelInfo.h
@@ -63,9 +63,9 @@ public:
bool DoesOwnColModel(void) { return m_bOwnsColModel; }
void DeleteCollisionModel(void);
void ClearTexDictionary(void) { m_txdSlot = -1; }
- short GetObjectID(void) { return m_objectId; }
+ int16 GetObjectID(void) { return m_objectId; }
void SetObjectID(int16 id) { m_objectId = id; }
- short GetTxdSlot(void) { return m_txdSlot; }
+ int16 GetTxdSlot(void) { return m_txdSlot; }
void AddRef(void);
void RemoveRef(void);
void SetTexDictionary(const char *name);
diff --git a/src/modelinfo/SimpleModelInfo.h b/src/modelinfo/SimpleModelInfo.h
index ee63f24b..94e55a2f 100644
--- a/src/modelinfo/SimpleModelInfo.h
+++ b/src/modelinfo/SimpleModelInfo.h
@@ -11,6 +11,18 @@ public:
float m_lodDistances[3];
uint8 m_numAtomics;
uint8 m_alpha;
+ /* // For reference, PS2 has:
+ uint8 m_firstDamaged;
+ uint8 m_normalCull : 1;
+ uint8 m_isDamaged : 1;
+ uint8 m_isBigBuilding : 1;
+ uint8 m_noFade : 1;
+ uint8 m_drawLast : 1;
+ uint8 m_additive : 1;
+ uint8 m_isSubway : 1;
+ uint8 m_ignoreLight : 1;
+ // m_noZwrite is missing because not needed
+ */
uint16 m_firstDamaged : 2; // 0: no damage model
// 1: 1 and 2 are damage models
// 2: 2 is damage model