Update J3ML

This commit is contained in:
2024-03-26 11:25:08 -04:00
parent bba5b5242a
commit a5f3510a45
6 changed files with 10 additions and 10 deletions

View File

@@ -59,7 +59,7 @@ CPMAddPackage(
CPMAddPackage(
NAME J3ML
URL https://git.redacted.cc/josh/j3ml/archive/Prerelease-20.zip
URL https://git.redacted.cc/josh/j3ml/archive/Prerelease-21.zip
)
#Broken
#CPMAddPackage(

View File

@@ -1,7 +1,7 @@
#pragma once
#include <types/vertex.h>
#include <J3ML/Geometry/Triangle.h>
#include <J3ML/Geometry.h>
enum class ColliderType : uint8_t {
AxisAlignedBoundingBox = 0,

View File

@@ -5,7 +5,7 @@
#include <cstdint>
#include <types/entity/moby.h>
class Sphere : public Moby {
class Sphere2 : public Moby {
public:
bool alive;
uint8_t health;
@@ -20,5 +20,5 @@ public:
Collider getCollider() override;
void update(float elapsed) override;
void pre_render() override;
Sphere();
Sphere2();
};

View File

@@ -15,7 +15,7 @@ int main(int argc, char** argv)
cube1->velAngle = cube1->lAngle();
cube1->SetParent(engine->world);
auto* cube2 = new(Sphere);
auto* cube2 = new(Sphere2);
cube2->name = "sphere";
cube2->SetPos({5, -2, 0});
cube2->velAngle = cube2->rAngle();

View File

@@ -8,7 +8,7 @@ void Cube::pre_render() {
Moby* moby;
for (auto& e : engine->world->GetChildren())
if (auto* m = dynamic_cast<Sphere*>(e))
if (auto* m = dynamic_cast<Sphere2*>(e))
if (m->name == "sphere")
moby = m;
if (moby == this)

View File

@@ -1,17 +1,17 @@
#include <sphere.h>
#include <engine/collision.h>
void Sphere::pre_render() {
void Sphere2::pre_render() {
hVelocity = 1;
hMove(velAngle, hVelocity);
vMove(vVelocity);
}
void Sphere::update(float elapsed) {
void Sphere2::update(float elapsed) {
}
Sphere::Sphere() {
Sphere2::Sphere2() {
name = "sphere";
modelPath = "assets/models/sphere_lo.obj";
texturePath = "assets/textures/missing.png";
@@ -20,7 +20,7 @@ Sphere::Sphere() {
vVelocity = 0;
}
Collider Sphere::getCollider() {
Collider Sphere2::getCollider() {
Collider collider;
//collider.angle = angle;
collider.vertices = getGeometry()->vertices;