self.Render.flipx = true;
end,
MoveLeftReleased = function(self)
- game.puts("default", self.Position.x, self.Position.y, "Hey.")
+ game.puts("default", self.Position.x, self.Position.y+100, "Hey. Hag?")
self.Velocity.x = self.Velocity.x + 3.0
end,
MoveRightPressed = function(self)
#version 130
+#ifdef GL_FRAGMENT_PRECISION_HIGH
+precision highp float;
+#else
+precision mediump float;
+#endif
+
uniform sampler2D sampler;
in vec2 texCoord;
//TODO allow antialiasing
//if (pixelColor.w != 1.0f)
// discard;
- FragColor = pixelColor * color;
+ FragColor = pixelColor.r * color;
}
void main(){
texCoord = tex_coord;
- color = vec4(1.0, 1.0, 1.0, 1.0);
+ color = vec4(0.0f, 0.0f, 0.0f, 1.0f);
//color = tex_color;
- //gl_Position = ortho * vec4(coord2d.xyz, 1.0);
- gl_Position = projection * view * model * vec4(coord2d, 1.0f);
+ //gl_Position = ortho * vec4(coord2d.xyz, 1.0f);
+ gl_Position = projection * view * model * vec4(coord2d.xyz, 1.0f);
}
static GLuint b = worldShader.getUniform("AmbientLight");
static GLuint f = worldShader.getUniform("Flipped");
+ static glm::vec3 rot = glm::vec3(0.0f, 0.0f, -1.0f);
+
/***********
* SETUP *
***********/
+
+ glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
+ glEnable(GL_DEPTH_TEST);
+ glEnable(GL_CULL_FACE);
+ glEnable(GL_POLYGON_OFFSET_FILL);
+
glm::mat4 view = glm::lookAt(camPos, // Pos
- glm::vec3(camPos.x, camPos.y, 0.0f), // Facing
+ camPos + rot, // Facing
glm::vec3(0.0f, 1.0f, 0.0f)); // Up
//glm::mat4 projection = glm::perspective(45.0f,
(scaleWidth/2), // Right
-(scaleHeight/2), // Bottom
(scaleHeight/2), // Top
- 10.0f, // zFar
- -10.0f // zNear
+ 100.0f, // zFar
+ -100.0f // zNear
);
glm::mat4 model = glm::mat4(1.0f);
glUseProgram(s);
- glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
- glEnable(GL_DEPTH_TEST);
glUniformMatrix4fv(v, 1, GL_FALSE, glm::value_ptr(view));
glUniformMatrix4fv(p, 1, GL_FALSE, glm::value_ptr(projection));
glUniformMatrix4fv(m, 1, GL_FALSE, glm::value_ptr(model));
- glEnable(GL_CULL_FACE);
- glEnable(GL_POLYGON_OFFSET_FILL);
-
glEnableVertexAttribArray(a);
glEnableVertexAttribArray(t);
glUniform1i(n, 1);
glBindBuffer(GL_ARRAY_BUFFER, worldVBO);
- //glBufferData(GL_ARRAY_BUFFER,
- // wm.size() * sizeof(WorldMeshData),
- // &wm.front(),
- // GL_STREAM_DRAW);
-
glVertexAttribPointer(a, 3, GL_FLOAT, GL_FALSE,
6*sizeof(float), 0);
glVertexAttribPointer(t, 2, GL_FLOAT, GL_FALSE,
glDisableVertexAttribArray(a);
glDisableVertexAttribArray(t);
+ glUseProgram(0);
+
/******************
* UI RENDERING *
******************/
- static GLuint uiS = uiShader.getProgram();
+ static GLuint uiS = uiShader.getProgram();
static GLuint uiS_v = uiShader.getUniform("view");
static GLuint uiS_p = uiShader.getUniform("projection");
static GLuint uiS_m = uiShader.getUniform("model");
glUseProgram(uiS);
view = glm::lookAt(glm::vec3(0.0f, 0.0f, 10.0f), // Pos
- glm::vec3(0.0f, 0.0f, 0.0f), // Facing
+ glm::vec3(0.0f, 0.0f, 1.0f), // Facing
glm::vec3(0.0f, 1.0f, 0.0f)); // Up
scale = 1.0f;
scaleWidth = static_cast<float>(width) / scale;
scaleHeight = static_cast<float>(height) / scale;
- projection = glm::ortho(-(scaleWidth/2), // Left
- (scaleWidth/2), // Right
- -(scaleHeight/2), // Bottom
- (scaleHeight/2), // Top
- 10.0f, // zFar
- -10.0f); // zNear
+ projection = glm::ortho(-scaleWidth/2.0f, // Left
+ scaleWidth/2, // Right
+ -scaleHeight/2, // Bottom
+ scaleHeight/2, // Top
+ 100.0f, // zFar
+ -100.0f); // zNear
model = glm::mat4(1.0f);
for (auto& r : uiRenders) {
auto& render = r.second;
- glActiveTexture(GL_TEXTURE0);
+ glActiveTexture(GL_TEXTURE9);
glBindTexture(GL_TEXTURE_2D, render.tex);
- glUniform1i(uiS_q, 0);
-
- //glActiveTexture(GL_TEXTURE1);
- //glBindTexture(GL_TEXTURE_2D, render.normal);
- //glUniform1i(n, 1);
+ glUniform1i(uiS_q, 9);
glBindBuffer(GL_ARRAY_BUFFER, r.first);
-
glVertexAttribPointer(uiS_a, 3, GL_FLOAT, GL_FALSE,
6*sizeof(float), 0);
glVertexAttribPointer(uiS_t, 2, GL_FLOAT, GL_FALSE,
* CLEANUP *
*************/
+ glUseProgram(0);
+
glDisable(GL_POLYGON_OFFSET_FILL);
glDisable(GL_CULL_FACE);
- glUseProgram(0);
-
SDL_GL_SwapWindow(window.get());
}
int RenderSystem::init(void)
{
- // Select an OpenGL 4.3 profile.
- SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 4);
- SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 3);
if (SDL_InitSubSystem(SDL_INIT_VIDEO) != 0) {
std::cerr << "SDL video failed to initialize: "
return -1;
}
+ // Select an OpenGL 4.3 profile.
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_PROFILE_MASK,
+ SDL_GL_CONTEXT_PROFILE_CORE);
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 3);
+ SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
+ SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8);
+
context = SDL_GL_CreateContext(window.get());
GLenum err;
// TODO
//glPolygonOffset(1.0, 1.0);
- //glClearColor(0.6, 0.8, 1.0, 0.0);
+ glClearColor(0.6, 0.8, 1.0, 0.0);
camPos = glm::vec3(0.0f, 0.0f, 5.0f);
//
auto& font = fontData[name];
- glGenTextures(1, &font.tex);
glGenBuffers(1, &font.vbo);
+
+ glGenTextures(1, &font.tex);
glBindTexture(GL_TEXTURE_2D, font.tex);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RED, width, height,
0, GL_RED, GL_UNSIGNED_BYTE, 0);
+
glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
+
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
// Load each character and add it to the texture
//
+ font.width = width;
+ font.height = height;
+
float offsetX = 0, offsetY = 0;
for (int c = 32; c < 128; c++) {
- FT_Load_Char(face, c, FT_LOAD_RENDER);
+ if (FT_Load_Char(face, c, FT_LOAD_RENDER)) {
+ std::cerr << "Unrecognized character: " << c << std::endl;
+ continue;
+ }
auto* g = face->glyph;
glTexSubImage2D(GL_TEXTURE_2D, 0, offsetX, offsetY,
GL_RED, GL_UNSIGNED_BYTE,
g->bitmap.buffer);
- auto& d = font.data[c - 32];
+ auto& d = font.data[c-32];
d.dim = { g->bitmap.width, g->bitmap.rows };
d.bitmap = { g->bitmap_left, g->bitmap_top };
d.advance = { g->advance.x >> 6, g->advance.y >> 6 };
d.offset = { offsetX / width, offsetY / height };
- offsetX += g->bitmap.width;
+ offsetX += g->bitmap.width;// + 1.0f;
// Keep offsetY at zero?
}
auto& d = data.second;
d.buffer.clear();
for (auto& text : d.text) {
- float cOff = 0.0f;
+ float tx = text.x;
+ float ty = text.y;
for (char c : text.text) {
if (c < 32)
continue;
+ c -= 32;
+
+ float x = tx + d.data[c].bitmap.first;
+ float y = ty - (d.data[c].dim.second - d.data[c].bitmap.second);
+ float z = text.z;
+
+ float w = d.data[c].dim.first;
+ float h = d.data[c].dim.second;
+
+ tx += d.data[c].advance.first;
+ ty += d.data[c].advance.second;
+
+ if (w == 0.0f || h == 0.0f)
+ continue;
+
d.buffer += {
- text.x+cOff,
- text.y,
- text.z,
+ x,
+ y,
+ z,
d.data[c].offset.first,
- d.data[c].offset.second+d.data[c].dim.second,
+ d.data[c].offset.second+d.data[c].dim.second/d.height,
1.0f
};
d.buffer += {
- text.x+cOff+d.data[c].dim.first,
- text.y,
- text.z,
- d.data[c].offset.first+d.data[c].dim.first,
- d.data[c].offset.second+d.data[c].dim.second,
+ x+w,
+ y,
+ z,
+ d.data[c].offset.first+d.data[c].dim.first/d.width,
+ d.data[c].offset.second+d.data[c].dim.second/d.height,
1.0f
};
d.buffer += {
- text.x+cOff,
- text.y+d.data[c].dim.second,
- text.z,
+ x,
+ y+h,
+ z,
d.data[c].offset.first,
d.data[c].offset.second,
1.0f
};
d.buffer += {
- text.x+cOff+d.data[c].dim.first,
- text.y,
- text.z,
- d.data[c].offset.first+d.data[c].dim.first,
- d.data[c].offset.second+d.data[c].dim.second,
+ x+w,
+ y,
+ z,
+ d.data[c].offset.first+d.data[c].dim.first/d.width,
+ d.data[c].offset.second+d.data[c].dim.second/d.height,
1.0f
};
d.buffer += {
- text.x+cOff+d.data[c].dim.first,
- text.y+d.data[c].dim.second,
- text.z,
- d.data[c].offset.first+d.data[c].dim.first,
+ x+w,
+ y+h,
+ z,
+ d.data[c].offset.first+d.data[c].dim.first/d.width,
d.data[c].offset.second,
1.0f
};
d.buffer += {
- text.x+cOff,
- text.y+d.data[c].dim.second,
- text.z,
- d.data[c].offset.first+d.data[c].dim.first,
+ x,
+ y+h,
+ z,
+ d.data[c].offset.first,
d.data[c].offset.second,
1.0f
};
-
- cOff += d.data[c].dim.first + d.data[c].advance.first;
}
}
glBindBuffer(GL_ARRAY_BUFFER, d.vbo);
glBufferData(GL_ARRAY_BUFFER,
- d.text.size() * sizeof(TextMeshData), d.text.data(),
- GL_STREAM_DRAW);
+ d.buffer.size() * sizeof(TextMeshData), d.buffer.data(),
+ GL_DYNAMIC_DRAW);
}
}
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+// hello
+
#ifndef SYSTEM_TEXT_HPP_
#define SYSTEM_TEXT_HPP_
GLuint tex;
GLuint vbo;
+ float width;
+ float height;
+
std::array<FT_Info, 96> data;
// Stores currently shown text at given index into VBO?
std::vector<Text> text;
glBindBuffer(GL_ARRAY_BUFFER, worldVBO);
glBufferData(GL_ARRAY_BUFFER,
- mesh.size() * sizeof(mesh),
- &mesh.front(),
- GL_STREAM_DRAW);
+ mesh.size() * sizeof(WorldMeshData),
+ mesh.data(),
+ GL_STATIC_DRAW);
meshUpdated = true;
}
}
}
} catch (...) { // If we get any errors, just let the character
- return y;
+ //return y;
+ (void)y;
+ return 0.0;
}
return Y;
projects / clyne / gamedev2.git / commitdiff