From 6a76c226e10e92c3e3339096f07f8ab065e2098b Mon Sep 17 00:00:00 2001 From: Kahrl Date: Thu, 12 Jan 2012 06:10:39 +0100 Subject: The huge item definition and item namespace unification patch (itemdef), see http://c55.me/minetest/wiki/doku.php?id=changes:itemdef --- src/guiInventoryMenu.cpp | 149 ++++++++++++++++++++++++++++------------------- 1 file changed, 88 insertions(+), 61 deletions(-) (limited to 'src/guiInventoryMenu.cpp') diff --git a/src/guiInventoryMenu.cpp b/src/guiInventoryMenu.cpp index 552e10db2..9b2aed377 100644 --- a/src/guiInventoryMenu.cpp +++ b/src/guiInventoryMenu.cpp @@ -20,6 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "guiInventoryMenu.h" #include "constants.h" +#include "gamedef.h" #include "keycode.h" #include "strfnd.h" #include @@ -28,20 +29,21 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include #include "log.h" -#include "inventorymanager.h" -void drawInventoryItem(video::IVideoDriver *driver, +void drawItemStack(video::IVideoDriver *driver, gui::IGUIFont *font, - InventoryItem *item, core::rect rect, + const ItemStack &item, + const core::rect &rect, const core::rect *clip, - ITextureSource *tsrc) + IGameDef *gamedef) { - if(item == NULL) + if(item.empty()) return; - video::ITexture *texture = NULL; - texture = item->getImage(); + const ItemDefinition &def = item.getDefinition(gamedef->idef()); + video::ITexture *texture = def.inventory_texture; + // Draw the inventory texture if(texture != NULL) { const video::SColor color(255,255,255,255); @@ -51,34 +53,59 @@ void drawInventoryItem(video::IVideoDriver *driver, core::dimension2di(texture->getOriginalSize())), clip, colors, true); } - else + + if(def.type == ITEM_TOOL && item.wear != 0) { - video::SColor bgcolor(255,50,50,128); - driver->draw2DRectangle(bgcolor, rect, clip); + // Draw a progressbar + float barheight = rect.getHeight()/16; + float barpad_x = rect.getWidth()/16; + float barpad_y = rect.getHeight()/16; + core::rect progressrect( + rect.UpperLeftCorner.X + barpad_x, + rect.LowerRightCorner.Y - barpad_y - barheight, + rect.LowerRightCorner.X - barpad_x, + rect.LowerRightCorner.Y - barpad_y); + + // Shrink progressrect by amount of tool damage + float wear = item.wear / 65535.0; + progressrect.LowerRightCorner.X = + wear * progressrect.UpperLeftCorner.X + + (1-wear) * progressrect.LowerRightCorner.X; + + // Compute progressbar color + // wear = 0.0: green + // wear = 0.5: yellow + // wear = 1.0: red + video::SColor color(255,255,255,255); + int wear_i = floor(wear * 511); + wear_i = MYMIN(wear_i + 10, 511); + if(wear_i <= 255) + color.set(255, wear_i, 255, 0); + else + color.set(255, 255, 511-wear_i, 0); + + driver->draw2DRectangle(color, progressrect, clip); } - if(font != NULL) + if(font != NULL && item.count >= 2) { - std::string text = item->getText(); - if(font && text != "") - { - v2u32 dim = font->getDimension(narrow_to_wide(text).c_str()); - v2s32 sdim(dim.X,dim.Y); - - core::rect rect2( - /*rect.UpperLeftCorner, - core::dimension2d(rect.getWidth(), 15)*/ - rect.LowerRightCorner - sdim, - sdim - ); - - video::SColor bgcolor(128,0,0,0); - driver->draw2DRectangle(bgcolor, rect2, clip); - - font->draw(text.c_str(), rect2, - video::SColor(255,255,255,255), false, false, - clip); - } + // Get the item count as a string + std::string text = itos(item.count); + v2u32 dim = font->getDimension(narrow_to_wide(text).c_str()); + v2s32 sdim(dim.X,dim.Y); + + core::rect rect2( + /*rect.UpperLeftCorner, + core::dimension2d(rect.getWidth(), 15)*/ + rect.LowerRightCorner - sdim, + sdim + ); + + video::SColor bgcolor(128,0,0,0); + driver->draw2DRectangle(bgcolor, rect2, clip); + + video::SColor color(255,255,255,255); + font->draw(text.c_str(), rect2, color, false, false, clip); } } @@ -90,15 +117,13 @@ GUIInventoryMenu::GUIInventoryMenu(gui::IGUIEnvironment* env, gui::IGUIElement* parent, s32 id, IMenuManager *menumgr, v2s16 menu_size, - InventoryContext *c, InventoryManager *invmgr, - ITextureSource *tsrc + IGameDef *gamedef ): GUIModalMenu(env, parent, id, menumgr), m_menu_size(menu_size), - m_c(c), m_invmgr(invmgr), - m_tsrc(tsrc) + m_gamedef(gamedef) { m_selected_item = NULL; } @@ -214,15 +239,15 @@ GUIInventoryMenu::ItemSpec GUIInventoryMenu::getItemAtPos(v2s32 p) const core::rect rect = imgrect + s.pos + p0; if(rect.isPointInside(p)) { - return ItemSpec(s.inventoryname, s.listname, i); + return ItemSpec(s.inventoryloc, s.listname, i); } } } - return ItemSpec("", "", -1); + return ItemSpec(InventoryLocation(), "", -1); } -void GUIInventoryMenu::drawList(const ListDrawSpec &s, ITextureSource *tsrc) +void GUIInventoryMenu::drawList(const ListDrawSpec &s) { video::IVideoDriver* driver = Environment->getVideoDriver(); @@ -232,7 +257,7 @@ void GUIInventoryMenu::drawList(const ListDrawSpec &s, ITextureSource *tsrc) if (skin) font = skin->getFont(); - Inventory *inv = m_invmgr->getInventory(m_c, s.inventoryname); + Inventory *inv = m_invmgr->getInventory(s.inventoryloc); assert(inv); InventoryList *ilist = inv->getList(s.listname); @@ -244,7 +269,7 @@ void GUIInventoryMenu::drawList(const ListDrawSpec &s, ITextureSource *tsrc) s32 y = (i/s.geom.X) * spacing.Y; v2s32 p(x,y); core::rect rect = imgrect + s.pos + p; - InventoryItem *item = NULL; + ItemStack item; if(ilist) item = ilist->getItem(i); @@ -278,10 +303,10 @@ void GUIInventoryMenu::drawList(const ListDrawSpec &s, ITextureSource *tsrc) driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect); } - if(item) + if(!item.empty()) { - drawInventoryItem(driver, font, item, - rect, &AbsoluteClippingRect, tsrc); + drawItemStack(driver, font, item, + rect, &AbsoluteClippingRect, m_gamedef); } } @@ -303,8 +328,7 @@ void GUIInventoryMenu::drawMenu() for(u32 i=0; igetInventory(m_c, - m_selected_item->inventoryname); - Inventory *inv_to = m_invmgr->getInventory(m_c, - s.inventoryname); + Inventory *inv_from = m_invmgr->getInventory( + m_selected_item->inventoryloc); + Inventory *inv_to = m_invmgr->getInventory( + s.inventoryloc); assert(inv_from); assert(inv_to); InventoryList *list_from = @@ -373,21 +397,21 @@ bool GUIInventoryMenu::OnEvent(const SEvent& event) // Indicates whether source slot completely empties bool source_empties = false; if(list_from && list_to - && list_from->getItem(m_selected_item->i) != NULL) + && !list_from->getItem(m_selected_item->i).empty()) { infostream<<"Handing IACTION_MOVE to manager"<count = amount; - a->from_inv = m_selected_item->inventoryname; + a->from_inv = m_selected_item->inventoryloc; a->from_list = m_selected_item->listname; a->from_i = m_selected_item->i; - a->to_inv = s.inventoryname; + a->to_inv = s.inventoryloc; a->to_list = s.listname; a->to_i = s.i; //ispec.actions->push_back(a); m_invmgr->inventoryAction(a); - if(list_from->getItem(m_selected_item->i)->getCount()<=amount) + if(list_from->getItem(m_selected_item->i).count<=amount) source_empties = true; } // Remove selection if target was left-clicked or source @@ -401,13 +425,13 @@ bool GUIInventoryMenu::OnEvent(const SEvent& event) else { /* - Select if non-NULL + Select if nonempty */ - Inventory *inv = m_invmgr->getInventory(m_c, - s.inventoryname); + Inventory *inv = m_invmgr->getInventory( + s.inventoryloc); assert(inv); InventoryList *list = inv->getList(s.listname); - if(list->getItem(s.i) != NULL) + if(!list->getItem(s.i).empty()) { m_selected_item = new ItemSpec(s); } @@ -489,7 +513,7 @@ bool GUIInventoryMenu::OnEvent(const SEvent& event) v2s16 GUIInventoryMenu::makeDrawSpecArrayFromString( core::array &draw_spec, const std::string &data, - const std::string ¤t_name) + const InventoryLocation ¤t_location) { v2s16 invsize(8,9); Strfnd f(data); @@ -500,8 +524,11 @@ v2s16 GUIInventoryMenu::makeDrawSpecArrayFromString( if(type == "list") { std::string name = f.next(";"); + InventoryLocation loc; if(name == "current_name") - name = current_name; + loc = current_location; + else + loc.deSerialize(name); std::string subname = f.next(";"); s32 pos_x = stoi(f.next(",")); s32 pos_y = stoi(f.next(";")); @@ -512,7 +539,7 @@ v2s16 GUIInventoryMenu::makeDrawSpecArrayFromString( <<", geom=("< Date: Thu, 12 Jan 2012 08:47:17 +0100 Subject: Tool progress bar tweaking --- src/guiInventoryMenu.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/guiInventoryMenu.cpp') diff --git a/src/guiInventoryMenu.cpp b/src/guiInventoryMenu.cpp index 9b2aed377..f2a644e80 100644 --- a/src/guiInventoryMenu.cpp +++ b/src/guiInventoryMenu.cpp @@ -68,7 +68,7 @@ void drawItemStack(video::IVideoDriver *driver, // Shrink progressrect by amount of tool damage float wear = item.wear / 65535.0; - progressrect.LowerRightCorner.X = + int progressmid = wear * progressrect.UpperLeftCorner.X + (1-wear) * progressrect.LowerRightCorner.X; @@ -77,14 +77,21 @@ void drawItemStack(video::IVideoDriver *driver, // wear = 0.5: yellow // wear = 1.0: red video::SColor color(255,255,255,255); - int wear_i = floor(wear * 511); + int wear_i = MYMIN(floor(wear * 600), 511); wear_i = MYMIN(wear_i + 10, 511); if(wear_i <= 255) color.set(255, wear_i, 255, 0); else color.set(255, 255, 511-wear_i, 0); - driver->draw2DRectangle(color, progressrect, clip); + core::rect progressrect2 = progressrect; + progressrect2.LowerRightCorner.X = progressmid; + driver->draw2DRectangle(color, progressrect2, clip); + + color = video::SColor(255,0,0,0); + progressrect2 = progressrect; + progressrect2.UpperLeftCorner.X = progressmid; + driver->draw2DRectangle(color, progressrect2, clip); } if(font != NULL && item.count >= 2) -- cgit v1.2.3 From c920df748b01f6ecbd98adaf07f6d92c64a7213c Mon Sep 17 00:00:00 2001 From: Kahrl Date: Fri, 13 Jan 2012 12:35:55 +0100 Subject: Inventory menu changes: Tooltips; dragging; drop from menu. Lag is a bit annoying (even in single player). --- data/mods/default/init.lua | 2 +- src/guiInventoryMenu.cpp | 225 ++++++++++++++++++++++++++++++++------------- src/guiInventoryMenu.h | 3 +- src/inventorymanager.cpp | 30 ++++-- 4 files changed, 182 insertions(+), 78 deletions(-) (limited to 'src/guiInventoryMenu.cpp') diff --git a/data/mods/default/init.lua b/data/mods/default/init.lua index 2bd950230..8093e99d5 100644 --- a/data/mods/default/init.lua +++ b/data/mods/default/init.lua @@ -1284,7 +1284,7 @@ minetest.register_node("default:rail", { }) minetest.register_node("default:ladder", { - dsecription = "Ladder", + description = "Ladder", drawtype = "signlike", tile_images = {"default_ladder.png"}, inventory_image = "default_ladder.png", diff --git a/src/guiInventoryMenu.cpp b/src/guiInventoryMenu.cpp index f2a644e80..6e46bd49c 100644 --- a/src/guiInventoryMenu.cpp +++ b/src/guiInventoryMenu.cpp @@ -133,6 +133,7 @@ GUIInventoryMenu::GUIInventoryMenu(gui::IGUIEnvironment* env, m_gamedef(gamedef) { m_selected_item = NULL; + m_tooltip_element = NULL; } GUIInventoryMenu::~GUIInventoryMenu() @@ -163,6 +164,11 @@ void GUIInventoryMenu::removeChildren() if(e != NULL) e->remove(); }*/ + if(m_tooltip_element) + { + m_tooltip_element->remove(); + m_tooltip_element = NULL; + } } void GUIInventoryMenu::regenerateGui(v2u32 screensize) @@ -227,6 +233,17 @@ void GUIInventoryMenu::regenerateGui(v2u32 screensize) const wchar_t *text = L"Left click: Move all items, Right click: Move single item"; Environment->addStaticText(text, rect, false, true, this, 256); + + // Add tooltip + // Note: parent != this so that the tooltip isn't clipped by the menu rectangle + m_tooltip_element = Environment->addStaticText(L"",core::rect(0,0,110,18)); + m_tooltip_element->enableOverrideColor(true); + m_tooltip_element->setBackgroundColor(video::SColor(255,110,130,60)); + m_tooltip_element->setDrawBackground(true); + m_tooltip_element->setDrawBorder(true); + m_tooltip_element->setOverrideColor(video::SColor(255,255,255,255)); + m_tooltip_element->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_CENTER); + m_tooltip_element->setWordWrap(false); } } @@ -254,7 +271,7 @@ GUIInventoryMenu::ItemSpec GUIInventoryMenu::getItemAtPos(v2s32 p) const return ItemSpec(InventoryLocation(), "", -1); } -void GUIInventoryMenu::drawList(const ListDrawSpec &s) +void GUIInventoryMenu::drawList(const ListDrawSpec &s, int phase) { video::IVideoDriver* driver = Environment->getVideoDriver(); @@ -280,40 +297,67 @@ void GUIInventoryMenu::drawList(const ListDrawSpec &s) if(ilist) item = ilist->getItem(i); - if(m_selected_item != NULL && m_selected_item->listname == s.listname - && m_selected_item->i == i) - { - /*s32 border = imgsize.X/12; - driver->draw2DRectangle(video::SColor(255,192,192,192), - core::rect(rect.UpperLeftCorner - v2s32(1,1)*border, - rect.LowerRightCorner + v2s32(1,1)*border), - NULL); - driver->draw2DRectangle(video::SColor(255,0,0,0), - core::rect(rect.UpperLeftCorner - v2s32(1,1)*((border+1)/2), - rect.LowerRightCorner + v2s32(1,1)*((border+1)/2)), - NULL);*/ - s32 border = 2; - driver->draw2DRectangle(video::SColor(255,255,0,0), - core::rect(rect.UpperLeftCorner - v2s32(1,1)*border, - rect.LowerRightCorner + v2s32(1,1)*border), - &AbsoluteClippingRect); - } - - if(rect.isPointInside(m_pointer) && m_selected_item) + bool selected = m_selected_item + && m_invmgr->getInventory(m_selected_item->inventoryloc) == inv + && m_selected_item->listname == s.listname + && m_selected_item->i == i; + bool hovering = rect.isPointInside(m_pointer); + + if(phase == 0) { - video::SColor bgcolor(255,192,192,192); - driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect); + if(hovering && m_selected_item) + { + video::SColor bgcolor(255,192,192,192); + driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect); + } + else + { + video::SColor bgcolor(255,128,128,128); + driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect); + } } - else + + if(phase == 1 && !item.empty()) { - video::SColor bgcolor(255,128,128,128); - driver->draw2DRectangle(bgcolor, rect, &AbsoluteClippingRect); + // Draw item at the normal position if + // - the item is not being dragged or + // /*- the item is in the crafting result slot*/ + if(!selected /*|| s.listname == "craftresult"*/) + { + drawItemStack(driver, font, item, + rect, &AbsoluteClippingRect, m_gamedef); + } } - if(!item.empty()) + if(phase ==2 && !item.empty()) { - drawItemStack(driver, font, item, - rect, &AbsoluteClippingRect, m_gamedef); + // Draw dragged item + if(selected) + { + v2s32 offset = m_pointer - rect.getCenter(); + rect.UpperLeftCorner += offset; + rect.LowerRightCorner += offset; + drawItemStack(driver, font, item, + rect, NULL, m_gamedef); + } + + // Draw tooltip + std::string tooltip_text = ""; + if(hovering && !m_selected_item) + tooltip_text = item.getDefinition(m_gamedef->idef()).description; + if(tooltip_text != "") + { + m_tooltip_element->setVisible(true); + this->bringToFront(m_tooltip_element); + m_tooltip_element->setText(narrow_to_wide(tooltip_text).c_str()); + s32 tooltip_x = m_pointer.X + 15; + s32 tooltip_y = m_pointer.Y + 15; + s32 tooltip_width = m_tooltip_element->getTextWidth() + 15; + s32 tooltip_height = m_tooltip_element->getTextHeight() + 5; + m_tooltip_element->setRelativePosition(core::rect( + core::position2d(tooltip_x, tooltip_y), + core::dimension2d(tooltip_width, tooltip_height))); + } } } @@ -329,13 +373,19 @@ void GUIInventoryMenu::drawMenu() video::SColor bgcolor(140,0,0,0); driver->draw2DRectangle(bgcolor, AbsoluteRect, &AbsoluteClippingRect); + m_tooltip_element->setVisible(false); + /* Draw items + Phase 0: Item slot rectangles + Phase 1: Item images + Phase 2: Dragged item image; tooltip */ + for(int phase=0; phase<=2; phase++) for(u32 i=0; iisValid()); + inv_selected = m_invmgr->getInventory(m_selected_item->inventoryloc); + assert(inv_selected); + } + if(s.isValid()) + { + inv_s = m_invmgr->getInventory(s.inventoryloc); + assert(inv_s); + } + bool different_item = m_selected_item + && ((inv_selected != inv_s) + || (m_selected_item->listname != s.listname) + || (m_selected_item->i != s.i)); + + int amount = -1; + if(event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN) amount = 0; else if(event.MouseInput.Event == EMIE_RMOUSE_PRESSED_DOWN) amount = 1; else if(event.MouseInput.Event == EMIE_MMOUSE_PRESSED_DOWN) amount = 10; - else if(event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP && - m_selected_item && - (m_selected_item->listname != s.listname - || m_selected_item->i != s.i)) + else if(event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP && different_item) amount = 0; - - + //else if(event.MouseInput.Event == EMIE_RMOUSE_LEFT_UP && different_item) + // amount = 1; + //else if(event.MouseInput.Event == EMIE_MMOUSE_LEFT_UP && different_item) + // amount = 10; + if(amount >= 0) { + // Indicates whether source slot should be deselected + bool remove_selection = false; + //infostream<<"Mouse action at p=("<getInventory( - m_selected_item->inventoryloc); - Inventory *inv_to = m_invmgr->getInventory( - s.inventoryloc); + Inventory *inv_from = inv_selected; + Inventory *inv_to = inv_s; assert(inv_from); assert(inv_to); InventoryList *list_from = @@ -401,8 +476,6 @@ bool GUIInventoryMenu::OnEvent(const SEvent& event) infostream<<"from list doesn't exist"<getItem(m_selected_item->i).empty()) { @@ -415,18 +488,10 @@ bool GUIInventoryMenu::OnEvent(const SEvent& event) a->to_inv = s.inventoryloc; a->to_list = s.listname; a->to_i = s.i; - //ispec.actions->push_back(a); m_invmgr->inventoryAction(a); - if(list_from->getItem(m_selected_item->i).count<=amount) - source_empties = true; - } - // Remove selection if target was left-clicked or source - // slot was emptied - if(amount == 0 || source_empties) - { - delete m_selected_item; - m_selected_item = NULL; + if(amount == 0 || list_from->getItem(m_selected_item->i).count<=amount) + remove_selection = true; } } else @@ -434,24 +499,52 @@ bool GUIInventoryMenu::OnEvent(const SEvent& event) /* Select if nonempty */ - Inventory *inv = m_invmgr->getInventory( - s.inventoryloc); - assert(inv); - InventoryList *list = inv->getList(s.listname); - if(!list->getItem(s.i).empty()) + assert(inv_s); + InventoryList *list = inv_s->getList(s.listname); + if(list && !list->getItem(s.i).empty()) { m_selected_item = new ItemSpec(s); } } } - else + else if(m_selected_item) { - if(m_selected_item) + // If moved outside the menu, drop. + // (Otherwise abort inventory action.) + if(getAbsoluteClippingRect().isPointInside(m_pointer)) + { + // Inside menu + remove_selection = true; + } + else { - delete m_selected_item; - m_selected_item = NULL; + // Outside of menu + Inventory *inv_from = inv_selected; + assert(inv_from); + InventoryList *list_from = + inv_from->getList(m_selected_item->listname); + if(list_from == NULL) + infostream<<"from list doesn't exist"<getItem(m_selected_item->i).empty()) + { + infostream<<"Handing IACTION_DROP to manager"<count = amount; + a->from_inv = m_selected_item->inventoryloc; + a->from_list = m_selected_item->listname; + a->from_i = m_selected_item->i; + m_invmgr->inventoryAction(a); + if(amount == 0 || list_from->getItem(m_selected_item->i).count<=amount) + remove_selection = true; + } } } + + if(remove_selection) + { + delete m_selected_item; + m_selected_item = NULL; + } } } if(event.EventType==EET_GUI_EVENT) diff --git a/src/guiInventoryMenu.h b/src/guiInventoryMenu.h index c3b3e5a64..903a8b137 100644 --- a/src/guiInventoryMenu.h +++ b/src/guiInventoryMenu.h @@ -136,7 +136,7 @@ public: void regenerateGui(v2u32 screensize); ItemSpec getItemAtPos(v2s32 p) const; - void drawList(const ListDrawSpec &s); + void drawList(const ListDrawSpec &s, int phase); void drawMenu(); bool OnEvent(const SEvent& event); @@ -161,6 +161,7 @@ protected: ItemSpec *m_selected_item; v2s32 m_pointer; + gui::IGUIStaticText *m_tooltip_element; }; #endif diff --git a/src/inventorymanager.cpp b/src/inventorymanager.cpp index 0149fd9ab..eeb293cb1 100644 --- a/src/inventorymanager.cpp +++ b/src/inventorymanager.cpp @@ -302,18 +302,28 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player) return; } - /* - Drop the item - */ - ItemStack item = list_from->getItem(from_i); - if(scriptapi_item_on_drop(player->getEnv()->getLua(), item, player, + // Take item from source list + ItemStack item1; + if(count == 0) + item1 = list_from->changeItem(from_i, ItemStack()); + else + item1 = list_from->takeItem(from_i, count); + + // Drop the item and apply the returned ItemStack + ItemStack item2 = item1; + if(scriptapi_item_on_drop(player->getEnv()->getLua(), item2, player, player->getBasePosition() + v3f(0,1,0))) { - // Apply returned ItemStack - if(g_settings->getBool("creative_mode") == false - || from_inv.type != InventoryLocation::PLAYER) - list_from->changeItem(from_i, item); - mgr->setInventoryModified(from_inv); + if(g_settings->getBool("creative_mode") == true + && from_inv.type == InventoryLocation::PLAYER) + item2 = item1; // creative mode + + list_from->addItem(from_i, item2); + + // Unless we have put the same amount back as we took in the first place, + // set inventory modified flag + if(item2.count != item1.count) + mgr->setInventoryModified(from_inv); } infostream<<"IDropAction::apply(): dropped " -- cgit v1.2.3 From 1efdc36b22532807d21a0beac94524e3eacfe7bc Mon Sep 17 00:00:00 2001 From: Kahrl Date: Sat, 21 Jan 2012 21:21:41 +0100 Subject: Inventory menu (with dragging) improved. Crafting is now handled via a IACTION_CRAFT inventory action. --- src/game.cpp | 2 +- src/guiInventoryMenu.cpp | 425 ++++++++++++++++++++++++++++++++++------------- src/guiInventoryMenu.h | 5 + src/inventorymanager.cpp | 126 +++++++++++++- src/inventorymanager.h | 40 ++++- src/player.cpp | 20 ++- src/player.h | 2 - src/server.cpp | 220 +++++++----------------- src/server.h | 1 - 9 files changed, 551 insertions(+), 290 deletions(-) (limited to 'src/guiInventoryMenu.cpp') diff --git a/src/game.cpp b/src/game.cpp index 055320a8e..47a0e6afe 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -1310,7 +1310,7 @@ void the_game( "list", inventoryloc, "craft", v2s32(3, 0), v2s32(3, 3))); draw_spec.push_back(GUIInventoryMenu::DrawSpec( - "list", inventoryloc, "craftresult", + "list", inventoryloc, "craftpreview", v2s32(7, 1), v2s32(1, 1))); menu->setDrawSpec(draw_spec); diff --git a/src/guiInventoryMenu.cpp b/src/guiInventoryMenu.cpp index 6e46bd49c..a4b16b251 100644 --- a/src/guiInventoryMenu.cpp +++ b/src/guiInventoryMenu.cpp @@ -133,6 +133,8 @@ GUIInventoryMenu::GUIInventoryMenu(gui::IGUIEnvironment* env, m_gamedef(gamedef) { m_selected_item = NULL; + m_selected_amount = 0; + m_selected_dragging = false; m_tooltip_element = NULL; } @@ -317,28 +319,17 @@ void GUIInventoryMenu::drawList(const ListDrawSpec &s, int phase) } } - if(phase == 1 && !item.empty()) + if(phase == 1) { - // Draw item at the normal position if - // - the item is not being dragged or - // /*- the item is in the crafting result slot*/ - if(!selected /*|| s.listname == "craftresult"*/) + // Draw item stack + if(selected) { - drawItemStack(driver, font, item, - rect, &AbsoluteClippingRect, m_gamedef); + item.takeItem(m_selected_amount); } - } - - if(phase ==2 && !item.empty()) - { - // Draw dragged item - if(selected) + if(!item.empty()) { - v2s32 offset = m_pointer - rect.getCenter(); - rect.UpperLeftCorner += offset; - rect.LowerRightCorner += offset; drawItemStack(driver, font, item, - rect, NULL, m_gamedef); + rect, &AbsoluteClippingRect, m_gamedef); } // Draw tooltip @@ -359,12 +350,38 @@ void GUIInventoryMenu::drawList(const ListDrawSpec &s, int phase) core::dimension2d(tooltip_width, tooltip_height))); } } - } } +void GUIInventoryMenu::drawSelectedItem() +{ + if(!m_selected_item) + return; + + video::IVideoDriver* driver = Environment->getVideoDriver(); + + // Get font + gui::IGUIFont *font = NULL; + gui::IGUISkin* skin = Environment->getSkin(); + if (skin) + font = skin->getFont(); + + Inventory *inv = m_invmgr->getInventory(m_selected_item->inventoryloc); + assert(inv); + InventoryList *list = inv->getList(m_selected_item->listname); + assert(list); + ItemStack stack = list->getItem(m_selected_item->i); + stack.count = m_selected_amount; + + core::rect imgrect(0,0,imgsize.X,imgsize.Y); + core::rect rect = imgrect + (m_pointer - imgrect.getCenter()); + drawItemStack(driver, font, stack, rect, NULL, m_gamedef); +} + void GUIInventoryMenu::drawMenu() { + updateSelectedItem(); + gui::IGUISkin* skin = Environment->getSkin(); if (!skin) return; @@ -378,22 +395,93 @@ void GUIInventoryMenu::drawMenu() /* Draw items Phase 0: Item slot rectangles - Phase 1: Item images - Phase 2: Dragged item image; tooltip + Phase 1: Item images; prepare tooltip */ - for(int phase=0; phase<=2; phase++) + for(int phase=0; phase<=1; phase++) for(u32 i=0; iisValid()) + { + Inventory *inv = m_invmgr->getInventory(m_selected_item->inventoryloc); + if(inv) + { + InventoryList *list = inv->getList(m_selected_item->listname); + if(list && (u32) m_selected_item->i < list->getSize()) + { + ItemStack stack = list->getItem(m_selected_item->i); + if(m_selected_amount > stack.count) + m_selected_amount = stack.count; + if(!stack.empty()) + selection_valid = true; + } + } + } + if(!selection_valid) + { + delete m_selected_item; + m_selected_item = NULL; + m_selected_amount = 0; + m_selected_dragging = false; + } + } + + // If craftresult is nonempty and nothing else is selected, select it now. + if(!m_selected_item) + { + for(u32 i=0; igetInventory(s.inventoryloc); + InventoryList *list = inv->getList("craftresult"); + if(list && list->getSize() >= 1 && !list->getItem(0).empty()) + { + m_selected_item = new ItemSpec; + m_selected_item->inventoryloc = s.inventoryloc; + m_selected_item->listname = "craftresult"; + m_selected_item->i = 0; + m_selected_amount = 0; + m_selected_dragging = false; + break; + } + } + } + } + + // If craftresult is selected, keep the whole stack selected + if(m_selected_item && m_selected_item->listname == "craftresult") + { + Inventory *inv = m_invmgr->getInventory(m_selected_item->inventoryloc); + assert(inv); + InventoryList *list = inv->getList(m_selected_item->listname); + assert(list); + m_selected_amount = list->getItem(m_selected_item->i).count; + } +} + bool GUIInventoryMenu::OnEvent(const SEvent& event) { if(event.EventType==EET_KEY_INPUT_EVENT) @@ -418,133 +506,242 @@ bool GUIInventoryMenu::OnEvent(const SEvent& event) // Mouse event other than movement v2s32 p(event.MouseInput.X, event.MouseInput.Y); + m_pointer = p; + + // Get selected item and hovered/clicked item (s) + + updateSelectedItem(); ItemSpec s = getItemAtPos(p); Inventory *inv_selected = NULL; Inventory *inv_s = NULL; + if(m_selected_item) { - assert(m_selected_item->isValid()); inv_selected = m_invmgr->getInventory(m_selected_item->inventoryloc); assert(inv_selected); + assert(inv_selected->getList(m_selected_item->listname) != NULL); } + + u32 s_count = 0; + if(s.isValid()) { inv_s = m_invmgr->getInventory(s.inventoryloc); assert(inv_s); + + InventoryList *list = inv_s->getList(s.listname); + if(list != NULL && (u32) s.i < list->getSize()) + s_count = list->getItem(s.i).count; + else + s.i = -1; // make it invalid again } - bool different_item = m_selected_item - && ((inv_selected != inv_s) - || (m_selected_item->listname != s.listname) - || (m_selected_item->i != s.i)); - int amount = -1; + // buttons: 0 = left, 1 = right, 2 = middle + // up/down: 0 = down (press), 1 = up (release), 2 = unknown event + int button = 0; + int updown = 2; if(event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN) - amount = 0; + { button = 0; updown = 0; } else if(event.MouseInput.Event == EMIE_RMOUSE_PRESSED_DOWN) - amount = 1; + { button = 1; updown = 0; } else if(event.MouseInput.Event == EMIE_MMOUSE_PRESSED_DOWN) - amount = 10; - else if(event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP && different_item) - amount = 0; - //else if(event.MouseInput.Event == EMIE_RMOUSE_LEFT_UP && different_item) - // amount = 1; - //else if(event.MouseInput.Event == EMIE_MMOUSE_LEFT_UP && different_item) - // amount = 10; - - if(amount >= 0) + { button = 2; updown = 0; } + else if(event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP) + { button = 0; updown = 1; } + else if(event.MouseInput.Event == EMIE_RMOUSE_LEFT_UP) + { button = 1; updown = 1; } + else if(event.MouseInput.Event == EMIE_MMOUSE_LEFT_UP) + { button = 2; updown = 1; } + + // Set this number to a positive value to generate a move action + // from m_selected_item to s. + u32 move_amount = 0; + + // Set this number to a positive value to generate a drop action + // from m_selected_item. + u32 drop_amount = 0; + + // Set this number to a positive value to generate a craft action at s. + u32 craft_amount = 0; + + if(updown == 0) { - // Indicates whether source slot should be deselected - bool remove_selection = false; + // Some mouse button has been pressed - //infostream<<"Mouse action at p=("<getList(m_selected_item->listname); - InventoryList *list_to = - inv_to->getList(s.listname); - if(list_from == NULL) - infostream<<"from list doesn't exist"<getItem(m_selected_item->i).empty()) - { - infostream<<"Handing IACTION_MOVE to manager"<count = amount; - a->from_inv = m_selected_item->inventoryloc; - a->from_list = m_selected_item->listname; - a->from_i = m_selected_item->i; - a->to_inv = s.inventoryloc; - a->to_list = s.listname; - a->to_i = s.i; - m_invmgr->inventoryAction(a); - - if(amount == 0 || list_from->getItem(m_selected_item->i).count<=amount) - remove_selection = true; - } - } - else + // Craft preview has been clicked: craft + craft_amount = (button == 2 ? 10 : 1); + } + else if(m_selected_item == NULL) + { + if(s_count != 0) { - /* - Select if nonempty - */ - assert(inv_s); - InventoryList *list = inv_s->getList(s.listname); - if(list && !list->getItem(s.i).empty()) - { - m_selected_item = new ItemSpec(s); - } + // Non-empty stack has been clicked: select it + m_selected_item = new ItemSpec(s); + + if(button == 1) // right + m_selected_amount = (s_count + 1) / 2; + else if(button == 2) // middle + m_selected_amount = MYMIN(s_count, 10); + else // left + m_selected_amount = s_count; + + m_selected_dragging = true; } } - else if(m_selected_item) + else // m_selected_item != NULL { - // If moved outside the menu, drop. - // (Otherwise abort inventory action.) - if(getAbsoluteClippingRect().isPointInside(m_pointer)) + assert(m_selected_amount >= 1); + + if(s.isValid()) { - // Inside menu - remove_selection = true; + // Clicked another slot: move + if(button == 1) // right + move_amount = 1; + else if(button == 2) // middle + move_amount = MYMIN(m_selected_amount, 10); + else // left + move_amount = m_selected_amount; + } + else if(getAbsoluteClippingRect().isPointInside(m_pointer)) + { + // Clicked somewhere else: deselect + m_selected_amount = 0; } else { - // Outside of menu - Inventory *inv_from = inv_selected; - assert(inv_from); - InventoryList *list_from = - inv_from->getList(m_selected_item->listname); - if(list_from == NULL) - infostream<<"from list doesn't exist"<getItem(m_selected_item->i).empty()) - { - infostream<<"Handing IACTION_DROP to manager"<count = amount; - a->from_inv = m_selected_item->inventoryloc; - a->from_list = m_selected_item->listname; - a->from_i = m_selected_item->i; - m_invmgr->inventoryAction(a); - if(amount == 0 || list_from->getItem(m_selected_item->i).count<=amount) - remove_selection = true; - } + // Clicked outside of the window: drop + if(button == 1) // right + drop_amount = 1; + else if(button == 2) // middle + drop_amount = MYMIN(m_selected_amount, 10); + else // left + drop_amount = m_selected_amount; + } + } + } + else if(updown == 1) + { + // Some mouse button has been released + + //infostream<<"Mouse button "<listname != s.listname) || + (m_selected_item->i != s.i)) + { + // Dragged to different slot: move all selected + move_amount = m_selected_amount; } } + else if(m_selected_item != NULL && m_selected_dragging && + !(getAbsoluteClippingRect().isPointInside(m_pointer))) + { + // Dragged outside of window: drop all selected + drop_amount = m_selected_amount; + } - if(remove_selection) + m_selected_dragging = false; + } + + // Possibly send inventory action to server + if(move_amount > 0) + { + // Send IACTION_MOVE + + assert(m_selected_item && m_selected_item->isValid()); + assert(s.isValid()); + + assert(inv_selected && inv_s); + InventoryList *list_from = inv_selected->getList(m_selected_item->listname); + InventoryList *list_to = inv_s->getList(s.listname); + assert(list_from && list_to); + ItemStack stack_from = list_from->getItem(m_selected_item->i); + ItemStack stack_to = list_to->getItem(s.i); + + // Check how many items can be moved + move_amount = stack_from.count = MYMIN(move_amount, stack_from.count); + ItemStack leftover = stack_to.addItem(stack_from, m_gamedef->idef()); + if(leftover.count == stack_from.count) + { + // Swap the stacks + } + else if(leftover.empty()) + { + // Item fits + } + else { - delete m_selected_item; - m_selected_item = NULL; + // Item only fits partially + move_amount -= leftover.count; } + assert(move_amount > 0 && move_amount <= m_selected_amount); + m_selected_amount -= move_amount; + + infostream<<"Handing IACTION_MOVE to manager"<count = move_amount; + a->from_inv = m_selected_item->inventoryloc; + a->from_list = m_selected_item->listname; + a->from_i = m_selected_item->i; + a->to_inv = s.inventoryloc; + a->to_list = s.listname; + a->to_i = s.i; + m_invmgr->inventoryAction(a); + } + else if(drop_amount > 0) + { + // Send IACTION_DROP + + assert(m_selected_item && m_selected_item->isValid()); + assert(inv_selected); + InventoryList *list_from = inv_selected->getList(m_selected_item->listname); + assert(list_from); + ItemStack stack_from = list_from->getItem(m_selected_item->i); + + // Check how many items can be dropped + drop_amount = stack_from.count = MYMIN(drop_amount, stack_from.count); + assert(drop_amount > 0 && drop_amount <= m_selected_amount); + m_selected_amount -= drop_amount; + + infostream<<"Handing IACTION_DROP to manager"<count = drop_amount; + a->from_inv = m_selected_item->inventoryloc; + a->from_list = m_selected_item->listname; + a->from_i = m_selected_item->i; + m_invmgr->inventoryAction(a); + } + else if(craft_amount > 0) + { + // Send IACTION_CRAFT + + assert(s.isValid()); + assert(inv_s); + + infostream<<"Handing IACTION_CRAFT to manager"<count = craft_amount; + a->craft_inv = s.inventoryloc; + m_invmgr->inventoryAction(a); + } + + // If m_selected_amount has been decreased to zero, deselect + if(m_selected_amount == 0) + { + delete m_selected_item; + m_selected_item = NULL; + m_selected_dragging = false; } } if(event.EventType==EET_GUI_EVENT) diff --git a/src/guiInventoryMenu.h b/src/guiInventoryMenu.h index 903a8b137..ed8df88fc 100644 --- a/src/guiInventoryMenu.h +++ b/src/guiInventoryMenu.h @@ -137,7 +137,9 @@ public: ItemSpec getItemAtPos(v2s32 p) const; void drawList(const ListDrawSpec &s, int phase); + void drawSelectedItem(); void drawMenu(); + void updateSelectedItem(); bool OnEvent(const SEvent& event); @@ -160,6 +162,9 @@ protected: core::array m_draw_spec; ItemSpec *m_selected_item; + u32 m_selected_amount; + bool m_selected_dragging; + v2s32 m_pointer; gui::IGUIStaticText *m_tooltip_element; }; diff --git a/src/inventorymanager.cpp b/src/inventorymanager.cpp index eeb293cb1..b42a80673 100644 --- a/src/inventorymanager.cpp +++ b/src/inventorymanager.cpp @@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "main.h" // for g_settings #include "settings.h" #include "utility.h" +#include "craftdef.h" /* InventoryLocation @@ -124,6 +125,10 @@ InventoryAction * InventoryAction::deSerialize(std::istream &is) { a = new IDropAction(is); } + else if(type == "Craft") + { + a = new ICraftAction(is); + } return a; } @@ -152,7 +157,7 @@ IMoveAction::IMoveAction(std::istream &is) to_i = stoi(ts); } -void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player) +void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGameDef *gamedef) { Inventory *inv_from = mgr->getInventory(from_inv); Inventory *inv_to = mgr->getInventory(to_inv); @@ -273,7 +278,7 @@ IDropAction::IDropAction(std::istream &is) from_i = stoi(ts); } -void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player) +void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGameDef *gamedef) { Inventory *inv_from = mgr->getInventory(from_inv); @@ -332,3 +337,120 @@ void IDropAction::apply(InventoryManager *mgr, ServerActiveObject *player) <<" i="<getInventory(craft_inv); + + if(!inv_craft){ + infostream<<"ICraftAction::apply(): FAIL: inventory not found: " + <<"craft_inv=\""<getList("craft"); + InventoryList *list_craftresult = inv_craft->getList("craftresult"); + + /* + If a list doesn't exist or the source item doesn't exist + */ + if(!list_craft){ + infostream<<"ICraftAction::apply(): FAIL: craft list not found: " + <<"craft_inv=\""<getSize() < 1){ + infostream<<"ICraftAction::apply(): FAIL: craftresult list too short: " + <<"craft_inv=\""<itemFits(0, crafted)) + { + // Decrement input and add crafting output + getCraftingResult(inv_craft, crafted, true, gamedef); + list_craftresult->addItem(0, crafted); + mgr->setInventoryModified(craft_inv); + + actionstream<getDescription() + <<" crafts " + < 1) + count_remaining--; + + // Get next crafting result + found = getCraftingResult(inv_craft, crafted, false, gamedef); + } + + infostream<<"ICraftAction::apply(): crafted " + <<" craft_inv=\""<getList("craft"); + if(!clist || clist->getSize() != 9) + return false; + + // Mangle crafting grid to an another format + CraftInput ci; + ci.method = CRAFT_METHOD_NORMAL; + ci.width = 3; + for(u16 i=0; i<9; i++) + ci.items.push_back(clist->getItem(i)); + + // Find out what is crafted and add it to result item slot + CraftOutput co; + bool found = gamedef->getCraftDefManager()->getCraftResult( + ci, co, decrementInput, gamedef); + if(found) + result.deSerialize(co.item, gamedef->getItemDefManager()); + + if(found && decrementInput) + { + // CraftInput has been changed, apply changes in clist + for(u16 i=0; i<9; i++) + { + clist->changeItem(i, ci.items[i]); + } + } + + return found; +} + diff --git a/src/inventorymanager.h b/src/inventorymanager.h index f6ae4feba..890d05168 100644 --- a/src/inventorymanager.h +++ b/src/inventorymanager.h @@ -92,6 +92,7 @@ public: #define IACTION_MOVE 0 #define IACTION_DROP 1 +#define IACTION_CRAFT 2 struct InventoryAction { @@ -99,7 +100,8 @@ struct InventoryAction virtual u16 getType() const = 0; virtual void serialize(std::ostream &os) const = 0; - virtual void apply(InventoryManager *mgr, ServerActiveObject *player) = 0; + virtual void apply(InventoryManager *mgr, ServerActiveObject *player, + IGameDef *gamedef) = 0; }; struct IMoveAction : public InventoryAction @@ -139,7 +141,7 @@ struct IMoveAction : public InventoryAction os<idef()), inventory_backup(NULL), - craftresult_is_preview(true), hp(20), peer_id(PEER_ID_INEXISTENT), // protected @@ -64,6 +63,7 @@ void Player::resetInventory() inventory.clear(); inventory.addList("main", PLAYER_INVENTORY_SIZE); inventory.addList("craft", 9); + inventory.addList("craftpreview", 1); inventory.addList("craftresult", 1); } @@ -119,7 +119,6 @@ void Player::serialize(std::ostream &os) args.setFloat("pitch", m_pitch); args.setFloat("yaw", m_yaw); args.setV3F("position", m_position); - args.setBool("craftresult_is_preview", craftresult_is_preview); args.setS32("hp", hp); args.writeLines(os); @@ -157,11 +156,10 @@ void Player::deSerialize(std::istream &is) setPitch(args.getFloat("pitch")); setYaw(args.getFloat("yaw")); setPosition(args.getV3F("position")); + bool craftresult_is_preview = true; try{ craftresult_is_preview = args.getBool("craftresult_is_preview"); - }catch(SettingNotFoundException &e){ - craftresult_is_preview = true; - } + }catch(SettingNotFoundException &e){} try{ hp = args.getS32("hp"); }catch(SettingNotFoundException &e){ @@ -169,6 +167,18 @@ void Player::deSerialize(std::istream &is) } inventory.deSerialize(is); + + if(inventory.getList("craftpreview") == NULL) + { + // Convert players without craftpreview + inventory.addList("craftpreview", 1); + + if(craftresult_is_preview) + { + // Clear craftresult + inventory.getList("craftresult")->changeItem(0, ItemStack()); + } + } } #ifndef SERVER diff --git a/src/player.h b/src/player.h index 43f6ee5ec..085a4a15a 100644 --- a/src/player.h +++ b/src/player.h @@ -155,8 +155,6 @@ public: // Actual inventory is backed up here when creative mode is used Inventory *inventory_backup; - bool craftresult_is_preview; - u16 hp; u16 peer_id; diff --git a/src/server.cpp b/src/server.cpp index 9f3db34d9..177551881 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2377,13 +2377,6 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) */ if(a->getType() == IACTION_MOVE) { - InventoryList *rlist = player->inventory.getList("craftresult"); - assert(rlist); - InventoryList *clist = player->inventory.getList("craft"); - assert(clist); - InventoryList *mlist = player->inventory.getList("main"); - assert(mlist); - IMoveAction *ma = (IMoveAction*)a; ma->from_inv.applyCurrentPlayer(player->getName()); @@ -2398,98 +2391,36 @@ void Server::ProcessData(u8 *data, u32 datasize, u16 peer_id) (ma->to_inv.name == player->getName()); /* - Disable moving items into craftresult from elsewhere + Disable moving items out of craftpreview */ - if(to_inv_is_current_player - && ma->to_list == "craftresult" - && (!from_inv_is_current_player - || ma->from_list != "craftresult")) + if(ma->from_list == "craftpreview") { infostream<<"Ignoring IMoveAction from " <<(ma->from_inv.dump())<<":"<from_list <<" to "<<(ma->to_inv.dump())<<":"<to_list - <<" because dst is craftresult" - <<" and src isn't craftresult"<from_list<from_list == "craftresult" - && player->craftresult_is_preview - && g_settings->getBool("creative_mode") == false) + if(ma->to_list == "craftpreview" || ma->to_list == "craftresult") { - ItemStack crafting_result; - bool crafting_possible = GetCraftingResult(peer_id, - crafting_result, false); - - /* - If the craftresult is placed on itself, - crafting takes place and result is moved - into main list. - */ - if(crafting_possible - && to_inv_is_current_player - && ma->to_list == "craftresult") - { - if(mlist->roomForItem(crafting_result)) - { - actionstream<getName() - <<" crafts " - <addItem(crafting_result); - rlist->clearItems(); - player->craftresult_is_preview = true; - srp->m_inventory_not_sent = true; - } - - } - /* - Otherwise, if the destination is part of - the same player's inventory, crafting - takes place normally. - */ - else if(crafting_possible - && to_inv_is_current_player) - { - InventoryList *list = player->inventory.getList(ma->to_list); - if(list && list->itemFits(ma->to_i, crafting_result)) - { - actionstream<getName() - <<" crafts " - <addItem(ma->to_i, crafting_result); - rlist->clearItems(); - player->craftresult_is_preview = true; - srp->m_inventory_not_sent = true; - } - } - - // Do not apply the action normally. + infostream<<"Ignoring IMoveAction from " + <<(ma->from_inv.dump())<<":"<from_list + <<" to "<<(ma->to_inv.dump())<<":"<to_list + <<" because dst is "<to_list<getType() == IACTION_CRAFT) + { + ICraftAction *ca = (ICraftAction*)a; + + ca->craft_inv.applyCurrentPlayer(player->getName()); + + //bool craft_inv_is_current_player = + // (ca->craft_inv.type == InventoryLocation::PLAYER) && + // (ca->craft_inv.name == player->getName()); + + // Disallow crafting if not allowed to interact + if((getPlayerPrivs(player) & PRIV_INTERACT) == 0) + { + infostream<<"Cannot craft: " + <<"No interact privilege"<craft_inv); + if(owner_craft != "" && owner_craft != player->getName()) + { + infostream<<"WARNING: "<getName() + <<" tried to access an inventory that" + <<" belongs to "<apply(this, srp); + a->apply(this, srp, this); // Eat the action delete a; } @@ -4049,95 +4016,24 @@ void Server::RespawnPlayer(Player *player) SendPlayerHP(player); } -bool Server::GetCraftingResult(u16 peer_id, ItemStack &result, bool decrementInput) -{ - DSTACK(__FUNCTION_NAME); - - Player* player = m_env->getPlayer(peer_id); - assert(player); - - // Get the crafting InventoryList of the player in which we will operate - InventoryList *clist = player->inventory.getList("craft"); - assert(clist); - - // Mangle crafting grid to an another format - CraftInput ci; - ci.method = CRAFT_METHOD_NORMAL; - ci.width = 3; - for(u16 i=0; i<9; i++) - { - ci.items.push_back(clist->getItem(i)); - } - - // Find out what is crafted and add it to result item slot - CraftOutput co; - bool found = m_craftdef->getCraftResult(ci, co, decrementInput, this); - if(found) - result.deSerialize(co.item, m_itemdef); - - if(decrementInput) - { - // CraftInput has been changed, apply changes in clist - for(u16 i=0; i<9; i++) - { - clist->changeItem(i, ci.items[i]); - } - } - - return found; -} - void Server::UpdateCrafting(u16 peer_id) { DSTACK(__FUNCTION_NAME); Player* player = m_env->getPlayer(peer_id); assert(player); - ServerRemotePlayer *srp = static_cast(player); + // Get a preview for crafting + ItemStack preview; // No crafting in creative mode - if(g_settings->getBool("creative_mode")) - return; - - // Get the InventoryLists of the player in which we will operate - InventoryList *clist = player->inventory.getList("craft"); - assert(clist); - InventoryList *rlist = player->inventory.getList("craftresult"); - assert(rlist); - InventoryList *mlist = player->inventory.getList("main"); - assert(mlist); - - // If the result list is not a preview and is not empty, try to - // throw the item into main list - if(!player->craftresult_is_preview && rlist->getUsedSlots() != 0) - { - // Grab item out of craftresult - ItemStack item = rlist->changeItem(0, ItemStack()); - // Try to put in main - ItemStack leftover = mlist->addItem(item); - // If there are leftovers, put them back to craftresult - rlist->addItem(leftover); - // Inventory was modified - srp->m_inventory_not_sent = true; - } - - // If result list is empty, we will make it preview what would be - // crafted - if(rlist->getUsedSlots() == 0) - player->craftresult_is_preview = true; - - // If it is a preview, find out what is the crafting result - // and put it in - if(player->craftresult_is_preview) - { - // Clear the possible old preview in it - rlist->clearItems(); - - // Put the new preview in - ItemStack crafting_result; - if(GetCraftingResult(peer_id, crafting_result, false)) - rlist->addItem(crafting_result); - } + if(g_settings->getBool("creative_mode") == false) + getCraftingResult(&player->inventory, preview, false, this); + + // Put the new preview in + InventoryList *plist = player->inventory.getList("craftpreview"); + assert(plist); + assert(plist->getSize() >= 1); + plist->changeItem(0, preview); } RemoteClient* Server::getClient(u16 peer_id) diff --git a/src/server.h b/src/server.h index d979cb518..4fdb60065 100644 --- a/src/server.h +++ b/src/server.h @@ -595,7 +595,6 @@ private: void HandlePlayerHP(Player *player, s16 damage); void RespawnPlayer(Player *player); - bool GetCraftingResult(u16 peer_id, ItemStack &result, bool decrementInput); void UpdateCrafting(u16 peer_id); // When called, connection mutex should be locked -- cgit v1.2.3 From b4dd5d3bd7d2152fdf02e0e7422b1305caf151f2 Mon Sep 17 00:00:00 2001 From: Kahrl Date: Sun, 22 Jan 2012 00:49:02 +0100 Subject: Client-side prediction of inventory changes, and some inventory menu fixes --- src/client.cpp | 40 +++++++++++++++ src/client.h | 2 + src/guiInventoryMenu.cpp | 30 ++++++++--- src/inventory.cpp | 43 ++++++++++++++++ src/inventory.h | 4 ++ src/inventorymanager.cpp | 129 ++++++++++++++++++++++++++++------------------- src/inventorymanager.h | 7 +++ src/server.cpp | 12 +++++ 8 files changed, 210 insertions(+), 57 deletions(-) (limited to 'src/guiInventoryMenu.cpp') diff --git a/src/client.cpp b/src/client.cpp index 602f0cf84..0463aa81c 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -225,6 +225,8 @@ Client::Client( m_server_ser_ver(SER_FMT_VER_INVALID), m_playeritem(0), m_inventory_updated(false), + m_inventory_from_server(NULL), + m_inventory_from_server_age(0.0), m_time_of_day(0), m_map_seed(0), m_password(password), @@ -269,6 +271,8 @@ Client::~Client() m_mesh_update_thread.setRun(false); while(m_mesh_update_thread.IsRunning()) sleep_ms(100); + + delete m_inventory_from_server; } void Client::connect(Address address) @@ -657,6 +661,30 @@ void Client::step(float dtime) } } } + + /* + If the server didn't update the inventory in a while, revert + the local inventory (so the player notices the lag problem + and knows something is wrong). + */ + if(m_inventory_from_server) + { + float interval = 10.0; + float count_before = floor(m_inventory_from_server_age / interval); + + m_inventory_from_server_age += dtime; + + float count_after = floor(m_inventory_from_server_age / interval); + + if(count_after != count_before) + { + // Do this every seconds after TOCLIENT_INVENTORY + // Reset the locally changed inventory to the authoritative inventory + Player *player = m_env.getLocalPlayer(); + player->inventory = *m_inventory_from_server; + m_inventory_updated = true; + } + } } // Virtual methods from con::PeerHandler @@ -975,6 +1003,10 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) m_inventory_updated = true; + delete m_inventory_from_server; + m_inventory_from_server = new Inventory(player->inventory); + m_inventory_from_server_age = 0.0; + //infostream<<"Client got player inventory:"<inventory.print(infostream); } @@ -1931,7 +1963,15 @@ Inventory* Client::getInventory(const InventoryLocation &loc) } void Client::inventoryAction(InventoryAction *a) { + /* + Send it to the server + */ sendInventoryAction(a); + + /* + Predict some local inventory changes + */ + a->clientApply(this, this); } ClientActiveObject * Client::getSelectedActiveObject( diff --git a/src/client.h b/src/client.h index 6d5e5c525..efdf315f7 100644 --- a/src/client.h +++ b/src/client.h @@ -367,6 +367,8 @@ private: u8 m_server_ser_ver; u16 m_playeritem; bool m_inventory_updated; + Inventory *m_inventory_from_server; + float m_inventory_from_server_age; core::map m_active_blocks; PacketCounter m_packetcounter; // Received from the server. 0-23999 diff --git a/src/guiInventoryMenu.cpp b/src/guiInventoryMenu.cpp index a4b16b251..cd371d062 100644 --- a/src/guiInventoryMenu.cpp +++ b/src/guiInventoryMenu.cpp @@ -537,6 +537,11 @@ bool GUIInventoryMenu::OnEvent(const SEvent& event) s.i = -1; // make it invalid again } + bool identical = (m_selected_item != NULL) && s.isValid() && + (inv_selected == inv_s) && + (m_selected_item->listname == s.listname) && + (m_selected_item->i == s.i); + // buttons: 0 = left, 1 = right, 2 = middle // up/down: 0 = down (press), 1 = up (release), 2 = unknown event int button = 0; @@ -602,13 +607,26 @@ bool GUIInventoryMenu::OnEvent(const SEvent& event) if(s.isValid()) { - // Clicked another slot: move + // Clicked a slot: move if(button == 1) // right move_amount = 1; else if(button == 2) // middle move_amount = MYMIN(m_selected_amount, 10); else // left move_amount = m_selected_amount; + dstream << "move_amount=" << move_amount<<"\n"; + dstream << "m_selected_amount=" << m_selected_amount<<"\n"; + + if(identical) + { + if(move_amount >= m_selected_amount) + m_selected_amount = 0; + else + m_selected_amount -= move_amount; + move_amount = 0; + } + dstream << "move_amount=" << move_amount<<"\n"; + dstream << "m_selected_amount=" << m_selected_amount<<"\n"; } else if(getAbsoluteClippingRect().isPointInside(m_pointer)) { @@ -636,9 +654,7 @@ bool GUIInventoryMenu::OnEvent(const SEvent& event) if(m_selected_item != NULL && m_selected_dragging && s.isValid()) { - if((inv_selected != inv_s) || - (m_selected_item->listname != s.listname) || - (m_selected_item->i != s.i)) + if(!identical) { // Dragged to different slot: move all selected move_amount = m_selected_amount; @@ -675,18 +691,19 @@ bool GUIInventoryMenu::OnEvent(const SEvent& event) if(leftover.count == stack_from.count) { // Swap the stacks + m_selected_amount -= stack_to.count; } else if(leftover.empty()) { // Item fits + m_selected_amount -= move_amount; } else { // Item only fits partially move_amount -= leftover.count; + m_selected_amount -= move_amount; } - assert(move_amount > 0 && move_amount <= m_selected_amount); - m_selected_amount -= move_amount; infostream<<"Handing IACTION_MOVE to manager"<addItem(dest_i, item1); + + // If something is returned, the item was not fully added + if(!item1.empty()) + { + // If olditem is returned, nothing was added. + bool nothing_added = (item1.count == oldcount); + + // If something else is returned, part of the item was left unadded. + // Add the other part back to the source item + addItem(i, item1); + + // If olditem is returned, nothing was added. + // Swap the items + if(nothing_added) + { + // Take item from source list + item1 = changeItem(i, ItemStack()); + // Adding was not possible, swap the items. + ItemStack item2 = dest->changeItem(dest_i, item1); + // Put item from destination list to the source list + changeItem(i, item2); + } + } +} + /* Inventory */ diff --git a/src/inventory.h b/src/inventory.h index 3f5d83589..fcac5f647 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -233,6 +233,10 @@ public: // Similar to takeItem, but keeps the slot intact. ItemStack peekItem(u32 i, u32 peekcount) const; + // Move an item to a different list (or a different stack in the same list) + // count is the maximum number of items to move (0 for everything) + void moveItem(u32 i, InventoryList *dest, u32 dest_i, u32 count = 0); + private: std::vector m_items; u32 m_size; diff --git a/src/inventorymanager.cpp b/src/inventorymanager.cpp index b42a80673..b04a1c177 100644 --- a/src/inventorymanager.cpp +++ b/src/inventorymanager.cpp @@ -133,6 +133,10 @@ InventoryAction * InventoryAction::deSerialize(std::istream &is) return a; } +/* + IMoveAction +*/ + IMoveAction::IMoveAction(std::istream &is) { std::string ts; @@ -193,59 +197,13 @@ void IMoveAction::apply(InventoryManager *mgr, ServerActiveObject *player, IGame <<", to_list=\""<getItem(from_i).empty()) - { - infostream<<"IMoveAction::apply(): FAIL: source item not found: " - <<"from_inv=\""<