aboutsummaryrefslogtreecommitdiffstats
path: root/src/world.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/world.cpp')
-rw-r--r--src/world.cpp113
1 files changed, 32 insertions, 81 deletions
diff --git a/src/world.cpp b/src/world.cpp
index 52e197c..e43318f 100644
--- a/src/world.cpp
+++ b/src/world.cpp
@@ -513,11 +513,8 @@ void World::draw(Player *p)
uint ls = light.size();
- GLfloat *lightCoords = new GLfloat[ls * 4];
- GLfloat *lightColors = new GLfloat[ls * 4];
-
- uint lpIndex = 0;
- uint lcIndex = 0;
+ CoolArray<GLfloat> lightCoords (ls * 4);
+ CoolArray<GLfloat> lightColors (ls * 4);
for (uint i = 0; i < ls; i++) {
auto &l = light[i];
@@ -533,21 +530,14 @@ void World::draw(Player *p)
l.fireFlicker = 1;
}
- lightCoords[lpIndex++] = l.loc.x;
- lightCoords[lpIndex++] = l.loc.y;
- lightCoords[lpIndex++] = 0.0;
- lightCoords[lpIndex++] = l.radius;
-
- lightColors[lcIndex++] = l.color.red;
- lightColors[lcIndex++] = l.color.green;
- lightColors[lcIndex++] = l.color.blue;
- lightColors[lcIndex++] = 1.0;
+ lightCoords += {l.loc.x, l.loc.y, 0.0, l.radius};
+ lightColors += {l.color.red, l.color.green, l.color.blue, 1.0};
}
glUseProgram(worldShader);
- glUniform4fv(worldShader_uniform_light, ls, lightCoords);
- glUniform4fv(worldShader_uniform_light_color, ls, lightColors);
+ glUniform4fv(worldShader_uniform_light, ls, lightCoords.data());
+ glUniform4fv(worldShader_uniform_light_color, ls, lightColors.data());
glUniform1i(worldShader_uniform_light_amt, ls);
glUseProgram(0);
@@ -566,7 +556,9 @@ void World::draw(Player *p)
// draw the dirt
bgTex++;
- std::vector<std::pair<vec2,vec3>> c;
+
+ CoolArray<GLfloat> dirtc (12 * SCREEN_WIDTH);
+ CoolArray<GLfloat> dirtt (12 * SCREEN_WIDTH);
for (int i = iStart; i < iEnd; i++) {
if (worldData[i].groundHeight <= 0) { // TODO holes (andy)
@@ -576,104 +568,63 @@ void World::draw(Player *p)
safeSetColorA(150, 150, 150, 255);
}
- int ty = worldData[i].groundHeight / 64 + worldData[i].groundColor;
- // glTexCoord2i(0, 0); glVertex2i(worldStart + i * HLINE , worldData[i].groundHeight - GRASS_HEIGHT);
- // glTexCoord2i(1, 0); glVertex2i(worldStart + i * HLINE + HLINE , worldData[i].groundHeight - GRASS_HEIGHT);
- // glTexCoord2i(1, ty); glVertex2i(worldStart + i * HLINE + HLINE, 0);
- // glTexCoord2i(0, ty); glVertex2i(worldStart + i * HLINE , 0);
+ float ty = floor(worldData[i].groundHeight / 64 + worldData[i].groundColor);
- c.push_back(std::make_pair(vec2(0, 0), vec3(worldStart + HLINES(i), worldData[i].groundHeight - GRASS_HEIGHT, -4.0f)));
- c.push_back(std::make_pair(vec2(1, 0), vec3(worldStart + HLINES(i) + HLINE, worldData[i].groundHeight - GRASS_HEIGHT, -4.0f)));
- c.push_back(std::make_pair(vec2(1, ty),vec3(worldStart + HLINES(i) + HLINE, 0, -4.0f)));
+ dirtc += {worldStart + HLINES(i), worldData[i].groundHeight - GRASS_HEIGHT, -4.0f,
+ worldStart + HLINES(i + 1), worldData[i].groundHeight - GRASS_HEIGHT, -4.0f,
+ worldStart + HLINES(i + 1), 0, -4.0f,
+ worldStart + HLINES(i + 1), 0, -4.0f,
+ worldStart + HLINES(i), 0, -4.0f,
+ worldStart + HLINES(i), worldData[i].groundHeight - GRASS_HEIGHT, -4.0f};
- c.push_back(std::make_pair(vec2(1, ty),vec3(worldStart + HLINES(i) + HLINE, 0, -4.0f)));
- c.push_back(std::make_pair(vec2(0, ty),vec3(worldStart + HLINES(i), 0, -4.0f)));
- c.push_back(std::make_pair(vec2(0, 0), vec3(worldStart + HLINES(i), worldData[i].groundHeight - GRASS_HEIGHT, -4.0f)));
+ dirtt += {0, 0, 1, 0, 1, ty, 1, ty, 0, ty, 0, 0};
if (worldData[i].groundHeight == GROUND_HEIGHT_MINIMUM - 1)
worldData[i].groundHeight = 0;
}
- std::vector<GLfloat> dirtc;
- std::vector<GLfloat> dirtt;
-
- for (auto &v : c) {
- dirtc.push_back(v.second.x);
- dirtc.push_back(v.second.y);
- dirtc.push_back(v.second.z);
-
- dirtt.push_back(v.first.x);
- dirtt.push_back(v.first.y);
- }
-
glUseProgram(worldShader);
glUniform1f(worldShader_uniform_light_impact, 0.45f);
- makeWorldDrawingSimplerEvenThoughAndyDoesntThinkWeCanMakeItIntoFunctions_JustDrawThis(0, &dirtc[0], &dirtt[0], c.size());
+ makeWorldDrawingSimplerEvenThoughAndyDoesntThinkWeCanMakeItIntoFunctions_JustDrawThis(0, dirtc.data(), dirtt.data(), dirtc.size());
glUseProgram(0);
-
-
- //glEnd();
-
- //glUseProgram(0);
-
- // draw the grass
- //glEnable(GL_TEXTURE_2D);
- //glActiveTexture(GL_TEXTURE0);
+
bgTex++;
- //glUseProgram(shaderProgram);
- //glUniform1i(glGetUniformLocation(shaderProgram, "sampler"), 0);
safeSetColorA(255, 255, 255, 255);
- c.clear();
- std::vector<GLfloat> grassc;
- std::vector<GLfloat> grasst;
+ CoolArray<GLfloat> grassc (24 * SCREEN_WIDTH);
+ CoolArray<GLfloat> grasst (24 * SCREEN_WIDTH);
for (int i = iStart; i < iEnd; i++) {
auto wd = worldData[i];
auto gh = wd.grassHeight;
// flatten the grass if the player is standing on it.
- if (!wd.grassUnpressed) {
- gh[0] /= 4;
+ if (!wd.grassUnpressed) {
+ gh[0] /= 4;
gh[1] /= 4;
}
// actually draw the grass.
if (wd.groundHeight) {
- c.push_back(std::make_pair(vec2(0, 0),vec3(worldStart + HLINES(i) , wd.groundHeight + gh[0], -3)));
- c.push_back(std::make_pair(vec2(1, 0),vec3(worldStart + HLINES(i) + HLINE / 2, wd.groundHeight + gh[0], -3)));
- c.push_back(std::make_pair(vec2(1, 1),vec3(worldStart + HLINES(i) + HLINE / 2, wd.groundHeight - GRASS_HEIGHT, -3)));
-
- c.push_back(std::make_pair(vec2(1, 1),vec3(worldStart + HLINES(i) + HLINE / 2, wd.groundHeight - GRASS_HEIGHT, -3)));
- c.push_back(std::make_pair(vec2(0, 1),vec3(worldStart + HLINES(i) , wd.groundHeight - GRASS_HEIGHT, -3)));
- c.push_back(std::make_pair(vec2(0, 0),vec3(worldStart + HLINES(i) , wd.groundHeight + gh[0], -3)));
+ float x = worldStart + HLINES(i);
+ grassc += {x, wd.groundHeight + gh[0], -3, x + HLINE / 2, wd.groundHeight + gh[0], -3,
+ x + HLINE / 2, wd.groundHeight - GRASS_HEIGHT, -3, x + HLINE / 2, wd.groundHeight - GRASS_HEIGHT, -3,
+ x, wd.groundHeight - GRASS_HEIGHT, -3, x, wd.groundHeight + gh[0], -3,
+ x + HLINE / 2, wd.groundHeight + gh[1], -3, x + HLINE, wd.groundHeight + gh[1], -3,
+ x + HLINE, wd.groundHeight - GRASS_HEIGHT, -3, x + HLINE, wd.groundHeight - GRASS_HEIGHT, -3,
+ x + HLINE / 2, wd.groundHeight - GRASS_HEIGHT, -3, x + HLINE / 2, wd.groundHeight + gh[1], -3};
- c.push_back(std::make_pair(vec2(0, 0),vec3(worldStart + HLINES(i) + HLINE / 2, wd.groundHeight + gh[1], -3)));
- c.push_back(std::make_pair(vec2(1, 0),vec3(worldStart + HLINES(i) + HLINE , wd.groundHeight + gh[1], -3)));
- c.push_back(std::make_pair(vec2(1, 1),vec3(worldStart + HLINES(i) + HLINE , wd.groundHeight - GRASS_HEIGHT, -3)));
-
- c.push_back(std::make_pair(vec2(1, 1),vec3(worldStart + HLINES(i) + HLINE , wd.groundHeight - GRASS_HEIGHT, -3)));
- c.push_back(std::make_pair(vec2(0, 1),vec3(worldStart + HLINES(i) + HLINE / 2, wd.groundHeight - GRASS_HEIGHT, -3)));
- c.push_back(std::make_pair(vec2(0, 0),vec3(worldStart + HLINES(i) + HLINE / 2, wd.groundHeight + gh[1], -3)));
+ grasst += {0, 0, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1, 1, 0, 1, 0, 0};
}
}
- for (auto &v : c) {
- grassc.push_back(v.second.x);
- grassc.push_back(v.second.y);
- grassc.push_back(v.second.z);
-
- grasst.push_back(v.first.x);
- grasst.push_back(v.first.y);
- }
-
glUseProgram(worldShader);
glUniform1f(worldShader_uniform_light_impact, 1.0f);
- makeWorldDrawingSimplerEvenThoughAndyDoesntThinkWeCanMakeItIntoFunctions_JustDrawThis(0, &grassc[0], &grasst[0], c.size());
+ makeWorldDrawingSimplerEvenThoughAndyDoesntThinkWeCanMakeItIntoFunctions_JustDrawThis(0, grassc.data(), grasst.data(), grassc.size());
glUseProgram(0);
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-05 12:18:27 +0000