aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile4
-rw-r--r--include/common.hpp112
-rw-r--r--include/render.hpp2
-rw-r--r--include/texture.hpp2
-rw-r--r--include/vector2.hpp80
-rw-r--r--include/world.hpp6
-rw-r--r--main.cpp2
-rw-r--r--src/components.cpp6
-rw-r--r--src/gametime.cpp24
-rw-r--r--src/inventory.cpp8
-rw-r--r--src/old/entities.cpp.bak (renamed from src/entities.cpp.bak)0
-rw-r--r--src/old/inventory.cpp.bak (renamed from src/inventory.cpp.bak)0
-rw-r--r--src/old/items.cpp.bak (renamed from src/items.cpp.bak)0
-rw-r--r--src/old/mob.cpp.bak (renamed from src/mob.cpp.bak)0
-rw-r--r--src/old/quest.cpp.bak (renamed from src/quest.cpp.bak)0
-rw-r--r--src/texture.cpp4
-rw-r--r--src/ui.cpp4
-rw-r--r--src/world.cpp18
-rw-r--r--xml/!town.xml1
19 files changed, 129 insertions, 144 deletions
diff --git a/Makefile b/Makefile
index f8d7511..471a11a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ endif
CXXFLAGS = -ggdb -m$(TARGET_BITS) -std=c++14 -fext-numeric-literals
CXXINC = -Iinclude -Iinclude/freetype -I.
-CXXWARN = -Wall -Wextra #-Werror -pedantic
+CXXWARN = -Wall -Wextra -Werror -pedantic
CXXSRCDIR = src
CXXOUTDIR = out
@@ -56,4 +56,4 @@ $(CXXOUTDIR)/%.o: $(CXXSRCDIR)/%.cpp
$(CXXOUTDIR)/%.o: $(CXXSRCDIR)/%.cc
@echo " CXX " $<
- @$(CXX) $(CXXFLAGS) $(CXXINC) $(CXXWARN) $(LIBS) -c $< -o $@ \ No newline at end of file
+ @$(CXX) $(CXXFLAGS) $(CXXINC) $(CXXWARN) $(LIBS) -c $< -o $@
diff --git a/include/common.hpp b/include/common.hpp
index abfd28b..1244464 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -55,73 +55,10 @@ using uint = unsigned int;
#define coalesce(v1, v2) ((v1 != nullptr) ? v1 : v2)
-/**
- * Creates a coordinate of integers.
- */
-typedef struct {
- int x; /**< The x coordinate */
- int y; /**< The y coordinate */
-} ivec2;
+#include <vector2.hpp>
-/**
- * A pair of x and y for dimensions (i.e. width and height).
- */
-typedef ivec2 dim2;
-
-/**
- * Creates a coordinate out of floating point integers.
- */
-struct vec2 {
- float x;
- float y;
-
- vec2(float _x = 0.0f, float _y = 0.0f)
- : x(_x), y(_y) {}
-
- bool operator==(const vec2 &v) const {
- return (x == v.x) && (y == v.y);
- }
-
- template<typename T>
- const vec2 operator=(const T &n) {
- x = y = n;
- return *this;
- }
-
- template<typename T>
- vec2 operator+(T n) const {
- return vec2 (x + n, y + n);
- }
-
- vec2 operator+(const vec2 &v) {
- return vec2 (x + v.x, y + v.y);
- }
-
- vec2 operator*(const float&n) const {
- return vec2 (x * n, y * n);
- }
-
- vec2 operator/(const float& n) const {
- return vec2 (x / n, y / n);
- }
-
- // std::swap can't work due to being packed
-
- inline void swapX(vec2 &v) {
- float t = x;
- x = v.x, v.x = t;
- }
-
- inline void swapY(vec2 &v) {
- float t = y;
- y = v.y, v.y = t;
- }
-
- std::string toString(void) const {
- return "(" + std::to_string(x) + ", " + std::to_string(y) + ")";
- }
-
-} __attribute__ ((packed));
+using vec2 = vector2<float>;
+using dim2 = vector2<int>;
/**
* A structure for three-dimensional points.
@@ -133,8 +70,7 @@ struct vec3 {
vec3(float _x = 0.0f, float _y = 0.0f, float _z = 1.0f)
: x(_x), y(_y), z(_z) {}
-
-} __attribute__ ((packed));
+};
/**
* This structure contains two sets of coordinates for ray drawing.
@@ -155,35 +91,15 @@ public:
float blue; /**< The amount of blue */
float alpha; /**< Transparency */
- Color() {
- red = green = blue = alpha = 0.0f;
- }
+ Color(float r = 0, float g = 0, float b = 0, float a = 255)
+ : red(r), green(g), blue(b), alpha(a) {}
- Color(float r, float g ,float b) {
- red = r;
- green = g;
- blue = b;
- alpha = 255;
+ Color operator-(const float& a) {
+ return Color(red - a, green - a, blue - a, alpha);
}
- Color(float r, float g, float b, float a) {
- red = r;
- green = g;
- blue = b;
- alpha = a;
- }
-
- Color operator-=(float a) {
- red -= a;
- green -= a;
- blue -= a;
- return{red+a,green+a,blue+a};
- }
- Color operator+=(float a) {
- return{red+a,green+a,blue+a};
- }
- Color operator=(float a) {
- return{red=a,green=a,blue=a};
+ Color operator+(const float& a) {
+ return Color(red + a, green + a, blue + a, alpha);
}
};
@@ -207,14 +123,6 @@ constexpr float MSEC_PER_TICK = 1000.0f / TICKS_PER_SEC;
std::vector<std::string> StringTokenizer(const std::string& str, char delim);
/**
- * Seperates a string like, "23,12" to a vec2.
- *
- * @param s the string to parse
- * @return the vec2 of the values passed in the string
- */
-vec2 str2coord(std::string s);
-
-/**
* Returns a measurement in HLINEs
*
* @param the number of HLINEs, integer or decimal
diff --git a/include/render.hpp b/include/render.hpp
index cf58519..997d7d0 100644
--- a/include/render.hpp
+++ b/include/render.hpp
@@ -69,8 +69,6 @@ namespace Render {
extern Shader worldShader;
extern Shader textShader;
- void initShaders(void);
-
void useShader(Shader *s);
void drawRect(vec2 ll, vec2 ur, float z);
diff --git a/include/texture.hpp b/include/texture.hpp
index 3cb8d1f..43db1b6 100644
--- a/include/texture.hpp
+++ b/include/texture.hpp
@@ -93,6 +93,8 @@ namespace Colors {
extern ColorTex red; /**< A solid red texture. */
extern ColorTex blue; /**< A solid blue texture. */
+ extern GLfloat texCoord[12];
+
/**
* Creates the colors.
*/
diff --git a/include/vector2.hpp b/include/vector2.hpp
new file mode 100644
index 0000000..debaee9
--- /dev/null
+++ b/include/vector2.hpp
@@ -0,0 +1,80 @@
+#ifndef VECTOR2_HPP_
+#define VECTOR2_HPP_
+
+#include <string>
+#include <type_traits>
+
+template<typename T>
+struct vector2 {
+ static_assert(std::is_arithmetic<T>::value, "vector2 members must be an arithmetic type (i.e. numbers)");
+
+ T x, y;
+
+ vector2(T _x = 0, T _y = 0)
+ : x(_x), y(_y) {}
+
+ // format: "3, 5"
+ vector2(const std::string& s) {
+ *this = s;
+ }
+
+ vector2<T>& operator=(const T& value) {
+ x = y = value;
+ return *this;
+ }
+
+ vector2<T>& operator=(const std::string& s) {
+ auto comma = s.find(',');
+ x = std::stoi(s.substr(0, comma));
+ y = std::stoi(s.substr(comma + 1));
+ return *this;
+ }
+
+ // addition
+ vector2<T> operator+(const vector2<T>& v) const {
+ return vector2<T>(x + v.x, y + v.y);
+ }
+
+ vector2<T> operator+(const T& n) const {
+ return vector2<T>(x + n, y + n);
+ }
+
+ // subtraction
+ vector2<T> operator-(const vector2<T>& v) const {
+ return vector2<T>(x - v.x, y - v.y);
+ }
+
+ vector2<T> operator-(const T& n) const {
+ return vector2<T>(x - n, y - n);
+ }
+
+ // multiplication
+ vector2<T> operator*(const vector2<T>& v) const {
+ return vector2<T>(x * v.x, y * v.y);
+ }
+
+ vector2<T> operator*(const T& n) const {
+ return vector2<T>(x * n, y * n);
+ }
+
+ // division
+ vector2<T> operator/(const vector2<T>& v) const {
+ return vector2<T>(x / v.x, y / v.y);
+ }
+
+ vector2<T> operator/(const T& n) const {
+ return vector2<T>(x / n, y / n);
+ }
+
+ // compare
+ bool operator==(const vector2<T>& v) const {
+ return (x == v.x) && (y == v.y);
+ }
+
+ // other functions
+ std::string toString(void) const {
+ return "(" + std::to_string(x) + ", " + std::to_string(y) + ")";
+ }
+};
+
+#endif // VECTOR2_HPP_
diff --git a/include/world.hpp b/include/world.hpp
index 14c64d0..9b68314 100644
--- a/include/world.hpp
+++ b/include/world.hpp
@@ -37,7 +37,7 @@ struct WorldData {
float grassHeight[2]; /**< height of the two grass blades */
float groundHeight; /**< height of the 'line' */
unsigned char groundColor; /**< a value that affects the ground's color */
-} __attribute__ ((packed));
+};
/**
* Defines how many game ticks it takes to go from day to night or vice versa.
@@ -171,8 +171,8 @@ public:
WorldData2 worldData;
void generate(int width = 0);
- void addHole(const unsigned int& start, const unsigned int& end);
- void addHill(const ivec2& peak, const unsigned int& width);
+ //void addHole(const unsigned int& start, const unsigned int& end);
+ //void addHill(const ivec2& peak, const unsigned int& width);
bool save(void);
void load(const std::string& file);
diff --git a/main.cpp b/main.cpp
index 40a8497..2e5e69d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
// read in all XML file names in the folder
std::list<std::string> xmlFiles;
- if (getdir(std::string("./" + xmlFolder).c_str(), xmlFiles))
+ if (getdir(std::string("./" + xmlFolder), xmlFiles))
UserError("Error reading XML files!!!");
// kill the world if needed
diff --git a/src/components.cpp b/src/components.cpp
index 28a81fe..b758cb6 100644
--- a/src/components.cpp
+++ b/src/components.cpp
@@ -306,12 +306,12 @@ std::vector<Frame> developFrame(XMLElement* xml)
std::string sname = sxml->Name();
if (sname == "src") {
foffset = (sxml->Attribute("offset") != nullptr) ?
- str2coord(sxml->Attribute("offset")) : vec2(0,0);
+ sxml->StrAttribute("offset") : vec2(0,0);
fdraw = (sxml->Attribute("drawOffset") != nullptr) ?
- str2coord(sxml->Attribute("drawOffset")) : vec2(0,0);
+ sxml->StrAttribute("drawOffset") : vec2(0,0);
if (sxml->Attribute("size") != nullptr) {
- fsize = str2coord(sxml->Attribute("size"));
+ fsize = sxml->Attribute("size");
tmpf.push_back(std::make_pair(SpriteData(sxml->GetText(), foffset, fsize), fdraw));
} else {
tmpf.push_back(std::make_pair(SpriteData(sxml->GetText(), foffset), fdraw));
diff --git a/src/gametime.cpp b/src/gametime.cpp
index 1005d84..cb736ff 100644
--- a/src/gametime.cpp
+++ b/src/gametime.cpp
@@ -1,15 +1,9 @@
#include <gametime.hpp>
-#include <common.hpp>
+#include <common.hpp> // millis
static unsigned int tickCount = 0;
-static float deltaTime = 1;
-
-// millisecond timers
-static unsigned int currentTime = 0;
-static unsigned int prevTime;
-
-static float accum = 0.0f;
+static unsigned int deltaTime = 1;
namespace game {
namespace time {
@@ -34,15 +28,19 @@ namespace game {
}
void mainLoopHandler(void) {
- if (!currentTime)
- currentTime = prevTime = millis();
+ static unsigned int cur = 0, prev;
- currentTime = millis();
- deltaTime = currentTime - prevTime;
- prevTime = currentTime;
+ if (cur == 0)
+ cur = prev = millis();
+
+ cur = millis();
+ deltaTime = cur - prev;
+ prev = cur;
}
bool tickHasPassed(void) {
+ static unsigned int accum = 0;
+
accum += deltaTime;
if (accum > MSEC_PER_TICK) {
accum = 0.0f;
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 480c803..ed6028b 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -2,10 +2,10 @@
#include <common.hpp>
#include <events.hpp>
-#include <texture.hpp>
-#include <render.hpp>
+//#include <texture.hpp>
+//#include <render.hpp>
-constexpr const char* ICON_TEX_FILE_PATH = "config/invIcons.txt";
+constexpr const char* iconTexturePath = "config/invIcons.txt";
static std::vector<Texture> iconTextures;
@@ -16,7 +16,7 @@ void InventorySystem::configure(entityx::EventManager &ev)
void InventorySystem::loadIcons(void) {
iconTextures.clear();
- auto icons = readFileA(ICON_TEX_FILE_PATH);
+ auto icons = readFileA(iconTexturePath);
for (const auto& s : icons)
iconTextures.push_back(s);
}
diff --git a/src/entities.cpp.bak b/src/old/entities.cpp.bak
index 25dd379..25dd379 100644
--- a/src/entities.cpp.bak
+++ b/src/old/entities.cpp.bak
diff --git a/src/inventory.cpp.bak b/src/old/inventory.cpp.bak
index 1b325c0..1b325c0 100644
--- a/src/inventory.cpp.bak
+++ b/src/old/inventory.cpp.bak
diff --git a/src/items.cpp.bak b/src/old/items.cpp.bak
index 180c5fa..180c5fa 100644
--- a/src/items.cpp.bak
+++ b/src/old/items.cpp.bak
diff --git a/src/mob.cpp.bak b/src/old/mob.cpp.bak
index e78e5cd..e78e5cd 100644
--- a/src/mob.cpp.bak
+++ b/src/old/mob.cpp.bak
diff --git a/src/quest.cpp.bak b/src/old/quest.cpp.bak
index f19359e..f19359e 100644
--- a/src/quest.cpp.bak
+++ b/src/old/quest.cpp.bak
diff --git a/src/texture.cpp b/src/texture.cpp
index b47c3c7..721e5cb 100644
--- a/src/texture.cpp
+++ b/src/texture.cpp
@@ -10,6 +10,10 @@ namespace Colors
ColorTex red;
ColorTex blue;
+ GLfloat texCoord[12] = {
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+ };
+
void init(void) {
white = ColorTex(Color(255, 255, 255));
black = ColorTex(Color(0, 0, 0 ));
diff --git a/src/ui.cpp b/src/ui.cpp
index 9470a56..552884f 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -650,8 +650,8 @@ namespace ui {
auto stride = 5 * sizeof(GLfloat);
// we always want to make sure c1 is lower left and c2 is upper right
- if (c1.x > c2.x) c1.swapX(c2); // std::swap(c1.x, c2.y);
- if (c1.y > c2.y) c1.swapY(c2); // std::swap(c1.y, c2.y);
+ if (c1.x > c2.x) std::swap(c1.x, c2.x);
+ if (c1.y > c2.y) std::swap(c1.y, c2.y);
// if the box is too small, we will not be able to draw it
if (c2.x - c1.x < (boxCornerDim.x) || c2.y - c1.y < (boxCornerDim.y))
diff --git a/src/world.cpp b/src/world.cpp
index 6551442..8f4be8e 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -324,9 +324,9 @@ void WorldSystem::load(const std::string& file)
vec2 coords;
if (wxml->Attribute("position") != nullptr) {
- coords = str2coord(wxml->StrAttribute("position"));
+ coords = wxml->StrAttribute("position");
} else {
- coords = str2coord(abcd->StrAttribute("value"));
+ coords = abcd->StrAttribute("value");
}
float cdat[2] = {coords.x, coords.y};
@@ -345,7 +345,7 @@ void WorldSystem::load(const std::string& file)
vec2 dim;
if (abcd->Attribute("value") != nullptr)
- dim = str2coord(abcd->StrAttribute("value"));
+ dim = abcd->StrAttribute("value");
else
dim = entity.component<Sprite>()->getSpriteSize();
@@ -355,9 +355,9 @@ void WorldSystem::load(const std::string& file)
vec2 dir;
if (wxml->Attribute("direction") != nullptr) {
- dir = str2coord(wxml->StrAttribute("direction"));
+ dir = wxml->StrAttribute("direction");
} else if (wxml->Attribute("value") != nullptr) {
- dir = str2coord(wxml->StrAttribute("value"));
+ dir = wxml->StrAttribute("value");
} else {
dir = vec2(0,0);
}
@@ -669,9 +669,8 @@ void WorldSystem::render(void)
const auto SCREEN_WIDTH = game::SCREEN_WIDTH;
const auto SCREEN_HEIGHT = game::SCREEN_HEIGHT;
- const ivec2 backgroundOffset = ivec2 {
- static_cast<int>(SCREEN_WIDTH) / 2, static_cast<int>(SCREEN_HEIGHT) / 2
- };
+ const vector2<int> backgroundOffset
+ (static_cast<int>(SCREEN_WIDTH) / 2, static_cast<int>(SCREEN_HEIGHT) / 2);
int iStart, iEnd, pOffset;
@@ -1179,8 +1178,6 @@ void WorldSystem::detect(entityx::TimeDelta dt)
void WorldSystem::goWorldRight(Position& p, Solid &d)
{
if (!(world.toRight.empty()) && (p.x + d.width > world.startX * -1 - HLINES(5))) {
- auto& rs = *game::engine.getSystem<RenderSystem>();
- //rs.fadeLock();
ui::toggleBlack();
ui::waitForCover();
while (waitToSwap)
@@ -1188,7 +1185,6 @@ void WorldSystem::goWorldRight(Position& p, Solid &d)
load(world.toRight);
game::engine.getSystem<PlayerSystem>()->setX(world.startX + HLINES(10));
ui::toggleBlack();
- //rs.unfade();
}
}
diff --git a/xml/!town.xml b/xml/!town.xml
index 0a28124..47ddf27 100644
--- a/xml/!town.xml
+++ b/xml/!town.xml
@@ -12,7 +12,6 @@
<npc name="Bob" hasDialog="true" position="50.0,100.0"/>
<structure type="1" position="300.0,100.0"/>
<structure inside="bobshouse.xml" type="1" position="10.0,100.0"/>
- <chest/>
</World>
<Dialog name="Bob">
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-05 02:45:35 +0000