From: Perttu Ahola Date: Mon, 13 Dec 2010 22:21:18 +0000 (+0200) Subject: in before messing with face drawing orientation X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=626ed6338aa90eb07038adee29643e692fec6545;p=zefram%2Fminetest%2Fminetest_engine.git in before messing with face drawing orientation --- diff --git a/Makefile b/Makefile index 2b4e8dda..3985bdbc 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # It's usually sufficient to change just the target name and source file list # and be sure that CXX is set to a valid compiler TARGET = test -SOURCE_FILES = voxel.cpp mapblockobject.cpp inventory.cpp debug.cpp serialization.cpp light.cpp filesys.cpp connection.cpp environment.cpp client.cpp server.cpp socket.cpp mapblock.cpp mapsector.cpp heightmap.cpp map.cpp player.cpp utility.cpp main.cpp test.cpp +SOURCE_FILES = mapnode.cpp tile.cpp voxel.cpp mapblockobject.cpp inventory.cpp debug.cpp serialization.cpp light.cpp filesys.cpp connection.cpp environment.cpp client.cpp server.cpp socket.cpp mapblock.cpp mapsector.cpp heightmap.cpp map.cpp player.cpp utility.cpp main.cpp test.cpp SOURCES = $(addprefix src/, $(SOURCE_FILES)) OBJECTS = $(SOURCES:.cpp=.o) FASTTARGET = fasttest diff --git a/data/mud.png b/data/mud.png index 0c6925d3..7cb9c89a 100644 Binary files a/data/mud.png and b/data/mud.png differ diff --git a/data/tree.png b/data/tree.png index 98f6f54d..65abfc24 100644 Binary files a/data/tree.png and b/data/tree.png differ diff --git a/src/client.cpp b/src/client.cpp index 2471558f..bfec8b73 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -68,11 +68,10 @@ void * ClientUpdateThread::Thread() return NULL; } -Client::Client(IrrlichtDevice *device, video::SMaterial *materials, - float delete_unused_sectors_timeout, +Client::Client(IrrlichtDevice *device, const char *playername): m_thread(this), - m_env(new ClientMap(this, materials, + m_env(new ClientMap(this, device->getSceneManager()->getRootSceneNode(), device->getSceneManager(), 666), dout_client), @@ -82,7 +81,6 @@ Client::Client(IrrlichtDevice *device, video::SMaterial *materials, camera_direction(0,0,1), m_server_ser_ver(SER_FMT_VER_INVALID), m_step_dtime(0.0), - m_delete_unused_sectors_timeout(delete_unused_sectors_timeout), m_inventory_updated(false) { //m_fetchblock_mutex.Init(); @@ -193,15 +191,18 @@ void Client::step(float dtime) JMutexAutoLock lock(m_env_mutex); core::list deleted_blocks; + + float delete_unused_sectors_timeout = + g_settings.getFloat("client_delete_unused_sectors_timeout"); // Delete sector blocks /*u32 num = m_env.getMap().deleteUnusedSectors - (m_delete_unused_sectors_timeout, + (delete_unused_sectors_timeout, true, &deleted_blocks);*/ // Delete whole sectors u32 num = m_env.getMap().deleteUnusedSectors - (m_delete_unused_sectors_timeout, + (delete_unused_sectors_timeout, false, &deleted_blocks); if(num > 0) diff --git a/src/client.h b/src/client.h index 65b02a0e..3789f4cb 100644 --- a/src/client.h +++ b/src/client.h @@ -152,9 +152,7 @@ public: /* NOTE: Every public method should be thread-safe */ - Client(IrrlichtDevice *device, video::SMaterial *materials, - float delete_unused_sectors_timeout, - const char *playername); + Client(IrrlichtDevice *device, const char *playername); ~Client(); /* The name of the local player should already be set when @@ -280,8 +278,6 @@ private: float m_step_dtime; JMutex m_step_dtime_mutex; - float m_delete_unused_sectors_timeout; - // This is behind m_env_mutex. bool m_inventory_updated; diff --git a/src/inventory.h b/src/inventory.h index cc6393d4..1fab9d02 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -86,7 +86,8 @@ public: } video::ITexture * getImage() { - return g_materials[m_material].getTexture(0); + u16 tile = content_tile(m_material, v3s16(1,0,0)); + return g_tile_materials[tile].getTexture(0); } std::string getText() { diff --git a/src/main.cpp b/src/main.cpp index b1d88090..49973e99 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -253,7 +253,7 @@ TODO: A mapper to map contents to tile names (for each side) IrrlichtDevice *g_device = NULL; -const char *g_content_filenames[MATERIALS_COUNT] = +/*const char *g_content_filenames[MATERIALS_COUNT] = { "../data/stone.png", "../data/grass.png", @@ -268,7 +268,7 @@ const char *g_content_filenames[MATERIALS_COUNT] = }; // Material cache -video::SMaterial g_materials[MATERIALS_COUNT]; +video::SMaterial g_materials[MATERIALS_COUNT];*/ // Texture cache TextureCache g_texturecache; @@ -1293,7 +1293,7 @@ int main(int argc, char *argv[]) Initialize material array */ - //video::SMaterial g_materials[MATERIALS_COUNT]; + /*//video::SMaterial g_materials[MATERIALS_COUNT]; for(u16 i=0; igetTexture("../data/water.png")); g_mesh_materials[1].setTexture(0, driver->getTexture("../data/grass.png")); @@ -1337,6 +1338,23 @@ int main(int argc, char *argv[]) g_texturecache.set("torch", driver->getTexture("../data/torch.png")); g_texturecache.set("torch_on_floor", driver->getTexture("../data/torch_on_floor.png")); g_texturecache.set("torch_on_ceiling", driver->getTexture("../data/torch_on_ceiling.png")); + + /* + Load tile textures + */ + for(s32 i=0; igetTexture(filename.c_str())); + } + + tile_materials_preload(g_texturecache); /* Make a scope here for the client so that it gets removed @@ -1359,10 +1377,7 @@ int main(int argc, char *argv[]) Create client */ - // TODO: Get rid of the g_materials parameter or it's globalness - Client client(device, g_materials, - g_settings.getFloat("client_delete_unused_sectors_timeout"), - playername); + Client client(device, playername); Address connect_address(0,0,0,0, port); try{ @@ -1396,19 +1411,14 @@ int main(int argc, char *argv[]) /* Create skybox */ - scene::ISceneNode* skybox = smgr->addSkyBoxSceneNode( + scene::ISceneNode* skybox; + skybox = smgr->addSkyBoxSceneNode( driver->getTexture("../data/skybox2.png"), driver->getTexture("../data/skybox3.png"), driver->getTexture("../data/skybox1.png"), driver->getTexture("../data/skybox1.png"), driver->getTexture("../data/skybox1.png"), driver->getTexture("../data/skybox1.png")); - /* driver->getTexture("../data/irrlicht2_up.jpg"), - driver->getTexture("../data/irrlicht2_dn.jpg"), - driver->getTexture("../data/irrlicht2_lf.jpg"), - driver->getTexture("../data/irrlicht2_rt.jpg"), - driver->getTexture("../data/irrlicht2_ft.jpg"), - driver->getTexture("../data/irrlicht2_bk.jpg"));*/ /* Create the camera node diff --git a/src/main.h b/src/main.h index 3d676bd4..6a4b5a09 100644 --- a/src/main.h +++ b/src/main.h @@ -53,8 +53,8 @@ extern std::ostream *derr_server_ptr; // TODO: Move somewhere else? materials.h? // This header is only for MATERIALS_COUNT -#include "mapnode.h" -extern video::SMaterial g_materials[MATERIALS_COUNT]; +//#include "mapnode.h" +//extern video::SMaterial g_materials[MATERIALS_COUNT]; #include "utility.h" extern TextureCache g_texturecache; diff --git a/src/map.cpp b/src/map.cpp index f9adbd00..213404a0 100644 --- a/src/map.cpp +++ b/src/map.cpp @@ -1504,7 +1504,8 @@ MapSector * ServerMap::emergeSector(v2s16 p2d) sector->setHeightmap(p_in_sector, hm); //TODO: Make these values configurable - hm->generateContinued(0.0, 0.0, corners); + //hm->generateContinued(0.0, 0.0, corners); + hm->generateContinued(0.5, 0.2, corners); //hm->generateContinued(1.0, 0.2, corners); //hm->generateContinued(2.0, 0.2, corners); @@ -2755,7 +2756,6 @@ void ServerMap::PrintInfo(std::ostream &out) ClientMap::ClientMap( Client *client, - video::SMaterial *materials, scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id @@ -2763,7 +2763,6 @@ ClientMap::ClientMap( Map(dout_client), scene::ISceneNode(parent, mgr, id), m_client(client), - m_materials(materials), mesh(NULL) { /*m_box = core::aabbox3d(0,0,0, @@ -2837,8 +2836,7 @@ void ClientMap::deSerializeSector(v2s16 p2d, std::istream &is) sector->deSerialize(is); } -void ClientMap::renderMap(video::IVideoDriver* driver, - video::SMaterial *materials, s32 pass) +void ClientMap::renderMap(video::IVideoDriver* driver, s32 pass) { //m_dout<::Iterator - si = m_sectors.getIterator(); - si.atEnd() == false; si++) - { - MapSector *sector = si.getNode()->getValue(); - - if(sector->getId() != MAPSECTOR_CLIENT) - { - dstream<<"WARNING: Client has a non-client sector" - <getPos(); - - if(sp.X < p_blocks_min.X - || sp.X > p_blocks_max.X - || sp.Y < p_blocks_min.Z - || sp.Y > p_blocks_max.Z) - continue; - - /* - Get some ground level info - */ - - s16 a = -5; - - s16 cn[4] = - { - cs->getCorner(0)+a, - cs->getCorner(1)+a, - cs->getCorner(2)+a, - cs->getCorner(3)+a, - }; - s16 cn_avg = (cn[0]+cn[1]+cn[2]+cn[3])/4; - s16 cn_min = 32767; - s16 cn_max = -32768; - for(s16 i=0; i<4; i++) - { - if(cn[i] < cn_min) - cn_min = cn[i]; - if(cn[i] > cn_max) - cn_max = cn[i]; - } - s16 cn_slope = cn_max - cn_min; - - /* - Generate this part of the heightmap mesh - */ - - u8 material; - if(cn_avg + MAP_BLOCKSIZE/4 <= WATER_LEVEL) - material = 0; - else if(cn_slope <= MAP_BLOCKSIZE) - material = 1; - else - material = 2; - - if(material != material_in_use || buf == NULL) - { - // Try to get a meshbuffer associated with the material - buf = (scene::SMeshBuffer*)mesh_new->getMeshBuffer - (g_mesh_materials[material]); - // If not found, create one - if(buf == NULL) - { - // This is a "Standard MeshBuffer", - // it's a typedeffed CMeshBuffer - buf = new scene::SMeshBuffer(); - - // Set material - buf->Material = g_mesh_materials[material]; - // Use VBO - //buf->setHardwareMappingHint(scene::EHM_STATIC); - // Add to mesh - mesh_new->addMeshBuffer(buf); - // Mesh grabbed it - buf->drop(); - } - material_in_use = material; - } - - // Sector side width in floating-point units - f32 sd = BS * MAP_BLOCKSIZE; - // Sector position in global floating-point units - v3f spf = v3f((f32)sp.X, 0, (f32)sp.Y) * sd; - - //video::SColor c(255,255,255,255); - u8 cc = 180; - video::SColor c(255,cc,cc,cc); - - video::S3DVertex vertices[4] = - { - video::S3DVertex(spf.X, (f32)BS*cn[0],spf.Z, 0,0,0, c, 0,1), - video::S3DVertex(spf.X+sd,(f32)BS*cn[1],spf.Z, 0,0,0, c, 1,1), - video::S3DVertex(spf.X+sd,(f32)BS*cn[2],spf.Z+sd,0,0,0, c, 1,0), - video::S3DVertex(spf.X, (f32)BS*cn[3],spf.Z+sd,0,0,0, c, 0,0), - }; - u16 indices[] = {0,1,2,2,3,0}; - - buf->append(vertices, 4, indices, 6); - } - - // Set VBO on - //mesh_new->setHardwareMappingHint(scene::EHM_STATIC); - - /* - Replace the mesh - */ - - mesh_mutex.Lock(); - - scene::SMesh *mesh_old = mesh; - - //DEBUG - /*mesh = NULL; - mesh_new->drop();*/ - mesh = mesh_new; - - mesh_mutex.Unlock(); - - if(mesh_old != NULL) - { - /*dstream<<"mesh_old refcount="<getReferenceCount() - <getMeshBuffer - (g_materials[CONTENT_GRASS]); - if(buf != NULL) - dstream<<"grass buf refcount="<getReferenceCount() - <drop(); - } - else - { - dstream<<"WARNING: There was no old master heightmap mesh"<getVideoDriver(); driver->setTransform(video::ETS_WORLD, AbsoluteTransformation); - renderMap(driver, m_materials, SceneManager->getSceneNodeRenderPass()); + renderMap(driver, SceneManager->getSceneNodeRenderPass()); } virtual const core::aabbox3d& getBoundingBox() const @@ -570,8 +569,7 @@ public: return m_box; } - void renderMap(video::IVideoDriver* driver, - video::SMaterial *materials, s32 pass); + void renderMap(video::IVideoDriver* driver, s32 pass); // Update master heightmap mesh void updateMesh(); @@ -582,8 +580,6 @@ public: private: Client *m_client; - video::SMaterial *m_materials; - core::aabbox3d m_box; // This is the master heightmap mesh diff --git a/src/mapblock.cpp b/src/mapblock.cpp index 4ba597f6..40af0e39 100644 --- a/src/mapblock.cpp +++ b/src/mapblock.cpp @@ -138,6 +138,8 @@ FastFace * MapBlock::makeFastFace(u16 tile, u8 light, v3f p, core::vector2d(0,0)); f->tile = tile; + //DEBUG + //f->tile = TILE_GRASS; return f; } @@ -184,15 +186,30 @@ u8 MapBlock::getFaceLight(v3s16 p, v3s16 face_dir) } /* - Gets node material from any place relative to block. + Gets node tile from any place relative to block. Returns CONTENT_IGNORE if doesn't exist or should not be drawn. */ -u8 MapBlock::getNodeTile(v3s16 p) +u16 MapBlock::getNodeTile(v3s16 p, v3s16 face_dir) { try{ MapNode n = getNodeParent(p); - return content_tile(n.d); + //return content_tile(n.d); + return n.getTile(face_dir); + } + catch(InvalidPositionException &e) + { + //return CONTENT_IGNORE; + return TILE_NONE; + } +} + +u8 MapBlock::getNodeContent(v3s16 p) +{ + try{ + MapNode n = getNodeParent(p); + + return n.d; } catch(InvalidPositionException &e) { @@ -223,15 +240,14 @@ void MapBlock::updateFastFaceRow(v3s16 startpos, v3s16 p = startpos; /* - The light in the air lights the surface is taken from - the node that is air. + Get face light at starting position */ u8 light = getFaceLight(p, face_dir); u16 continuous_tiles_count = 0; - u8 tile0 = getNodeTile(p); - u8 tile1 = getNodeTile(p + face_dir); + u8 tile0 = getNodeTile(p, face_dir); + u8 tile1 = getNodeTile(p + face_dir, -face_dir); for(u16 j=0; jmaterial], f->vertices, 4, indices, 6);*/ - collector.append(g_materials[f->tile], f->vertices, 4, + /*collector.append(g_materials[f->tile], f->vertices, 4, + indices, 6);*/ + collector.append(g_tile_materials[f->tile], f->vertices, 4, indices, 6); } diff --git a/src/mapblock.h b/src/mapblock.h index f725aa1f..b9c5ff22 100644 --- a/src/mapblock.h +++ b/src/mapblock.h @@ -288,7 +288,8 @@ public: u8 getFaceLight(v3s16 p, v3s16 face_dir); - u8 getNodeTile(v3s16 p); + u16 getNodeTile(v3s16 p, v3s16 face_dir); + u8 getNodeContent(v3s16 p); /* startpos: diff --git a/src/mapnode.h b/src/mapnode.h index 77fd677d..b2c499f0 100644 --- a/src/mapnode.h +++ b/src/mapnode.h @@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "utility.h" #include "exceptions.h" #include "serialization.h" +#include "tile.h" // Size of node in rendering units #define BS 10 @@ -64,30 +65,23 @@ with this program; if not, write to the Free Software Foundation, Inc., enum Content { - CONTENT_STONE=0, - - CONTENT_GRASS=1, - - CONTENT_WATER=2, - - CONTENT_LIGHT=3, - - CONTENT_TREE=4, - - CONTENT_LEAVES=5, - - CONTENT_GRASS_FOOTSTEPS=6, - - CONTENT_MESE=7, - - CONTENT_MUD=8, - - CONTENT_OCEAN=9, + CONTENT_STONE, + CONTENT_GRASS, + CONTENT_WATER, + CONTENT_LIGHT, + CONTENT_TREE, + CONTENT_LEAVES, + CONTENT_GRASS_FOOTSTEPS, + CONTENT_MESE, + CONTENT_MUD, + CONTENT_OCEAN, // This is set to the number of the actual values in this enum USEFUL_CONTENT_COUNT }; +extern u16 g_content_tiles[USEFUL_CONTENT_COUNT][6]; + /* If true, the material allows light propagation and brightness is stored in param. @@ -149,18 +143,6 @@ inline bool content_buildable_to(u8 m) return (m == CONTENT_AIR || m == CONTENT_WATER || m == CONTENT_OCEAN); } -/* - TODO: Make a mapper class for mapping every side of a content - to some tile. - This dumbily maps all sides of content to the tile of the same id. -*/ -inline u8 content_tile(u8 c) -{ - if(c == CONTENT_IGNORE || c == CONTENT_LIGHT) - return CONTENT_AIR; - return c; -} - /* Returns true for contents that form the base ground that follows the main heightmap @@ -260,6 +242,34 @@ inline v3s16 unpackDir(u8 b) return d; } +inline u16 content_tile(u8 c, v3s16 dir) +{ + if(c == CONTENT_IGNORE || c == CONTENT_AIR + || c >= USEFUL_CONTENT_COUNT) + return TILE_NONE; + + s32 dir_i = -1; + + if(dir == v3s16(0,1,0)) + dir_i = 0; + else if(dir == v3s16(0,-1,0)) + dir_i = 1; + else if(dir == v3s16(1,0,0)) + dir_i = 2; + else if(dir == v3s16(-1,0,0)) + dir_i = 3; + else if(dir == v3s16(0,0,1)) + dir_i = 4; + else if(dir == v3s16(0,0,-1)) + dir_i = 5; + + /*if(dir_i == -1) + return TILE_NONE;*/ + assert(dir_i != -1); + + return g_content_tiles[c][dir_i]; +} + struct MapNode { // Content @@ -351,6 +361,11 @@ struct MapNode param = a_light; } + u16 getTile(v3s16 dir) + { + return content_tile(d, dir); + } + /* These serialization functions are used when informing client of a single node add diff --git a/src/test.cpp b/src/test.cpp index 91d7c1e4..ce7540e8 100644 --- a/src/test.cpp +++ b/src/test.cpp @@ -321,7 +321,7 @@ struct TestVoxelManipulator v.print(dstream, VOXELPRINT_WATERPRESSURE); - s16 highest_y = -32768; + //s16 highest_y = -32768; /* NOTE: These are commented out because this behaviour is changed all the time @@ -484,8 +484,9 @@ struct TestMapBlock n.d = 4; b.setNode(p, n); assert(b.getNode(p).d == 4); - assert(b.getNodeTile(p) == 4); - assert(b.getNodeTile(v3s16(-1,-1,0)) == 5); + //TODO: Update to new system + /*assert(b.getNodeTile(p) == 4); + assert(b.getNodeTile(v3s16(-1,-1,0)) == 5);*/ /* propagateSunlight() diff --git a/src/utility.h b/src/utility.h index 4c9a2d73..afcb4e41 100644 --- a/src/utility.h +++ b/src/utility.h @@ -24,10 +24,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef UTILITY_HEADER #define UTILITY_HEADER -#include "common_irrlicht.h" -#include "debug.h" -#include "strfnd.h" -#include "exceptions.h" #include #include #include @@ -35,6 +31,11 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include +#include "common_irrlicht.h" +#include "debug.h" +#include "strfnd.h" +#include "exceptions.h" + extern const v3s16 g_26dirs[26]; inline void writeU32(u8 *data, u32 i)