Working on refactoring
This commit is contained in:
1 parent
928600acd4
commit
3c2c06ca40
8 files changed
+36
-36
No files matched your search
+1
-13
@@ -30,7 +30,7 @@
|
||||
|
||||
#include "network/LocalClient.h"
|
||||
#include "network/ClientState.h"
|
||||
|
||||
#include "GameConstants.h"
|
||||
|
||||
namespace ZL
|
||||
{
|
||||
@@ -217,12 +217,6 @@ namespace ZL
|
||||
|
||||
void Game::drawUI()
|
||||
{
|
||||
static const std::string defaultShaderName = "default";
|
||||
static const std::string envShaderName = "env";
|
||||
static const std::string vPositionName = "vPosition";
|
||||
static const std::string vTexCoordName = "vTexCoord";
|
||||
static const std::string textureUniformName = "Texture";
|
||||
|
||||
glClear(GL_DEPTH_BUFFER_BIT);
|
||||
|
||||
renderer.shaderManager.PushShader(defaultShaderName);
|
||||
@@ -242,10 +236,7 @@ namespace ZL
|
||||
}
|
||||
|
||||
void Game::drawScene() {
|
||||
//For low quality:
|
||||
glViewport(0, 0, Environment::width, Environment::height);
|
||||
//For high quality:
|
||||
//glViewport(0, 0, Environment::projectionWidth, Environment::projectionHeight);
|
||||
if (!loadingCompleted) {
|
||||
drawLoading();
|
||||
}
|
||||
@@ -266,9 +257,6 @@ namespace ZL
|
||||
|
||||
void Game::drawLoading()
|
||||
{
|
||||
static const std::string defaultShaderName = "default";
|
||||
static const std::string textureUniformName = "Texture";
|
||||
|
||||
glClear(GL_DEPTH_BUFFER_BIT);
|
||||
|
||||
renderer.shaderManager.PushShader(defaultShaderName);
|
||||
|
||||
Reference in new issue
Block a user