#include "gettext.h"
#include "log.h"
#include "filesys.h"
-// Needed for writing to signs (CONTENT_SIGN_WALL)
-// TODO: A generic way for handling such should be created
-#include "content_mapnode.h"
-// Needed for sign text input
-// TODO: A generic way for handling such should be created
-#include "content_nodemeta.h"
// Needed for determining pointing to nodes
-#include "mapnode_contentfeatures.h"
+#include "nodedef.h"
+#include "nodemetadata.h"
+#include "main.h" // For g_settings
+#include "content_mapnode.h" // For content_mapnode_init
+#include "tooldef.h"
+#include "content_mapnode.h" // Default nodes
+#include "tile.h" // For TextureSource
/*
Setting this to 1 enables a special camera mode that forces
Client *m_client;
};
-struct TextDestSignNode : public TextDest
+struct TextDestNodeMetadata : public TextDest
{
- TextDestSignNode(v3s16 p, Client *client)
+ TextDestNodeMetadata(v3s16 p, Client *client)
{
m_p = p;
m_client = client;
Hotbar draw routine
*/
void draw_hotbar(video::IVideoDriver *driver, gui::IGUIFont *font,
+ ITextureSource *tsrc,
v2s32 centerlowerpos, s32 imgsize, s32 itemcount,
Inventory *inventory, s32 halfheartcount)
{
if(item != NULL)
{
- drawInventoryItem(driver, font, item, rect, NULL);
+ drawInventoryItem(driver, font, item, rect, NULL, tsrc);
}
}
/*
Draw hearts
*/
+ video::ITexture *heart_texture = tsrc->getTextureRaw("heart.png");
+ if(heart_texture)
{
- video::ITexture *heart_texture =
- driver->getTexture(getTexturePath("heart.png").c_str());
v2s32 p = pos + v2s32(0, -20);
for(s32 i=0; i<halfheartcount/2; i++)
{
try
{
n = client->getNode(v3s16(x,y,z));
- if(content_pointable(n.getContent()) == false)
+ if(client->getNodeDefManager()->get(n).pointable == false)
continue;
}
catch(InvalidPositionException &e)
v3s16(-1,0,0), // left
};
- ContentFeatures &f = content_features(n);
+ const ContentFeatures &f = client->getNodeDefManager()->get(n);
if(f.selection_box.type == NODEBOX_FIXED)
{
- f32 distance = (npf - camera_position).getLength();
-
core::aabbox3d<f32> box = f.selection_box.fixed;
box.MinEdge += npf;
box.MaxEdge += npf;
- if(distance < mindistance)
+ v3s16 facedirs[6] = {
+ v3s16(-1,0,0),
+ v3s16(1,0,0),
+ v3s16(0,-1,0),
+ v3s16(0,1,0),
+ v3s16(0,0,-1),
+ v3s16(0,0,1),
+ };
+
+ core::aabbox3d<f32> faceboxes[6] = {
+ // X-
+ core::aabbox3d<f32>(
+ box.MinEdge.X, box.MinEdge.Y, box.MinEdge.Z,
+ box.MinEdge.X+d, box.MaxEdge.Y, box.MaxEdge.Z
+ ),
+ // X+
+ core::aabbox3d<f32>(
+ box.MaxEdge.X-d, box.MinEdge.Y, box.MinEdge.Z,
+ box.MaxEdge.X, box.MaxEdge.Y, box.MaxEdge.Z
+ ),
+ // Y-
+ core::aabbox3d<f32>(
+ box.MinEdge.X, box.MinEdge.Y, box.MinEdge.Z,
+ box.MaxEdge.X, box.MinEdge.Y+d, box.MaxEdge.Z
+ ),
+ // Y+
+ core::aabbox3d<f32>(
+ box.MinEdge.X, box.MaxEdge.Y-d, box.MinEdge.Z,
+ box.MaxEdge.X, box.MaxEdge.Y, box.MaxEdge.Z
+ ),
+ // Z-
+ core::aabbox3d<f32>(
+ box.MinEdge.X, box.MinEdge.Y, box.MinEdge.Z,
+ box.MaxEdge.X, box.MaxEdge.Y, box.MinEdge.Z+d
+ ),
+ // Z+
+ core::aabbox3d<f32>(
+ box.MinEdge.X, box.MinEdge.Y, box.MaxEdge.Z-d,
+ box.MaxEdge.X, box.MaxEdge.Y, box.MaxEdge.Z
+ ),
+ };
+
+ for(u16 i=0; i<6; i++)
{
- if(box.intersectsWithLine(shootline))
- {
- nodefound = true;
- nodepos = np;
- neighbourpos = np;
- mindistance = distance;
- nodehilightbox = box;
- }
+ v3f facedir_f(facedirs[i].X, facedirs[i].Y, facedirs[i].Z);
+ v3f centerpoint = npf + facedir_f * BS/2;
+ f32 distance = (centerpoint - camera_position).getLength();
+ if(distance >= mindistance)
+ continue;
+ if(!faceboxes[i].intersectsWithLine(shootline))
+ continue;
+ nodefound = true;
+ nodepos = np;
+ neighbourpos = np+facedirs[i];
+ mindistance = distance;
+ nodehilightbox = box;
}
}
else if(f.selection_box.type == NODEBOX_WALLMOUNTED)
} // for coords
}
-void update_skybox(video::IVideoDriver* driver,
+void update_skybox(video::IVideoDriver* driver, ITextureSource *tsrc,
scene::ISceneManager* smgr, scene::ISceneNode* &skybox,
float brightness)
{
if(brightness >= 0.5)
{
skybox = smgr->addSkyBoxSceneNode(
- driver->getTexture(getTexturePath("skybox2.png").c_str()),
- driver->getTexture(getTexturePath("skybox3.png").c_str()),
- driver->getTexture(getTexturePath("skybox1.png").c_str()),
- driver->getTexture(getTexturePath("skybox1.png").c_str()),
- driver->getTexture(getTexturePath("skybox1.png").c_str()),
- driver->getTexture(getTexturePath("skybox1.png").c_str()));
+ tsrc->getTextureRaw("skybox2.png"),
+ tsrc->getTextureRaw("skybox3.png"),
+ tsrc->getTextureRaw("skybox1.png"),
+ tsrc->getTextureRaw("skybox1.png"),
+ tsrc->getTextureRaw("skybox1.png"),
+ tsrc->getTextureRaw("skybox1.png"));
}
else if(brightness >= 0.2)
{
skybox = smgr->addSkyBoxSceneNode(
- driver->getTexture(getTexturePath("skybox2_dawn.png").c_str()),
- driver->getTexture(getTexturePath("skybox3_dawn.png").c_str()),
- driver->getTexture(getTexturePath("skybox1_dawn.png").c_str()),
- driver->getTexture(getTexturePath("skybox1_dawn.png").c_str()),
- driver->getTexture(getTexturePath("skybox1_dawn.png").c_str()),
- driver->getTexture(getTexturePath("skybox1_dawn.png").c_str()));
+ tsrc->getTextureRaw("skybox2_dawn.png"),
+ tsrc->getTextureRaw("skybox3_dawn.png"),
+ tsrc->getTextureRaw("skybox1_dawn.png"),
+ tsrc->getTextureRaw("skybox1_dawn.png"),
+ tsrc->getTextureRaw("skybox1_dawn.png"),
+ tsrc->getTextureRaw("skybox1_dawn.png"));
}
else
{
skybox = smgr->addSkyBoxSceneNode(
- driver->getTexture(getTexturePath("skybox2_night.png").c_str()),
- driver->getTexture(getTexturePath("skybox3_night.png").c_str()),
- driver->getTexture(getTexturePath("skybox1_night.png").c_str()),
- driver->getTexture(getTexturePath("skybox1_night.png").c_str()),
- driver->getTexture(getTexturePath("skybox1_night.png").c_str()),
- driver->getTexture(getTexturePath("skybox1_night.png").c_str()));
+ tsrc->getTextureRaw("skybox2_night.png"),
+ tsrc->getTextureRaw("skybox3_night.png"),
+ tsrc->getTextureRaw("skybox1_night.png"),
+ tsrc->getTextureRaw("skybox1_night.png"),
+ tsrc->getTextureRaw("skybox1_night.png"),
+ tsrc->getTextureRaw("skybox1_night.png"));
}
}
draw_load_screen(L"Loading...", driver, font);
+ // Create tool definition manager
+ IWritableToolDefManager *tooldef = createToolDefManager();
+ // Create texture source
+ IWritableTextureSource *tsrc = createTextureSource(device);
+ // Create node definition manager
+ IWritableNodeDefManager *nodedef = createNodeDefManager();
+
+ // Fill node feature table with default definitions
+ content_mapnode_init(nodedef);
+
/*
Create server.
SharedPtr will delete it when it goes out of scope.
server = new Server(map_dir, configpath);
server->start(port);
}
+
+ { // Client scope
/*
Create client
draw_load_screen(L"Creating client...", driver, font);
infostream<<"Creating client"<<std::endl;
+
MapDrawControl draw_control;
- Client client(device, playername.c_str(), password, draw_control);
+
+ Client client(device, playername.c_str(), password, draw_control,
+ tsrc, tooldef, nodedef);
+
+ // Client acts as our GameDef
+ IGameDef *gamedef = &client;
draw_load_screen(L"Resolving address...", driver, font);
Address connect_address(0,0,0,0, port);
*/
float old_brightness = 1.0;
scene::ISceneNode* skybox = NULL;
- update_skybox(driver, smgr, skybox, 1.0);
+ update_skybox(driver, tsrc, smgr, skybox, 1.0);
/*
Create the camera node
// A test
//throw con::PeerNotFoundException("lol");
+ float brightness = 1.0;
+
core::list<float> frametime_log;
float nodig_delay_counter = 0.0;
/*
Process TextureSource's queue
*/
- ((TextureSource*)g_texturesource)->processQueue();
+ tsrc->processQueue();
/*
Random calculations
new GUIInventoryMenu(guienv, guiroot, -1,
&g_menumgr, v2s16(8,7),
client.getInventoryContext(),
- &client);
+ &client, tsrc);
core::array<GUIInventoryMenu::DrawSpec> draw_spec;
draw_spec.push_back(GUIInventoryMenu::DrawSpec(
player->setPosition(player->getPosition() + v3f(0,-BS,0));
camera.update(player, busytime, screensize);*/
}
+ else if(event.type == CE_TEXTURES_UPDATED)
+ {
+ update_skybox(driver, tsrc, smgr, skybox, brightness);
+ }
}
}
// Get digging properties for material and tool
content_t material = n.getContent();
+ ToolDiggingProperties tp =
+ tooldef->getDiggingProperties(toolname);
DiggingProperties prop =
- getDiggingProperties(material, toolname);
+ getDiggingProperties(material, &tp, nodedef);
float dig_time_complete = 0.0;
new GUIInventoryMenu(guienv, guiroot, -1,
&g_menumgr, invsize,
client.getInventoryContext(),
- &client);
+ &client, tsrc);
menu->setDrawSpec(draw_spec);
menu->drop();
}
- else if(meta && meta->typeId() == CONTENT_SIGN_WALL && !random_input)
+ // If metadata provides text input, activate text input
+ else if(meta && meta->allowsTextInput() && !random_input)
{
- infostream<<"Sign node right-clicked"<<std::endl;
-
- SignNodeMetadata *signmeta = (SignNodeMetadata*)meta;
+ infostream<<"Launching metadata text input"<<std::endl;
// Get a new text for it
- TextDest *dest = new TextDestSignNode(nodepos, &client);
+ TextDest *dest = new TextDestNodeMetadata(nodepos, &client);
- std::wstring wtext =
- narrow_to_wide(signmeta->getText());
+ std::wstring wtext = narrow_to_wide(meta->getText());
(new GUITextInputMenu(guienv, guiroot, -1,
&g_menumgr, dest,
wtext))->drop();
}
+ // Otherwise report right click to server
else
{
client.groundAction(1, nodepos, neighbourpos, g_selected_item);
/*
Calculate stuff for drawing
*/
-
+
+ /*
+ Calculate general brightness
+ */
u32 daynight_ratio = client.getDayNightRatio();
- u8 l = decode_light((daynight_ratio * LIGHT_SUN) / 1000);
+ u8 light8 = decode_light((daynight_ratio * LIGHT_SUN) / 1000);
+ brightness = (float)light8/255.0;
video::SColor bgcolor = video::SColor(
255,
- bgcolor_bright.getRed() * l / 255,
- bgcolor_bright.getGreen() * l / 255,
- bgcolor_bright.getBlue() * l / 255);
- /*skycolor.getRed() * l / 255,
- skycolor.getGreen() * l / 255,
- skycolor.getBlue() * l / 255);*/
-
- float brightness = (float)l/255.0;
+ bgcolor_bright.getRed() * brightness,
+ bgcolor_bright.getGreen() * brightness,
+ bgcolor_bright.getBlue() * brightness);
+ /*skycolor.getRed() * brightness,
+ skycolor.getGreen() * brightness,
+ skycolor.getBlue() * brightness);*/
/*
Update skybox
*/
if(fabs(brightness - old_brightness) > 0.01)
- update_skybox(driver, smgr, skybox, brightness);
+ update_skybox(driver, tsrc, smgr, skybox, brightness);
/*
Update clouds
InventoryItem *item = NULL;
if(mlist != NULL)
item = mlist->getItem(g_selected_item);
- camera.wield(item);
+ camera.wield(item, gamedef);
}
/*
Draw hotbar
*/
{
- draw_hotbar(driver, font, v2s32(displaycenter.X, screensize.Y),
+ draw_hotbar(driver, font, tsrc,
+ v2s32(displaycenter.X, screensize.Y),
hotbar_imagesize, hotbar_itemcount, &local_inventory,
client.getHP());
}
driver->endScene();
gui_shuttingdowntext->remove();*/
}
+
+ } // Client scope (must be destructed before destructing *def and tsrc
+
+ delete tooldef;
+ delete tsrc;
+ delete nodedef;
}