Initial Windows Support

This commit is contained in:
2024-06-30 20:48:54 -04:00
parent 7c0b91d8cc
commit d9928dde76
11 changed files with 46 additions and 36 deletions

View File

@@ -2,5 +2,6 @@
#include <Redacted3D/types/entity/camera.h>
namespace Occlusion {
bool frustumCull(Camera* camera, Entity* entity);
//TODO
bool frustumCull(Camera* camera, Entity* entity) { return false; }
}

View File

@@ -5,7 +5,7 @@
#include <J3ML/LinearAlgebra/Matrix4x4.h>
#include <J3ML/LinearAlgebra/Vector3.h>
#include <Redacted3D/engine/collision.h>
#include <archive.h>
//#include <archive.h>
using J3ML::LinearAlgebra::Matrix4x4;
using J3ML::LinearAlgebra::Vector3;
@@ -35,7 +35,7 @@ public:
bool alive;
virtual std::vector<std::string> GetEntityUUIDList() const {}
virtual std::vector<std::string> GetEntityUUIDList() const { return std::vector<std::string> { "" }; }
template <class T>
void SerializeMemberData(T& archive)

View File

@@ -1,9 +1,8 @@
#pragma once
#include <vector>
#include <iostream>
#include <fstream>
#include <Collage/types/animation.h>
#include <Collage/types/model.h>
#include <J3ML/LinearAlgebra/Vector3.h>
#include <J3ML/LinearAlgebra/Vector2.h>
#include <J3ML/Geometry/OBB.h>
@@ -12,6 +11,7 @@
///Forward declaration of entity.
class Entity;
typedef Vector2 TextureCoordinate;
using J3ML::LinearAlgebra::Vector3;
using J3ML::LinearAlgebra::Vector2;
using J3ML::Geometry::OBB;
@@ -19,7 +19,6 @@ using J3ML::Geometry::OBB;
///A point which makes up a model in 3D space.
typedef Vector3 Vertex;
///Determines how your texture is wrapped around the model.
typedef Vector2 TextureCoordinate;
///Drawable type. Models are stored in these.
class VertexArray {