11/*
22 wrench - A set of modding tools for the Ratchet & Clank PS2 games.
3- Copyright (C) 2019-2021 chaoticgd
3+ Copyright (C) 2019-2025 chaoticgd
44
55 This program is free software: you can redistribute it and/or modify
66 it under the terms of the GNU General Public License as published by
1616 along with this program. If not, see <https://www.gnu.org/licenses/>.
1717*/
1818
19- #ifndef WAD_BASIC_TYPES_H
20- #define WAD_BASIC_TYPES_H
19+ #ifndef ENGINE_BASIC_TYPES_H
20+ #define ENGINE_BASIC_TYPES_H
2121
2222#include <glm/glm.hpp>
2323
@@ -28,14 +28,6 @@ packed_struct(Vec3f,
2828 f32 y ;
2929 f32 z ;
3030
31- template <typename T>
32- void enumerate_fields (T& t)
33- {
34- DEF_PACKED_FIELD (x);
35- DEF_PACKED_FIELD (y);
36- DEF_PACKED_FIELD (z);
37- }
38-
3931 glm ::vec3 unpack () const
4032 {
4133 return glm ::vec3 (x , y , z );
@@ -57,15 +49,6 @@ packed_struct(Vec4f,
5749 f32 z ;
5850 f32 w ;
5951
60- template <typename T>
61- void enumerate_fields (T& t)
62- {
63- DEF_PACKED_FIELD (x);
64- DEF_PACKED_FIELD (y);
65- DEF_PACKED_FIELD (z);
66- DEF_PACKED_FIELD (w);
67- }
68-
6952 glm ::vec4 unpack () const
7053 {
7154 return glm ::vec4 (x , y , z , w );
@@ -95,24 +78,6 @@ packed_struct(Mat3,
9578 Vec4f m_1 ;
9679 Vec4f m_2 ;
9780
98- template <typename T>
99- void enumerate_fields (T& t)
100- {
101- Vec4f temp;
102-
103- temp = m_0;
104- t.field (" 0" , temp);
105- m_0 = temp;
106-
107- temp = m_1;
108- t.field (" 1" , temp);
109- m_1 = temp;
110-
111- temp = m_2;
112- t.field (" 2" , temp);
113- m_2 = temp;
114- }
115-
11681 glm ::mat3x4 unpack () const
11782 {
11883 glm ::mat3x4 result ;
@@ -138,28 +103,6 @@ packed_struct(Mat4,
138103 Vec4f m_2 ;
139104 Vec4f m_3 ;
140105
141- template <typename T>
142- void enumerate_fields (T& t)
143- {
144- Vec4f temp;
145-
146- temp = m_0;
147- t.field (" 0" , temp);
148- m_0 = temp;
149-
150- temp = m_1;
151- t.field (" 1" , temp);
152- m_1 = temp;
153-
154- temp = m_2;
155- t.field (" 2" , temp);
156- m_2 = temp;
157-
158- temp = m_3;
159- t.field (" 3" , temp);
160- m_3 = temp;
161- }
162-
163106 glm ::mat4 unpack () const
164107 {
165108 glm ::mat4 result ;
0 commit comments