Merge branch 'main' into testing

This commit is contained in:
2024-07-05 22:48:35 -04:00
9 changed files with 86 additions and 62 deletions

View File

@@ -53,6 +53,7 @@ public:
void initGL() const;
void loadConfig();
static void init();
void jglRenderPass();
void preRender();
void render();
static void postRender();

View File

@@ -110,7 +110,6 @@ public:
Vector3 getAngle();
void setAngle(const Vector3& a);
void setAngle(float pitch, float yaw, float roll);
///Removes an entity from the list, Checks if the assets are being used by any other entity. Removes them from their lists & deletes. Then deletes the entity.
void erase();
bool draw = true;
@@ -118,6 +117,7 @@ public:
bool isCollidingWith(Entity* entity);
virtual void pre_render() {}
virtual void post_render() {}
virtual void jglRenderPass() {}
///The default rendering routine. Works for 99% of cases.
virtual void render();
virtual void update(float elapsed) {}