aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/common.hpp17
-rw-r--r--include/config.hpp2
-rw-r--r--include/shader_utils.hpp14
-rw-r--r--include/world.hpp7
-rw-r--r--main.cpp1
-rw-r--r--src/brice.cpp6
-rw-r--r--src/common.cpp39
-rw-r--r--src/ui.cpp13
-rw-r--r--src/world.cpp16
9 files changed, 22 insertions, 93 deletions
diff --git a/include/common.hpp b/include/common.hpp
index 7028296..56928b5 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -43,11 +43,8 @@
// game library includes
#include <config.hpp>
-
-
// windows stuff
#ifdef __WIN32__
-typedef unsigned int uint;
#undef near
#endif
@@ -192,8 +189,6 @@ public:
}
};
-extern GLuint colorIndex;
-
/**
* The amount of game ticks that should occur each second.
*/
@@ -259,17 +254,6 @@ extern vec2 offset;
*/
void DEBUG_prints(const char* file, int line, const char *s,...);
-// TODO make sure we don't use these. Then burn them.
-/**
- * Sets color using glColor3ub(), but handles potential overflow.
- */
-void safeSetColor(int r,int g,int b);
-
-/**
- * Sets color using glColor4ub(), but handles potential overflow.
- */
-void safeSetColorA(int r,int g,int b,int a);
-
unsigned int millis(void);
// reads the names of files in a directory into the given string vector
@@ -279,7 +263,6 @@ int getdir(std::string dir, std::vector<std::string> &files);
void strVectorSortAlpha(std::vector<std::string> *v);
// reads the given file into a buffer and returns a pointer to the buffer
-const char *readFile(const char *path);
std::string readFile(const std::string& path);
std::vector<std::string> readFileA(const std::string& path);
diff --git a/include/config.hpp b/include/config.hpp
index 908c376..e17df24 100644
--- a/include/config.hpp
+++ b/include/config.hpp
@@ -29,7 +29,7 @@ namespace game {
/**
* The window is fullscreen if this is true.
*/
- extern bool FULLSCREEN;
+ extern bool FULLSCREEN;
namespace config {
/**
diff --git a/include/shader_utils.hpp b/include/shader_utils.hpp
index 08ca7b3..06ac318 100644
--- a/include/shader_utils.hpp
+++ b/include/shader_utils.hpp
@@ -14,12 +14,12 @@
#include <SDL2/SDL.h>
-extern char* file_read(const char* filename);
-extern void print_log(GLuint object);
-extern GLuint create_shader(const char* filename, GLenum type);
-extern GLuint create_program(const char* vertexfile, const char *fragmentfile);
-extern GLint get_attrib(GLuint program, const char *name);
-extern GLint get_uniform(GLuint program, const char *name);
-extern void print_opengl_info();
+char* file_read(const char* filename);
+void print_log(GLuint object);
+GLuint create_shader(const char* filename, GLenum type);
+GLuint create_program(const char* vertexfile, const char *fragmentfile);
+GLint get_attrib(GLuint program, const char *name);
+GLint get_uniform(GLuint program, const char *name);
+void print_opengl_info();
#endif
diff --git a/include/world.hpp b/include/world.hpp
index 8b24987..8864d30 100644
--- a/include/world.hpp
+++ b/include/world.hpp
@@ -60,13 +60,6 @@ typedef struct {
} WorldData;
/**
- * Alters how bright world elements are drawn.
- * This value is based off of the current time of day (tick count), set in
- * main.cpp.
- */
-extern int worldShade;
-
-/**
* Defines how many game ticks it takes to go from day to night or vice versa.
* Technically a half day cycle...
*/
diff --git a/main.cpp b/main.cpp
index 8579707..7fc1658 100644
--- a/main.cpp
+++ b/main.cpp
@@ -189,6 +189,7 @@ int main(int argc, char *argv[])
if (game::time::tickHasPassed()) {
// calculate the world shading value
+ extern int worldShade; // TODO kill
worldShade = 50 * sin((game::time::getTickCount() + (DAY_CYCLE / 2)) / (DAY_CYCLE / PI));
// update fades
diff --git a/src/brice.cpp b/src/brice.cpp
index 5e7237f..53b1431 100644
--- a/src/brice.cpp
+++ b/src/brice.cpp
@@ -58,9 +58,9 @@ namespace game {
}
void briceLoad(void) {
- const char *data = readFile("brice.dat");
+ auto data = readFile("brice.dat");
- if (data == nullptr) {
+ if (data.empty()) {
briceClear();
data = readFile("brice.dat");
}
@@ -74,8 +74,6 @@ namespace game {
brice.emplace(std::make_pair(datas[i], datas[i + 1]));
}
}
-
- delete[] data;
}
void briceUpdate(void) {
diff --git a/src/common.cpp b/src/common.cpp
index 01a7db8..706bc3c 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -43,22 +43,6 @@ void DEBUG_prints(const char* file, int line, const char *s,...)
va_end(args);
}
-void safeSetColor(int r, int g, int b)
-{
- r = static_cast<int>(fmax(fmin(r, 255), 0));
- g = static_cast<int>(fmax(fmin(g, 255), 0));
- b = static_cast<int>(fmax(fmin(b, 255), 0));
- glColor3ub(r, g, b);
-}
-
-void safeSetColorA(int r,int g,int b,int a) {
- r = static_cast<int>(fmax(fmin(r, 255), 0));
- g = static_cast<int>(fmax(fmin(g, 255), 0));
- b = static_cast<int>(fmax(fmin(b, 255), 0));
- a = static_cast<int>(fmax(fmin(a, 255), 0));
- glColor4ub(r, g, b, a);
-}
-
int getdir(std::string dir, std::vector<std::string> &files)
{
#ifndef __WIN32__
@@ -111,27 +95,6 @@ void strVectorSortAlpha(std::vector<std::string> *v)
} while (change);
}
-const char *readFile(const char *path)
-{
- std::ifstream in (path,std::ios::in);
- unsigned int size;
- GLchar *buf;
-
- if (!in.is_open()) {
-// UserError("Error reading file " + (std::string)path + "!");
- return nullptr;
- }
-
- in.seekg(0,in.end);
- buf = new GLchar[(size = in.tellg()) + 1];
- in.seekg(0,in.beg);
- in.read(buf,size);
- buf[size] = '\0';
-
- in.close();
- return buf;
-}
-
std::string readFile(const std::string& path)
{
std::ifstream in (path, std::ios::in);
@@ -141,7 +104,7 @@ std::string readFile(const std::string& path)
UserError("Error reading file " + path);
in.seekg(0, in.end);
- buffer.reserve(in.tellg());
+ buffer.resize(in.tellg());
in.seekg(0, in.beg);
in.read(&buffer[0], buffer.size());
diff --git a/src/ui.cpp b/src/ui.cpp
index a154d7e..9f0e014 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -1014,8 +1014,8 @@ namespace ui {
}
void drawFade(void) {
- auto SCREEN_WIDTH2 = game::SCREEN_WIDTH / 2;
- auto SCREEN_HEIGHT2 = game::SCREEN_HEIGHT / 2;
+ static const auto SCREEN_WIDTH2 = game::SCREEN_WIDTH / 2;
+ static const auto SCREEN_HEIGHT2 = game::SCREEN_HEIGHT / 2;
if (!fadeIntensity) {
if (fontSize != 16)
@@ -1023,9 +1023,6 @@ namespace ui {
return;
}
- ColorTex fadeTex (fadeWhite ? Color(255, 255, 255, fadeIntensity) :
- Color(0, 0, 0, fadeIntensity));
-
static const GLfloat tex[] = {
0.0, 0.0,
1.0, 0.0,
@@ -1045,8 +1042,8 @@ namespace ui {
Render::textShader.use();
Render::textShader.enable();
-
- fadeTex.use();
+ Colors::black.use();
+ glUniform4f(Render::textShader.uniform[WU_tex_color], 1.0f, 1.0f, 1.0f, fadeIntensity / 255.0f);
glVertexAttribPointer(Render::textShader.coord, 3, GL_FLOAT, GL_FALSE, 0, backdrop);
glVertexAttribPointer(Render::textShader.tex, 2, GL_FLOAT, GL_FALSE, 0, tex);
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
@@ -1055,8 +1052,6 @@ namespace ui {
Render::textShader.unuse();
setFontZ(-8.0);
-
- fadeTex.destroy();
}
void fadeUpdate(void) {
diff --git a/src/world.cpp b/src/world.cpp
index c458ab0..d0727e2 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -196,9 +196,7 @@ void WorldSystem::load(const std::string& file)
// load file data to string
auto xmlPath = xmlFolder + file;
- auto xmlRawData = readFile(xmlPath.c_str());
- std::string xmlRaw = xmlRawData;
- delete[] xmlRawData;
+ auto xmlRaw = readFile(xmlPath);
// let tinyxml parse the file
if (xmlDoc.Parse(xmlRaw.data()) != XML_NO_ERROR)
@@ -211,9 +209,7 @@ void WorldSystem::load(const std::string& file)
if (file != nullptr) {
DEBUG_printf("Including file: %s\n", file);
- auto include = readFile((xmlFolder + file).c_str());
- xmlRaw.append(include);
- delete[] include;
+ xmlRaw.append(readFile(xmlFolder + file));
} else {
UserError("XML Error: <include> tag file not given");
}
@@ -936,11 +932,11 @@ void WorldSystem::render(void)
GLfloat *dirtp = &dirt[0];
for (int i = iStart; i < iEnd; i++) {
- if (world.data[i].groundHeight <= 0) { // TODO holes (andy)
+ if (world.data[i].groundHeight <= 0) { // TODO holes (andy) TODO TODO TODO
world.data[i].groundHeight = GROUND_HEIGHT_MINIMUM - 1;
- glColor4ub(0, 0, 0, 255);
+ //glColor4ub(0, 0, 0, 255);
} else {
- safeSetColorA(150, 150, 150, 255);
+ //safeSetColorA(150, 150, 150, 255);
}
int ty = world.data[i].groundHeight / 64 + world.data[i].groundColor;
@@ -978,7 +974,7 @@ void WorldSystem::render(void)
if (!world.indoor) {
bgTex++;
- safeSetColorA(255, 255, 255, 255);
+ //safeSetColorA(255, 255, 255, 255); TODO TODO TODO
static std::vector<GLfloat> grass;
if (grass.size() != world.data.size() * 60) {
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-06 16:03:08 +0000