merge conflict
This commit is contained in:
@@ -5,10 +5,21 @@
|
||||
#include "shader.h"
|
||||
#include "../SQCSim-common/vector3.h"
|
||||
#include "../SQCSim-common/transformation.h"
|
||||
#include "../SQCSim-common/player.h"
|
||||
|
||||
|
||||
class Booster {
|
||||
public:
|
||||
void RenderBillboard(const Vector3f pos, TextureAtlas& textureAtlas, Shader& shader, Transformation tran);
|
||||
Booster(Vector3f tpos, BOOST_TYPE ttype);
|
||||
~Booster();
|
||||
void RenderBillboard(TextureAtlas& textureAtlas, Shader& shader, Transformation tran, Player player);
|
||||
Vector3f GetPosition();
|
||||
BOOST_TYPE GetType();
|
||||
bool GetAvailability();
|
||||
void SetAvailability(bool value);
|
||||
private:
|
||||
Vector3f pos;
|
||||
BOOST_TYPE type;
|
||||
bool available;
|
||||
};
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user