Browse Source

texture things

feature/replace-renderer
Martin Dørum 3 years ago
parent
commit
432f878b64
2 changed files with 5 additions and 5 deletions
  1. 4
    4
      libcygnet/src/Renderer.cc
  2. 1
    1
      libcygnet/src/shaders.cc

+ 4
- 4
libcygnet/src/Renderer.cc View File

@@ -206,8 +206,8 @@ void Renderer::uploadTileAtlas(const void *data, int width, int height) {
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_BYTE, data);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
glCheck();

state_->atlasTexSize = {
@@ -242,8 +242,8 @@ RenderChunk Renderer::createChunk(
glBindTexture(GL_TEXTURE_2D, chunk.tex);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
glCheck();

static_assert(

+ 1
- 1
libcygnet/src/shaders.cc View File

@@ -63,7 +63,7 @@ const char *chunkFr = R"glsl(
tileID + v_tileCoord.x - tilePos.x,
floor(tileID / tileAtlasSize.x) + v_tileCoord.y - tilePos.y);

gl_FragColor = texture2D(tileAtlas, fract(atlasPos / tileAtlasSize));
gl_FragColor = texture2D(tileAtlas, atlasPos / tileAtlasSize);
}
)glsl";


Loading…
Cancel
Save