Zeronaut/KaijuSaveEarth
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Zeronaut:emscripten
Branches Tags
Zeronaut:main
Zeronaut:macos
Zeronaut:emscripten
..
compare: Zeronaut:main
Branches Tags
Zeronaut:macos
Zeronaut:emscripten
Zeronaut:main

No commits in common. "emscripten" and "main" have entirely different histories.
emscripten ... main

4 changed files with 45 additions and 113 deletions
Show Stats Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -4,7 +4,6 @@ project(KaijuSaveEarth VERSION 1.0.0 )
#set(CMAKE_CXX_STANDARD 11) # old requirements
set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to be used") # new requirements for tileson
set(CMAKE_CXX_REQUIRED ON)
#set(CMAKE_CXX_COMPILER "/home/ayoungblood/Git/emsdk/upstream/emscripten/emcc")
include(FetchContent)
include(FindPkgConfig)

1
build_emscripten.sh
View File

@ -1 +0,0 @@
emcc src/game/Main.cpp src/game/Game.cpp src/assetmgr/AssetManager.cpp src/assetmgr/GameObject.cpp src/assetmgr/Map.cpp src/assetmgr/MusicManager.cpp src/assetmgr/TextureManager.cpp src/cjson/cJSON.c src/ecs/ECS.cpp src/game/Collision.cpp src/game/GameStateManager.cpp src/game/StateMachine.cpp src/game/Vector2D.cpp src/ui/UINineSlice.cpp src/ui/UIText.cpp -s WASM=1 -s USE_SDL=2 -s USE_SDL_IMAGE=2 -s SDL2_IMAGE_FORMATS='["png"]' -s USE_SDL_MIXER=2 -o build/index.js

2
src/game/Game.cpp
View File

@ -116,7 +116,7 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g
flags = SDL_WINDOW_FULLSCREEN;
}
if(SDL_Init(SDL_INIT_EVERYTHING & ~(SDL_INIT_TIMER | SDL_INIT_HAPTIC)) == 0)
if(SDL_Init(SDL_INIT_EVERYTHING) == 0)
{
window = SDL_CreateWindow(title, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, width, height, flags);
SDL_SetWindowBordered(window,SDL_FALSE);

154
src/game/Main.cpp
View File

@ -11,141 +11,75 @@
#include <iostream>
#include <fstream>
#include <sstream>
#include <emscripten.h>
Game *game = nullptr;
struct context{
int main(int argc, const char * argv[])
{
const int FPS = 60;
const int frameDelay = 1000 / FPS;
Uint64 frameStart;
int frameTime;
// std::string configPath = "src/config/config.json";
// std::ifstream fin(configPath);
// if(!fin.is_open()){
// std::cout << "Failed to load Config.json" << std::endl;
// } else {
// std::ifstream jsonText("src/config/config.json");
// std::ostringstream tmp;
// tmp << jsonText.rdbuf();
// std::string json = tmp.str();
// cJSON * myJSON = cJSON_Parse(json.c_str());
// cJSON * windowName = cJSON_GetObjectItemCaseSensitive(myJSON, "WindowName");
// cJSON * windowSize = cJSON_GetObjectItem(myJSON, "WindowSize");
// int windowWidth = cJSON_GetObjectItem(windowSize, "w")->valueint;
// int windowHeight = cJSON_GetObjectItem(windowSize, "h")->valueint;
// int windowFS = cJSON_GetObjectItem(myJSON, "WindowFullScreen")->valueint;
// int globalScale = cJSON_GetObjectItem(myJSON, "GlobalScale")->valueint;
int windowWidth = 64;
int windowHeight = 64;
bool isWindowFS = false;
int globalScale = 10;
std::string windowName = "Kaiju Saves Earth";
// bool isWindowFS;
// if (windowFS==0)
// {
// isWindowFS = false;
// } else
// {
// isWindowFS = true;
// }
// }
};
void mainloop(void *arg) {
context *ctx = static_cast<context*>(arg);
while (game->running())
// =============================
// Load cJSON config.json file
// =============================
// Starting with Error Checking
std::string configPath = "src/config/config.json";
std::ifstream fin(configPath);
if(fin.is_open()){
std::ifstream jsonText("src/config/config.json");
std::ostringstream tmp;
tmp << jsonText.rdbuf();
std::string json = tmp.str();
cJSON * myJSON = cJSON_Parse(json.c_str());
cJSON * windowName = cJSON_GetObjectItemCaseSensitive(myJSON, "WindowName");
cJSON * windowSize = cJSON_GetObjectItem(myJSON, "WindowSize");
int windowWidth = cJSON_GetObjectItem(windowSize, "w")->valueint;
int windowHeight = cJSON_GetObjectItem(windowSize, "h")->valueint;
int windowFS = cJSON_GetObjectItem(myJSON, "WindowFullScreen")->valueint;
int globalScale = cJSON_GetObjectItem(myJSON, "GlobalScale")->valueint;
bool isWindowFS;
if (windowFS==0)
{
ctx->frameStart = SDL_GetTicks64();
game->handleEvents();
game->update();
game->render();
ctx->frameTime = SDL_GetTicks64() - ctx->frameStart;
if(ctx->frameDelay > ctx->frameTime)
{
SDL_Delay(ctx->frameDelay - ctx->frameTime);
}
isWindowFS = false;
} else
{
isWindowFS = true;
}
std::cout << "Maybe this will at least work?" << std::endl;
}
// int main(int argc, const char * argv[])
// {
// context ctx;
// // if(ctx.fin.is_open()){
//
// game = new Game();
// ctx.windowWidth = ctx.windowWidth*ctx.globalScale;
// ctx.windowHeight = ctx.windowHeight*ctx.globalScale;
// game->init(ctx.windowName.c_str(), ctx.windowWidth, ctx.windowHeight, ctx.isWindowFS, ctx.globalScale);
// // cJSON memory management
// // cJSON_Delete(ctx.myJSON);
//
// // init(&ctx);
// emscripten_set_main_loop_arg(mainloop, &ctx, -1, 1);
//
// while (game->running())
// {
// ctx.frameStart = SDL_GetTicks64();
//
// game->handleEvents();
// game->update();
// game->render();
//
// ctx.frameTime = SDL_GetTicks64() - ctx.frameStart;
//
// if(ctx.frameDelay > ctx.frameTime)
// {
// SDL_Delay(ctx.frameDelay - ctx.frameTime);
// }
//
// }
// game->clean();
// // } else {
// // std::cout<<"config.json not found or opened"<<std::endl;
// // }
//
// // if(ctx.fin.fail()){
// // std::cout<<"config.json load failed"<<std::endl;
// // }
//
// return 0;
// }
int main()
{
context ctx;
windowWidth = windowWidth*globalScale;
windowHeight = windowHeight*globalScale;
game = new Game();
ctx.windowWidth = ctx.windowWidth*ctx.globalScale;
ctx.windowHeight = ctx.windowHeight*ctx.globalScale;
game->init(ctx.windowName.c_str(), ctx.windowWidth, ctx.windowHeight, ctx.isWindowFS, ctx.globalScale);
emscripten_set_main_loop_arg(mainloop, &ctx, -1, 1);
game->init(windowName->valuestring, windowWidth, windowHeight, isWindowFS, globalScale);
// cJSON memory management
cJSON_Delete(myJSON);
while (game->running())
{
ctx.frameStart = SDL_GetTicks64();
frameStart = SDL_GetTicks64();
game->handleEvents();
game->update();
game->render();
ctx.frameTime = SDL_GetTicks64() - ctx.frameStart;
frameTime = SDL_GetTicks64() - frameStart;
if(ctx.frameDelay > ctx.frameTime)
if(frameDelay > frameTime)
{
SDL_Delay(ctx.frameDelay - ctx.frameTime);
SDL_Delay(frameDelay - frameTime);
}
}
game->clean();
} else {
std::cout<<"config.json not found or opened"<<std::endl;
}
if(fin.fail()){
std::cout<<"config.json load failed"<<std::endl;
}
return 0;
}