TRECISION: Move some structure definitions in order to remove the dependency on trecision.h in actor.h

This commit is contained in:
Strangerke 2021-05-16 22:40:00 +01:00 committed by SupSuper
parent 5aea33679f
commit f9099ab2e2
3 changed files with 43 additions and 41 deletions

View File

@ -23,10 +23,12 @@
#ifndef TRECISION_ACTOR_H
#define TRECISION_ACTOR_H
#include "trecision/defines.h"
#include "trecision/trecision.h"
#include "trecision/struct.h"
#include "common/scummsys.h"
#include "common/serializer.h"
namespace Trecision {
class TrecisionEngine;
class Actor {
private:

View File

@ -211,5 +211,44 @@ private:
uint8 predEvent(uint8 i);
};
struct STexture {
int16 _dx, _dy, _angle;
uint8 *_texture;
uint8 _flag;
};
struct SVertex {
float _x, _y, _z;
float _nx, _ny, _nz;
void clear() {
_x = _y = _z = 0.0f;
_nx = _ny = _nz = 0.0f;
}
};
struct SFace {
uint16 _a, _b, _c;
uint16 _mat;
};
struct SLight {
float _x, _y, _z;
float _dx, _dy, _dz;
float _inr, _outr;
uint8 _hotspot;
uint8 _fallOff;
int8 _inten;
int8 _position;
};
struct SCamera {
float _ex, _ey, _ez;
float _e1[3];
float _e2[3];
float _e3[3];
float _fovX, _fovY;
};
} // End of namespace Trecision
#endif

View File

@ -72,45 +72,6 @@ enum TrecisionMessageIds {
typedef Common::List<Common::Rect>::iterator DirtyRectsIterator;
struct SVertex {
float _x, _y, _z;
float _nx, _ny, _nz;
void clear() {
_x = _y = _z = 0.0f;
_nx = _ny = _nz = 0.0f;
}
};
struct SFace {
uint16 _a, _b, _c;
uint16 _mat;
};
struct SLight {
float _x, _y, _z;
float _dx, _dy, _dz;
float _inr, _outr;
uint8 _hotspot;
uint8 _fallOff;
int8 _inten;
int8 _position;
};
struct SCamera {
float _ex, _ey, _ez;
float _e1[3];
float _e2[3];
float _e3[3];
float _fovX, _fovY;
};
struct STexture {
int16 _dx, _dy, _angle;
uint8 *_texture;
uint8 _flag;
};
class TrecisionEngine : public Engine {
void initMain();
void initMessageSystem();