From 9f882bf74d452521cb7fb1806ab453aaa28da343 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Wed, 26 Jan 2011 00:41:06 +0200 Subject: Reworked texture, material, mineral and whatever handling --- src/tile.cpp | 117 ++--------------------------------------------------------- 1 file changed, 4 insertions(+), 113 deletions(-) (limited to 'src/tile.cpp') diff --git a/src/tile.cpp b/src/tile.cpp index 18a2f155a..60e9873c0 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -18,119 +18,10 @@ with this program; if not, write to the Free Software Foundation, Inc., */ #include "tile.h" -#include "porting.h" +//#include "porting.h" // For IrrlichtWrapper -#include "main.h" -#include +//#include "main.h" +//#include -/* - These can either be real paths or generated names of preloaded - textures (like "mud.png_sidegrass") -*/ -std::string g_tile_texture_paths[TILES_COUNT]; - -const char * tile_texture_path_get(u32 i) -{ - assert(i < TILES_COUNT); - - //return g_tile_texture_paths[i]; - return g_tile_texture_paths[i].c_str(); -} - -// A mapping from tiles to materials -// Initialized at run-time. -video::SMaterial g_tile_materials[TILES_COUNT]; - -enum TileTextureModID -{ - TTMID_NONE, - TTMID_SIDEGRASS, -}; - -struct TileTextureSpec -{ - const char *filename; - enum TileTextureModID mod; -}; - -/* - Initializes g_tile_texture_paths with paths of textures, - generates generated textures and creates the tile material array. -*/ -void init_tile_textures() -{ - TileTextureSpec tile_texture_specs[TILES_COUNT] = - { - {NULL, TTMID_NONE}, - {"stone.png", TTMID_NONE}, - {"water.png", TTMID_NONE}, - {"grass.png", TTMID_NONE}, - {"tree.png", TTMID_NONE}, - {"leaves.png", TTMID_NONE}, - {"grass_footsteps.png", TTMID_NONE}, - {"mese.png", TTMID_NONE}, - {"mud.png", TTMID_NONE}, - {"tree_top.png", TTMID_NONE}, - {"mud.png", TTMID_SIDEGRASS}, - {"cloud.png", TTMID_NONE}, - {"coalstone.png", TTMID_NONE}, - {"wood.png", TTMID_NONE}, - }; - - for(s32 i=0; igetTexture(TextureSpec(path + mod_postfix, - path, mod)); - } - g_tile_texture_paths[i] = path + mod_postfix; - } - } - - for(s32 i=0; igetTexture(path); - assert(t != NULL); - } - - g_tile_materials[i].Lighting = false; - g_tile_materials[i].BackfaceCulling = false; - g_tile_materials[i].setFlag(video::EMF_BILINEAR_FILTER, false); - g_tile_materials[i].setFlag(video::EMF_ANTI_ALIASING, video::EAAM_OFF); - //if(i != TILE_WATER) - g_tile_materials[i].setFlag(video::EMF_FOG_ENABLE, true); - - //g_tile_materials[i].setFlag(video::EMF_TEXTURE_WRAP, video::ETC_REPEAT); - //g_tile_materials[i].setFlag(video::EMF_ANISOTROPIC_FILTER, false); - - g_tile_materials[i].setTexture(0, t); - } - - g_tile_materials[TILE_WATER].MaterialType = video::EMT_TRANSPARENT_VERTEX_ALPHA; - //g_tile_materials[TILE_WATER].MaterialType = video::EMT_TRANSPARENT_ADD_COLOR; -} - -video::SMaterial & tile_material_get(u32 i) -{ - assert(i < TILES_COUNT); - - return g_tile_materials[i]; -} +// Nothing here -- cgit v1.2.3