Aurailus
/
Zepha
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed error caused by Refactor

master
aurailus 2018-12-28 18:56:54 -08:00
parent b0ee113811
commit 9922d498e0
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zeus/Main.cpp
View File

@ -8,7 +8,7 @@
#include "engine/Camera.h"
#include "engine/Timer.h"
#include "world/GameInstance.h"
#include "game/GameInstance.h"
#include "engine/graphics/Renderer.h"
GLfloat deltaTime = 0.0f;

2
zeus/engine/graphics/Renderer.cpp
View File

@ -11,7 +11,7 @@ Renderer::Renderer(GLint winWidth, GLint winHeight) {
camera = new Camera(glm::vec3(0.0f, 16.0f, 0.0f), glm::vec3(0, 1, 0), -90.0f, -45.0f, 10.0f, 0.1f);
worldShader = new Shader();
worldShader->createFromFile("../zeus/shader/game.vs", "../zeus/shader/game.fs");
worldShader->createFromFile("../zeus/shader/world.vs", "../zeus/shader/world.fs");
uProj = worldShader->getUniformLocation("projection");
uModel = worldShader->getUniformLocation("model");

2
zeus/game/gui/DebugGui.cpp
View File

@ -42,7 +42,7 @@ void DebugGui::fpsHistUpdate() {
unsigned int indOffset = 0;
float xOffset = 0;
float width = 4;
float width = 6;
float height = 0.5;
float i = 0.10;

2
zeus/lua_api/LRegisterBlock.h
View File

@ -5,7 +5,7 @@
#ifndef ZEUS_LREGISTERBLOCK_H
#define ZEUS_LREGISTERBLOCK_H
#include "../world/GameInstance.h"
#include "../game/GameInstance.h"
class LRegisterBlock {
public: