From 18ba08dc7a755c7e21d330020864598c798c9ec9 Mon Sep 17 00:00:00 2001 From: Wellinator Date: Fri, 9 Apr 2021 13:36:40 -0300 Subject: [PATCH] Remove light_manager --- src/samples/cube/Makefile | 1 - src/samples/cube/cubes.cpp | 1 - src/samples/cube/cubes.hpp | 2 - src/samples/cube/managers/light_manager.cpp | 148 -------------------- src/samples/cube/managers/light_manager.hpp | 38 ----- 5 files changed, 190 deletions(-) delete mode 100644 src/samples/cube/managers/light_manager.cpp delete mode 100644 src/samples/cube/managers/light_manager.hpp diff --git a/src/samples/cube/Makefile b/src/samples/cube/Makefile index 09c7d18..09720cc 100644 --- a/src/samples/cube/Makefile +++ b/src/samples/cube/Makefile @@ -3,7 +3,6 @@ EE_BIN = cube.elf TYRA_DIR = ./../../engine EE_OBJS = \ - managers/light_manager.o \ objects/cube.o \ camera.o \ cubes.o \ diff --git a/src/samples/cube/cubes.cpp b/src/samples/cube/cubes.cpp index 808e942..6032ac2 100644 --- a/src/samples/cube/cubes.cpp +++ b/src/samples/cube/cubes.cpp @@ -19,7 +19,6 @@ void Cubes::onInit(){ } void Cubes::onUpdate(){ - lightManager.update(); camera.update(engine->pad, cube->mesh); cube->update(engine->pad, camera); engine->renderer->draw(cube->mesh); diff --git a/src/samples/cube/cubes.hpp b/src/samples/cube/cubes.hpp index 0a14eb6..3188df1 100644 --- a/src/samples/cube/cubes.hpp +++ b/src/samples/cube/cubes.hpp @@ -4,7 +4,6 @@ #include #include #include -#include "managers/light_manager.hpp" #include "modules/texture_repository.hpp" #include "camera.hpp" #include "objects/cube.hpp" @@ -25,7 +24,6 @@ class Cubes : public Game void setBgColorAndAmbientColor(); TextureRepository *texRepo; Cube *cube; - LightManager lightManager; Camera camera; }; diff --git a/src/samples/cube/managers/light_manager.cpp b/src/samples/cube/managers/light_manager.cpp deleted file mode 100644 index a87f322..0000000 --- a/src/samples/cube/managers/light_manager.cpp +++ /dev/null @@ -1,148 +0,0 @@ -/* -# ______ ____ ___ -# | \/ ____| |___| -# | | | \ | | -#----------------------------------------------------------------------- -# Copyright 2020, tyra - https://github.com/h4570/tyra -# Licenced under Apache License 2.0 -# Sandro Sobczyński -*/ - -#include "light_manager.hpp" -#include - -// ---- -// Constructors/Destructors -// ---- - -LightManager::LightManager() -{ - PRINT_LOG("Creating light manager!"); - bulbsCount = 2; - - bulbs = new LightBulb[2]; - bulb1Dir = 0; - bulbs[0].intensity = 1; - bulbs[0].position.set(30.00F, 30.00F, -30.00F); - - bulb2Dir = 1; - bulbs[1].intensity = 1; - bulbs[1].position.set(-30.00F, 30.00F, 30.00F); - - audioOffset = audioTick = 0; - - PRINT_LOG("Light manager created!"); -} - -LightManager::~LightManager() -{ - delete[] bulbs; -} - -// ---- -// Methods -// ---- - -/** Light bulb moving test */ -void LightManager::update() -{ - updateBulb1(); - updateBulb2(); -} - -void LightManager::updateBulb1() -{ - if (bulb1Dir == 1) - { - if (areLightsInverted) - { - bulbs[0].position.x += 0.6F; - bulbs[0].position.z -= 0.6F; - } - else - { - bulbs[0].position.x += 0.6F; - bulbs[0].position.z += 0.6F; - } - } - else - { - if (areLightsInverted) - { - bulbs[0].position.x -= 0.6F; - bulbs[0].position.z += 0.6F; - } - else - { - bulbs[0].position.x -= 0.6F; - bulbs[0].position.z -= 0.6F; - } - } -} - -void LightManager::updateBulb2() -{ - if (bulb2Dir == 1) - { - if (areLightsInverted) - { - bulbs[1].position.x -= 0.6F; - bulbs[1].position.z += 0.6F; - } - else - { - bulbs[1].position.x += 0.6F; - bulbs[1].position.z += 0.6F; - } - } - else - { - if (areLightsInverted) - { - bulbs[1].position.x += 0.6F; - bulbs[1].position.z -= 0.6F; - } - else - { - bulbs[1].position.x -= 0.6F; - bulbs[1].position.z -= 0.6F; - } - } -} - -/** Called by audio thread */ -void LightManager::onAudioTick() -{ - bulb1Dir = bulb1Dir == 1 ? 0 : 1; - bulb2Dir = bulb2Dir == 1 ? 0 : 1; - if (audioTick++ > 17) - { - if (++audioOffset > 3) - { - audioOffset = 0; - if (areLightsInverted) - { - areLightsInverted = false; - bulbs[0].position.x = 20.0F; - bulbs[0].position.z = -20.0F; - - bulbs[1].position.x = -20.0F; - bulbs[1].position.z = 20.0F; - } - else - { - areLightsInverted = true; - bulbs[0].position.x = 20.0F; - bulbs[0].position.z = 20.0F; - - bulbs[1].position.x = -20.0F; - bulbs[1].position.z = -20.0F; - } - } - } - else - { - bulbs[0].intensity += 9; - bulbs[1].intensity += 9; - } -} diff --git a/src/samples/cube/managers/light_manager.hpp b/src/samples/cube/managers/light_manager.hpp deleted file mode 100644 index dbc3bf8..0000000 --- a/src/samples/cube/managers/light_manager.hpp +++ /dev/null @@ -1,38 +0,0 @@ -/* -# ______ ____ ___ -# | \/ ____| |___| -# | | | \ | | -#----------------------------------------------------------------------- -# Copyright 2020, tyra - https://github.com/h4570/tyra -# Licenced under Apache License 2.0 -# Sandro Sobczyński -*/ - -#ifndef _LIGHT_MANAGER_ -#define _LIGHT_MANAGER_ - -#include -#include - -/** Class which is maintaining floors objects */ -class LightManager -{ - -public: - LightManager(); - ~LightManager(); - - LightBulb *bulbs; - u8 bulbsCount; - void update(); - void onAudioTick(); - -private: - u8 bulb1Dir, bulb2Dir; - void updateBulb1(); - void updateBulb2(); - u8 audioOffset, areLightsInverted; - u32 audioTick; -}; - -#endif