sigonasr2/Faceball2030
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add Editor instance.

Browse Source
This commit is contained in:
sigonasr2 2023-04-08 14:40:28 -05:00
parent 725853c0b2
commit b0d0f1e564
4 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Faceball2030/Editor.cpp
View File

@ -0,0 +1,11 @@
#include "pixelGameEngine.h"
#include "main.h"
#include "Editor.h"
using namespace olc;
extern FaceBall* game;
void Editor::Update(float fElapsedTime){
game->DrawStringDecal({ 0,0 }, "HEllo World!", WHITE, { 4,4 });
}

6
Faceball2030/Editor.h
View File

@ -5,7 +5,7 @@ using namespace olc;
class Editor { class Editor {
std::string filename; std::string filename;
vi2d MAP_SIZE; vi2d MAP_SIZE;
void Update(float fElapsedTime) { public:
Editor() {}
} void Update(float fElapsedTime);
}; };

24
Faceball2030/main.cpp
View File

@ -6,6 +6,7 @@
using namespace olc; using namespace olc;
FaceBall* game;
vec3d vec3d
FaceBall::Matrix_MultiplyVector(mat4x4& m, vec3d& i) FaceBall::Matrix_MultiplyVector(mat4x4& m, vec3d& i)
@ -697,16 +698,19 @@ bool FaceBall::OnUserCreate()
bool FaceBall::OnUserUpdate(float fElapsedTime) bool FaceBall::OnUserUpdate(float fElapsedTime)
{ {
switch (mode) { switch (mode) {
case GAME: { case GAME: {
for (Object& o : objects) { for (Object& o : objects) {
o.rot += PI / 8 * fElapsedTime; o.rot += PI / 8 * fElapsedTime;
} }
HandleKeys(fElapsedTime); HandleKeys(fElapsedTime);
RenderWorld(); RenderWorld();
}break; }break;
case EDITOR: { case EDITOR: {
editor.Update(fElapsedTime);
}break; }break;
}
if (GetKey(olc::F5).bPressed) {
mode = (GAMEMODE)!(mode&1);
} }
return true; return true;
} }

4
Faceball2030/main.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "pixelGameEngine.h" #include "pixelGameEngine.h"
#include "Editor.h"
using namespace olc; using namespace olc;
const float PI = 3.14159f; const float PI = 3.14159f;
@ -143,7 +144,7 @@ class FaceBall : public PixelGameEngine
std::vector<std::vector<MapSquare>>map; std::vector<std::vector<MapSquare>>map;
std::vector<Object>objects; std::vector<Object>objects;
GAMEMODE mode=GAMEMODE::GAME; GAMEMODE mode=GAMEMODE::GAME;
Editor editor;
mat4x4 matProj; mat4x4 matProj;
@ -182,4 +183,3 @@ class FaceBall : public PixelGameEngine
bool OnUserCreate() override; bool OnUserCreate() override;
bool OnUserUpdate(float fElapsedTime) override; bool OnUserUpdate(float fElapsedTime) override;
}; };
FaceBall* game;