Changed some Includes
This commit is contained in:
OusmBlueNinja
parent
5262d3541f
commit
18791713ab
10
imgui.ini
10
imgui.ini
@ -21,8 +21,8 @@ Collapsed=0
|
||||
DockId=0x00000003,0
|
||||
|
||||
[Window][Performance]
|
||||
Pos=8,777
|
||||
Size=364,392
|
||||
Pos=8,774
|
||||
Size=364,395
|
||||
Collapsed=0
|
||||
DockId=0x00000006,0
|
||||
|
||||
@ -40,7 +40,7 @@ DockId=0x00000007,0
|
||||
|
||||
[Window][Scene Window]
|
||||
Pos=8,27
|
||||
Size=364,748
|
||||
Size=364,745
|
||||
Collapsed=0
|
||||
DockId=0x00000005,0
|
||||
|
||||
@ -53,8 +53,8 @@ DockId=0x00000003,0
|
||||
[Docking][Data]
|
||||
DockSpace ID=0x14621557 Window=0x3DA2F1DE Pos=8,27 Size=1904,1142 Split=X Selected=0xF7365A5A
|
||||
DockNode ID=0x00000009 Parent=0x14621557 SizeRef=364,1142 Split=Y Selected=0x3DC5AC3F
|
||||
DockNode ID=0x00000005 Parent=0x00000009 SizeRef=364,748 HiddenTabBar=1 Selected=0x3DC5AC3F
|
||||
DockNode ID=0x00000006 Parent=0x00000009 SizeRef=364,392 HiddenTabBar=1 Selected=0x726D8899
|
||||
DockNode ID=0x00000005 Parent=0x00000009 SizeRef=364,745 HiddenTabBar=1 Selected=0x3DC5AC3F
|
||||
DockNode ID=0x00000006 Parent=0x00000009 SizeRef=364,395 HiddenTabBar=1 Selected=0x726D8899
|
||||
DockNode ID=0x0000000A Parent=0x14621557 SizeRef=1538,1142 Split=X
|
||||
DockNode ID=0x00000007 Parent=0x0000000A SizeRef=357,1142 Selected=0x7737E8B2
|
||||
DockNode ID=0x00000008 Parent=0x0000000A SizeRef=1545,1142 Split=X
|
||||
|
||||
@ -2,113 +2,113 @@ Entities:
|
||||
- ID: 0
|
||||
Name: Car
|
||||
Components:
|
||||
Transform:
|
||||
Position: [0, 2.79999995, -12.6000004]
|
||||
Rotation: [149.699997, -137.899994, -39.2999992]
|
||||
Scale: [1, 1, 1]
|
||||
Mesh:
|
||||
vao: 2
|
||||
indexCount: 15810
|
||||
textureID: 1
|
||||
MeshPath: assets/models/LowPolyFiatUNO.obj
|
||||
Transform:
|
||||
Position: [0, 2.79999995, -12.6000004]
|
||||
Rotation: [149.699997, -137.899994, -39.2999992]
|
||||
Scale: [1, 1, 1]
|
||||
- ID: 2
|
||||
Name: Cube Yay 2
|
||||
Name: Null Texture Box
|
||||
Components:
|
||||
Transform:
|
||||
Position: [7.80000019, -8.10000038, -20.6000004]
|
||||
Rotation: [-86.3000031, 0, -66]
|
||||
Scale: [1, 1, 1]
|
||||
Mesh:
|
||||
vao: 5
|
||||
indexCount: 36
|
||||
textureID: 3
|
||||
MeshPath: assets/models/DefaultMesh.obj
|
||||
Transform:
|
||||
Position: [7.80000019, -8.10000038, -20.6000004]
|
||||
Rotation: [-86.3000031, 0, -66]
|
||||
Scale: [1, 1, 1]
|
||||
- ID: 3
|
||||
Name: Cube Yay 3
|
||||
Name: Grass Box Top
|
||||
Components:
|
||||
Transform:
|
||||
Position: [-1.20000005, -3.4000001, -17.7000008]
|
||||
Rotation: [-23.5, 15.8999996, -59.9000015]
|
||||
Scale: [1, 1, 1]
|
||||
Mesh:
|
||||
vao: 5
|
||||
indexCount: 36
|
||||
textureID: 4
|
||||
MeshPath: assets/models/DefaultMesh.obj
|
||||
Transform:
|
||||
Position: [-1.20000005, -3.4000001, -17.7000008]
|
||||
Rotation: [-23.5, 15.8999996, -59.9000015]
|
||||
Scale: [1, 1, 1]
|
||||
- ID: 4
|
||||
Name: Cube Yay 4
|
||||
Name: Bark Box
|
||||
Components:
|
||||
Transform:
|
||||
Position: [8.10000038, 0.800000012, -12]
|
||||
Rotation: [-17.2999992, -16.1000004, -19.2999992]
|
||||
Scale: [1, 1, 1]
|
||||
Mesh:
|
||||
vao: 5
|
||||
indexCount: 36
|
||||
textureID: 5
|
||||
MeshPath: assets/models/DefaultMesh.obj
|
||||
Transform:
|
||||
Position: [8.10000038, 0.800000012, -12]
|
||||
Rotation: [-17.2999992, -16.1000004, -19.2999992]
|
||||
Scale: [1, 1, 1]
|
||||
- ID: 5
|
||||
Name: Sky
|
||||
Name: Skybox
|
||||
Components:
|
||||
Transform:
|
||||
Position: [0, 0, 43.2000008]
|
||||
Rotation: [0, 0, 0]
|
||||
Scale: [100, 100, 100]
|
||||
Mesh:
|
||||
vao: 5
|
||||
indexCount: 36
|
||||
textureID: 6
|
||||
MeshPath: assets/models/DefaultMesh.obj
|
||||
Transform:
|
||||
Position: [0, 0, 43.2000008]
|
||||
Rotation: [0, 0, 0]
|
||||
Scale: [100, 100, 100]
|
||||
- ID: 6
|
||||
Name: Cube Yay 6
|
||||
Name: Null Texture Box
|
||||
Components:
|
||||
Transform:
|
||||
Position: [-6.5, -6, -18]
|
||||
Rotation: [15.8000002, -18.2000008, -11.1000004]
|
||||
Scale: [1, 1, 1]
|
||||
Mesh:
|
||||
vao: 5
|
||||
indexCount: 36
|
||||
textureID: 3
|
||||
MeshPath: assets/models/DefaultMesh.obj
|
||||
Transform:
|
||||
Position: [-6.5, -6, -18]
|
||||
Rotation: [15.8000002, -18.2000008, -11.1000004]
|
||||
Scale: [1, 1, 1]
|
||||
- ID: 7
|
||||
Name: Cube Yay 7
|
||||
Name: Grass Box Bottom
|
||||
Components:
|
||||
Transform:
|
||||
Position: [6.5999999, 1.79999995, -23.8999996]
|
||||
Rotation: [-16.1000004, -15.8999996, -35]
|
||||
Scale: [1, 1, 1]
|
||||
Mesh:
|
||||
vao: 5
|
||||
indexCount: 36
|
||||
textureID: 4
|
||||
MeshPath: assets/models/DefaultMesh.obj
|
||||
Transform:
|
||||
Position: [6.5, 1.79999995, -23.8999996]
|
||||
Rotation: [-16.1000004, -15.8999996, -35]
|
||||
Scale: [1, 1, 1]
|
||||
- ID: 8
|
||||
Name: Cube Yay 8
|
||||
Name: Wood Box
|
||||
Components:
|
||||
Transform:
|
||||
Position: [-7.80000019, 0.200000003, -29.7999992]
|
||||
Rotation: [22.2999992, -32.7999992, 0]
|
||||
Scale: [1, 1, 1]
|
||||
Mesh:
|
||||
vao: 5
|
||||
indexCount: 36
|
||||
textureID: 1
|
||||
MeshPath: assets/models/DefaultMesh.obj
|
||||
Transform:
|
||||
Position: [-7.80000019, 0.200000003, -29.7999992]
|
||||
Rotation: [22.2999992, -32.7999992, 0]
|
||||
Scale: [1, 1, 1]
|
||||
- ID: 9
|
||||
Name: Cube Yay 9
|
||||
Name: Bricks
|
||||
Components:
|
||||
Transform:
|
||||
Position: [5.5, -2.9000001, -19.5]
|
||||
Rotation: [-41.4000015, -22.6000004, -52.2999992]
|
||||
Scale: [1, 1, 1]
|
||||
Mesh:
|
||||
vao: 5
|
||||
indexCount: 36
|
||||
textureID: 2
|
||||
MeshPath: assets/models/DefaultMesh.obj
|
||||
Transform:
|
||||
Position: [5.5, -2.9000001, -19.5]
|
||||
Rotation: [-41.4000015, -22.6000004, -52.2999992]
|
||||
Scale: [1, 1, 1]
|
||||
- ID: 10
|
||||
Name: Script
|
||||
Name: Script Handler
|
||||
Components:
|
||||
ScriptComponent:
|
||||
ScriptPath: assets/scripts/script.lua
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
// Settings
|
||||
|
||||
#define VSync 1
|
||||
#define VSync 0
|
||||
|
||||
#include "Engine.h"
|
||||
#include <cstdio>
|
||||
|
||||
10
src/Engine.h
10
src/Engine.h
@ -6,7 +6,6 @@
|
||||
#include "Windows/RenderWindow.h"
|
||||
#include "Windows/PerformanceWindow.h"
|
||||
#include "Windows/LoggerWindow.h"
|
||||
#include "Engine/AssetManager.h"
|
||||
#include "Windows/InspectorWindow.h"
|
||||
#include "Windows/SceneWindow.h"
|
||||
|
||||
@ -14,9 +13,16 @@
|
||||
#include "Componenets/Mesh.h"
|
||||
#include "Componenets/Transform.h"
|
||||
|
||||
#include "TestModel.h"
|
||||
#include "Engine/AssetManager.h"
|
||||
#include "Engine/ThemeManager.h"
|
||||
#include "Engine/SceneManager.h"
|
||||
#include "Engine/LuaAPI.h"
|
||||
|
||||
|
||||
|
||||
#include "TestModel.h"
|
||||
|
||||
|
||||
#include "gcml.h"
|
||||
|
||||
// Forward declaration to avoid including GLFW in the header if you prefer
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
int main()
|
||||
{
|
||||
DEBUG_PRINT("[START] Creating Global Engine ");
|
||||
|
||||
// Small error where the constuctor would crash
|
||||
MyEngine engine;
|
||||
DEBUG_PRINT("[OK] Creating Global Engine ");
|
||||
|
||||
// Initialize the engine (creates GLFW window, sets up ImGui, etc.)
|
||||
|
||||
if (!engine.Init(1280, 720, "Tesseract Engine"))
|
||||
{
|
||||
fprintf(stderr, "Failed to initialize engine.\n");
|
||||
|
||||
Loading…
Reference in New Issue
Block a user