jackcartersmith/rerogue
2
0
Fork 0
mirror of https://github.com/dpethes/rerogue.git synced 2025-06-07 18:58:32 +02:00
Code Issues Releases Wiki Activity

terrain viewer: use mip-mapping

Browse Source
This commit is contained in:
dpethes 2015-07-11 21:41:32 +02:00
parent 8f9fb78d19
commit 2d5c549847
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
terrain_viewer/terrain_mesh.pas
View File

@ -5,7 +5,7 @@ interface
uses uses
Classes, SysUtils, Classes, SysUtils,
gl, gl, glext, glu,
rs_world; rs_world;
type type
@ -105,26 +105,28 @@ end;
//generate textures. TODO texture atlas? //generate textures. TODO texture atlas?
procedure TTerrainMesh.InitGL; procedure TTerrainMesh.InitGL;
procedure GenTexture(tex_idx: integer); procedure GenTexture(tex_idx: integer; use_mip: boolean);
const const
TexW = 64; TexW = 64;
TexH = 64; TexH = 64;
var var
tex: pbyte; tex: pbyte;
y: Integer;
x: Integer;
begin begin
glGenTextures(1, @textures_glidx[tex_idx]);
glBindTexture(GL_TEXTURE_2D, textures_glidx[tex_idx]);
tex := terrain.heightmap.textures[tex_idx]; tex := terrain.heightmap.textures[tex_idx];
//pnm_save('tex'+IntToStr(tex_idx) + '.pnm', tex, TexW, TexH); //debug //pnm_save('tex'+IntToStr(tex_idx) + '.pnm', tex, TexW, TexH); //debug
glGenTextures(1, @textures_glidx[tex_idx]);
glBindTexture(GL_TEXTURE_2D, textures_glidx[tex_idx]);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, TexW, TexH, 0, GL_RGB, GL_UNSIGNED_BYTE, tex); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, TexW, TexH, 0, GL_RGB, GL_UNSIGNED_BYTE, tex);
if use_mip then begin
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR_MIPMAP_LINEAR );
//glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); gluBuild2DMipmaps(GL_TEXTURE_2D, GL_RGB8, TexW, TexH, GL_RGB, GL_UNSIGNED_BYTE, tex);
//glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); end else begin
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
end;
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
end; end;
var var
@ -133,7 +135,7 @@ begin
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
SetLength(textures_glidx, terrain.heightmap.texture_count); SetLength(textures_glidx, terrain.heightmap.texture_count);
for i := 0 to terrain.heightmap.texture_count - 1 do for i := 0 to terrain.heightmap.texture_count - 1 do
GenTexture(i); GenTexture(i, true);
end; end;
@ -210,9 +212,8 @@ procedure TTerrainMesh.DrawGL(opts: TRenderOpts);
end; end;
var var
i, x, y, stride: integer; x, y: integer;
blk: TTerrainBlock; blk: TTerrainBlock;
v: TVertex3f;
begin begin
if opts.wireframe then if opts.wireframe then
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE) glPolygonMode(GL_FRONT_AND_BACK, GL_LINE)