+ - + diff -r 10b5f7f36dd4 -r 51cc05d862f2 clients/rio_de_hola/maps/tourist_beach.xml --- a/clients/rio_de_hola/maps/tourist_beach.xml Wed Jun 03 19:29:52 2009 +0000 +++ b/clients/rio_de_hola/maps/tourist_beach.xml Mon Jun 08 16:00:02 2009 +0000 @@ -4792,8 +4792,8 @@ - + - + diff -r 10b5f7f36dd4 -r 51cc05d862f2 clients/rio_de_hola/scripts/world.py --- a/clients/rio_de_hola/scripts/world.py Wed Jun 03 19:29:52 2009 +0000 +++ b/clients/rio_de_hola/scripts/world.py Mon Jun 08 16:00:02 2009 +0000 @@ -172,8 +172,14 @@ For this techdemo two cameras are used. One follows the hero(!) via 'attach' the other one scrolls around a bit (see the pump function). """ + camera_prefix = self.filename.rpartition('.')[0] # Remove file extension + camera_prefix = camera_prefix.rpartition('/')[2] # Remove path + camera_prefix += '_' + for cam in self.view.getCameras(): - self.cameras[cam.getId()] = cam + camera_id = cam.getId().replace(camera_prefix, '') + self.cameras[camera_id] = cam + self.cameras['main'].attach(self.hero.agent) self.view.resetRenderers() diff -r 10b5f7f36dd4 -r 51cc05d862f2 engine/core/gui/guimanager.cpp --- a/engine/core/gui/guimanager.cpp Wed Jun 03 19:29:52 2009 +0000 +++ b/engine/core/gui/guimanager.cpp Mon Jun 08 16:00:02 2009 +0000 @@ -25,6 +25,7 @@ // 3rd party library includes #include #include +#include #include #include @@ -41,6 +42,7 @@ #include "video/fonts/fontbase.h" #include "video/fonts/truetypefont.h" #include "video/fonts/subimagefont.h" +#include "eventchannel/key/ec_key.h" #include "eventchannel/key/ec_keyevent.h" #include "eventchannel/mouse/ec_mouseevent.h" @@ -238,7 +240,13 @@ keyevt.setAltPressed(gcnevt.isAltPressed()); keyevt.setMetaPressed(gcnevt.isMetaPressed()); keyevt.setNumericPad(gcnevt.isNumericPad()); - keyevt.setKey(Key(static_cast(gcnevt.getKey().getValue()), gcnevt.getKey().getValue())); + + // Convert from guichan keyval to FIFE keyval + int keyval = gcnevt.getKey().getValue(); + keyval = convertGuichanKeyToFifeKey(keyval); + + keyevt.setKey(Key(static_cast(keyval), keyval)); + return keyevt; } @@ -300,4 +308,162 @@ return mouseevt; } + + int GUIManager::convertGuichanKeyToFifeKey(int value) { + + switch (value) { + case gcn::Key::TAB: + value = Key::TAB; + break; + case gcn::Key::LEFT_ALT: + value = Key::LEFT_ALT; + break; + case gcn::Key::RIGHT_ALT: + value = Key::RIGHT_ALT; + break; + case gcn::Key::LEFT_SHIFT: + value = Key::LEFT_SHIFT; + break; + case gcn::Key::RIGHT_SHIFT: + value = Key::RIGHT_SHIFT; + break; + case gcn::Key::LEFT_CONTROL: + value = Key::LEFT_CONTROL; + break; + case gcn::Key::RIGHT_CONTROL: + value = Key::RIGHT_CONTROL; + break; + case gcn::Key::BACKSPACE: + value = Key::BACKSPACE; + break; + case gcn::Key::PAUSE: + value = Key::PAUSE; + break; + case gcn::Key::SPACE: + value = Key::SPACE; + break; + case gcn::Key::ESCAPE: + value = Key::ESCAPE; + break; + case gcn::Key::DELETE: + value = Key::DELETE; + break; + case gcn::Key::INSERT: + value = Key::INSERT; + break; + case gcn::Key::HOME: + value = Key::HOME; + break; + case gcn::Key::END: + value = Key::END; + break; + case gcn::Key::PAGE_UP: + value = Key::PAGE_UP; + break; + case gcn::Key::PRINT_SCREEN: + value = Key::PRINT_SCREEN; + break; + case gcn::Key::PAGE_DOWN: + value = Key::PAGE_DOWN; + break; + case gcn::Key::F1: + value = Key::F1; + break; + case gcn::Key::F2: + value = Key::F2; + break; + case gcn::Key::F3: + value = Key::F3; + break; + case gcn::Key::F4: + value = Key::F4; + break; + case gcn::Key::F5: + value = Key::F5; + break; + case gcn::Key::F6: + value = Key::F6; + break; + case gcn::Key::F7: + value = Key::F7; + break; + case gcn::Key::F8: + value = Key::F8; + break; + case gcn::Key::F9: + value = Key::F9; + break; + case gcn::Key::F10: + value = Key::F10; + break; + case gcn::Key::F11: + value = Key::F11; + break; + case gcn::Key::F12: + value = Key::F12; + break; + case gcn::Key::F13: + value = Key::F13; + break; + case gcn::Key::F14: + value = Key::F14; + break; + case gcn::Key::F15: + value = Key::F15; + break; + case gcn::Key::NUM_LOCK: + value = Key::NUM_LOCK; + break; + case gcn::Key::CAPS_LOCK: + value = Key::CAPS_LOCK; + break; + case gcn::Key::SCROLL_LOCK: + value = Key::SCROLL_LOCK; + break; + case gcn::Key::RIGHT_META: + value = Key::RIGHT_META; + break; + case gcn::Key::LEFT_META: + value = Key::LEFT_META; + break; + case gcn::Key::LEFT_SUPER: + value = Key::LEFT_SUPER; + break; + case gcn::Key::RIGHT_SUPER: + value = Key::RIGHT_SUPER; + break; + case gcn::Key::ALT_GR: + value = Key::ALT_GR; + break; + case gcn::Key::UP: + value = Key::UP; + break; + case gcn::Key::DOWN: + value = Key::DOWN; + break; + case gcn::Key::LEFT: + value = Key::LEFT; + break; + case gcn::Key::RIGHT: + value = Key::RIGHT; + break; + case gcn::Key::ENTER: + value = Key::ENTER; + break; + + default: + // Convert from unicode to lowercase letters + if (value >= 1 && value <= 26) { + // Control characters + value = value - 1 + 'a'; + } else if (value >= 'A' && value <= 'Z') { + value = value - 'A' + 'a'; + } + + // FIXME: Accented characters (�) will not get converted properly. + break; + } + + return value; + } } diff -r 10b5f7f36dd4 -r 51cc05d862f2 engine/core/gui/guimanager.h --- a/engine/core/gui/guimanager.h Wed Jun 03 19:29:52 2009 +0000 +++ b/engine/core/gui/guimanager.h Mon Jun 08 16:00:02 2009 +0000 @@ -141,6 +141,9 @@ KeyEvent translateKeyEvent(const gcn::KeyEvent& evt); MouseEvent translateMouseEvent(const gcn::MouseEvent& evt); + protected: + int convertGuichanKeyToFifeKey(int value); + private: // The Guichan GUI. gcn::Gui* m_gcn_gui; diff -r 10b5f7f36dd4 -r 51cc05d862f2 engine/core/gui/widgets/clicklabel.cpp --- a/engine/core/gui/widgets/clicklabel.cpp Wed Jun 03 19:29:52 2009 +0000 +++ b/engine/core/gui/widgets/clicklabel.cpp Mon Jun 08 16:00:02 2009 +0000 @@ -88,6 +88,8 @@ int textX = 0; int textY = 0; + graphics->setColor(getBackgroundColor()); + graphics->fillRectangle(Rectangle(1, 1, getDimension().width-1, getHeight() - 1)); if (mGuiFont) { if( isTextWrapping() ) { mGuiFont->drawMultiLineString(graphics, mWrappedText, textX, textY); diff -r 10b5f7f36dd4 -r 51cc05d862f2 engine/core/gui/widgets/togglebutton.cpp --- a/engine/core/gui/widgets/togglebutton.cpp Wed Jun 03 19:29:52 2009 +0000 +++ b/engine/core/gui/widgets/togglebutton.cpp Mon Jun 08 16:00:02 2009 +0000 @@ -181,6 +181,12 @@ w = std::max(m_hoverImage->getWidth(), w); h = std::max(m_hoverImage->getHeight(), h); } + + if( mCaption.length() > 0 ) { + w = std::max(static_cast(getFont()->getWidth(mCaption)+2*mSpacing), w); + h = std::max(static_cast(getFont()->getHeight()+2*mSpacing), h); + } + setWidth(w); setHeight(h); } diff -r 10b5f7f36dd4 -r 51cc05d862f2 engine/core/gui/widgets/togglebutton.h --- a/engine/core/gui/widgets/togglebutton.h Wed Jun 03 19:29:52 2009 +0000 +++ b/engine/core/gui/widgets/togglebutton.h Mon Jun 08 16:00:02 2009 +0000 @@ -68,7 +68,7 @@ void draw(Graphics *graphics); /** - * Adjust size to fit image + * Adjust size to fit image and caption */ void adjustSize(); diff -r 10b5f7f36dd4 -r 51cc05d862f2 engine/core/gui/widgets/widgets.i --- a/engine/core/gui/widgets/widgets.i Wed Jun 03 19:29:52 2009 +0000 +++ b/engine/core/gui/widgets/widgets.i Mon Jun 08 16:00:02 2009 +0000 @@ -209,6 +209,8 @@ virtual const std::string& getCaption() const; virtual void setAlignment(Graphics::Alignment alignment); virtual Graphics::Alignment getAlignment() const; + void setSpacing(unsigned int spacing); + unsigned int getSpacing() const; void setUpImage(Image* image); void setDownImage(Image* image); void setHoverImage(Image* image); diff -r 10b5f7f36dd4 -r 51cc05d862f2 engine/core/model/structures/layer.cpp --- a/engine/core/model/structures/layer.cpp Wed Jun 03 19:29:52 2009 +0000 +++ b/engine/core/model/structures/layer.cpp Mon Jun 08 16:00:02 2009 +0000 @@ -145,6 +145,25 @@ return matching_instances; } + std::vector Layer::getInstancesAt(Location& loc, bool use_exactcoordinates) { + std::vector matching_instances; + std::vector::iterator it = m_instances.begin(); + + for(; it != m_instances.end(); ++it) { + if (use_exactcoordinates) { + if ((*it)->getLocationRef().getExactLayerCoordinatesRef() == loc.getExactLayerCoordinatesRef()) { + matching_instances.push_back(*it); + } + } else { + if ((*it)->getLocationRef().getLayerCoordinates() == loc.getLayerCoordinates()) { + matching_instances.push_back(*it); + } + } + } + + return matching_instances; + } + void Layer::getMinMaxCoordinates(ModelCoordinate& min, ModelCoordinate& max, const Layer* layer) const { if (!layer) { layer = this; diff -r 10b5f7f36dd4 -r 51cc05d862f2 engine/core/model/structures/layer.h --- a/engine/core/model/structures/layer.h Wed Jun 03 19:29:52 2009 +0000 +++ b/engine/core/model/structures/layer.h Mon Jun 08 16:00:02 2009 +0000 @@ -149,6 +149,12 @@ */ std::vector getInstances(const std::string& id); + /** Returns instances that match given location. + * @param loc location where to fetch instances from + * @param use_exactcoordinates if true, comparison is done using exact coordinates. if not, cell coordinates are used + */ + std::vector getInstancesAt(Location& loc, bool use_exactcoordinates=false); + /** Get the first instance on this layer with the given identifier. */ Instance* getInstance(const std::string& identifier); diff -r 10b5f7f36dd4 -r 51cc05d862f2 engine/core/model/structures/layer.i --- a/engine/core/model/structures/layer.i Wed Jun 03 19:29:52 2009 +0000 +++ b/engine/core/model/structures/layer.i Mon Jun 08 16:00:02 2009 +0000 @@ -71,6 +71,7 @@ const std::vector& getInstances() const; std::vector getInstances(const std::string& identifier); + std::vector getInstancesAt(Location& loc, bool use_exactcoordinates=false); Instance* getInstance(const std::string& id); void setInstancesVisible(bool vis); diff -r 10b5f7f36dd4 -r 51cc05d862f2 engine/core/util/time/timemanager.cpp --- a/engine/core/util/time/timemanager.cpp Wed Jun 03 19:29:52 2009 +0000 +++ b/engine/core/util/time/timemanager.cpp Mon Jun 08 16:00:02 2009 +0000 @@ -68,7 +68,7 @@ // It is very important to NOT use iterators (over a vector) // here, as an event might add enough events to resize the vector. // -> Ugly segfault - for (size_t i = 0; i != m_events_list.size(); ++i) { + for (size_t i = 0; i < m_events_list.size(); ++i) { TimeEvent* event = m_events_list[ i ]; if( event ) { event->managerUpdateEvent(m_current_time); @@ -88,10 +88,10 @@ void TimeManager::unregisterEvent(TimeEvent* event) { // Unregister. - std::vector::iterator i = m_events_list.begin(); - for(; i != m_events_list.end(); ++i) { - if( (*i) == event ) { - *i = 0; + for (size_t i = 0; i < m_events_list.size(); ++i) { + TimeEvent*& event_i = m_events_list[ i ]; + if( event_i == event) { + event_i = 0; return; } } diff -r 10b5f7f36dd4 -r 51cc05d862f2 engine/core/video/cursor.cpp --- a/engine/core/video/cursor.cpp Wed Jun 03 19:29:52 2009 +0000 +++ b/engine/core/video/cursor.cpp Mon Jun 08 16:00:02 2009 +0000 @@ -20,6 +20,14 @@ ***************************************************************************/ // Standard C++ library includes +#if defined( WIN32 ) +#include +#include +#endif + +#if defined( __linux__ ) +#include +#endif // 3rd party library includes @@ -29,6 +37,7 @@ // Second block: files included from the same folder #include "util/structures/rect.h" #include "util/time/timemanager.h" +#include "util/log/logger.h" #include "imagepool.h" #include "animationpool.h" @@ -37,10 +46,36 @@ #include "renderbackend.h" #include "cursor.h" +#if defined( WIN32 ) + +// From SDL_sysmouse.c +struct WMcursor { + HCURSOR curs; +#ifndef _WIN32_WCE + Uint8 *ands; + Uint8 *xors; +#endif +}; + +#endif + +#if defined( __linux__ ) + +// Stops the compiler from confusing it with FIFE:Cursor +typedef Cursor XCursor; + +// From SDL_x11mouse.c +struct WMcursor { + Cursor x_cursor; +}; + +#endif + namespace FIFE { - + static Logger _log(LM_GUI); // We should have a log module for cursor + Cursor::Cursor(ImagePool* imgpool, AnimationPool* animpool, RenderBackend* renderbackend): - m_cursor_id(0), + m_cursor_id(NC_ARROW), m_drag_id(0), m_cursor_type(CURSOR_NATIVE), m_drag_type(CURSOR_NONE), @@ -51,8 +86,10 @@ m_drag_animtime(0), m_drag_offset_x(0), m_drag_offset_y(0), + m_native_cursor(NULL), m_timemanager(TimeManager::instance()) { assert(m_timemanager); + set(m_cursor_type, m_cursor_id); } void Cursor::set(MouseCursorType ctype, unsigned int cursor_id) { @@ -60,6 +97,7 @@ m_cursor_type = ctype; if (ctype == CURSOR_NATIVE) { SDL_ShowCursor(1); + setNativeCursor(cursor_id); } else { SDL_ShowCursor(0); if (ctype == CURSOR_ANIMATION) { @@ -120,4 +158,169 @@ m_renderbackend->popClipArea(); } } + + unsigned int Cursor::getNativeId(unsigned int cursor_id) { +#if defined( WIN32 ) + switch (cursor_id) { + case NC_ARROW: + return 32512; // IDC_ARROW; + case NC_IBEAM: + return 32513; // IDC_IBEAM; + case NC_WAIT: + return 32514; // IDC_WAIT; + case NC_CROSS: + return 32515; // IDC_CROSS; + case NC_UPARROW: + return 32516; // IDC_UPARROW; + case NC_RESIZESE: + return 32642; // IDC_SIZENWSE; + case NC_RESIZESW: + return 32643; // IDC_SIZENESW; + case NC_RESIZEE: + return 32644; // IDC_SIZEWE; + case NC_RESIZES: + return 32645; // IDC_SIZENS; + case NC_RESIZENW: + return 32642; // IDC_SIZENWSE; + case NC_RESIZENE: + return 32643; // IDC_SIZENESW; + case NC_RESIZEW: + return 32644; // IDC_SIZEWE; + case NC_RESIZEN: + return 32645; // IDC_SIZENS; + case NC_RESIZEALL: + return 32646; // IDC_SIZEALL; + case NC_NO: + return 32648; // IDC_NO; + case NC_HAND: + return 32649; // IDC_HAND; + case NC_APPSTARTING: + return 32650; // IDC_APPSTARTING; + case NC_HELP: + return 32651; // IDC_HELP; + default: + break; + } + +#elif defined( __linux__ ) + switch (cursor_id) { + case NC_ARROW: + return 68; + case NC_IBEAM: + return 152; + case NC_WAIT: + return 150; + case NC_CROSS: + return 130; + case NC_UPARROW: + return 22; + case NC_RESIZESE: + return 14; + case NC_RESIZESW: + return 12; + case NC_RESIZEE: + return 96; + case NC_RESIZES: + return 16; + case NC_RESIZENW: + return 134; + case NC_RESIZENE: + return 136; + case NC_RESIZEW: + return 70; + case NC_RESIZEN: + return 138; + case NC_RESIZEALL: + return 52; + case NC_NO: + return 0; + case NC_HAND: + return 60; + case NC_APPSTARTING: + return 150; + case NC_HELP: + return 92; + default: + break; + } +#endif + return cursor_id; + } + + void Cursor::setNativeCursor(unsigned int cursor_id) { +#if !defined( WIN32 ) && !defined(__linux__) + return; +#endif + + // Check if a value in NativeCursors is requested + cursor_id = getNativeId(cursor_id); + + // Load cursor +#if defined( __linux__ ) + static Display* dsp = XOpenDisplay(NULL); + XCursor xCursor = XcursorShapeLoadCursor(dsp, cursor_id); + if (xCursor == 0) { + if (m_native_cursor != NULL) { + SDL_FreeCursor(m_native_cursor); + m_native_cursor = NULL; + } + FL_WARN(_log, "Cursor: No cursor matching cursor_id was found."); + return; + } +#elif defined( WIN32 ) + // Load native cursor + HCURSOR hIcon = LoadCursor(NULL, MAKEINTRESOURCE(cursor_id)); + if (hIcon == static_cast(0)) { + if (m_native_cursor != NULL) { + SDL_FreeCursor(m_native_cursor); + m_native_cursor = NULL; + } + FL_WARN(_log, "Cursor: No cursor matching cursor_id was found."); + return; + } +#endif + + WMcursor *cursor; + SDL_Cursor *curs2; + + // Allocate memory. Use SDL_FreeCursor to free cursor memory + cursor = (WMcursor *)SDL_malloc(sizeof(*cursor)); + curs2 = (SDL_Cursor *)SDL_malloc(sizeof *curs2); + + //-- Set up some default values -- + curs2->wm_cursor = cursor; + curs2->data = NULL; + curs2->mask = NULL; + curs2->save[0] = NULL; + curs2->save[1] = NULL; + curs2->area.x = 0; + curs2->area.y = 0; + curs2->area.w = 32; + curs2->area.h = 32; + curs2->hot_x = 0; + curs2->hot_y = 0; + +#if defined(WIN32) + cursor->curs = hIcon; +#ifndef _WIN32_WCE + cursor->ands = NULL; + cursor->xors = NULL; +#endif + + // Get hot spot + ICONINFO iconinfo; + if (GetIconInfo(hIcon, &iconinfo)) { + curs2->hot_x = static_cast(iconinfo.xHotspot); + curs2->hot_y = static_cast(iconinfo.yHotspot); + } + +#elif defined(__linux__) + cursor->x_cursor = xCursor; + XSync(dsp, false); +#endif + + m_native_cursor = curs2; + SDL_SetCursor(curs2); + + } } diff -r 10b5f7f36dd4 -r 51cc05d862f2 engine/core/video/cursor.h --- a/engine/core/video/cursor.h Wed Jun 03 19:29:52 2009 +0000 +++ b/engine/core/video/cursor.h Mon Jun 08 16:00:02 2009 +0000 @@ -31,6 +31,8 @@ // First block: files included from the FIFE root src directory // Second block: files included from the same folder +struct SDL_Cursor; + namespace FIFE { class ImagePool; @@ -49,7 +51,34 @@ CURSOR_IMAGE, CURSOR_ANIMATION }; - + + /** Defines some common native cursors between platforms. + * In addition to these, you can use the values in: + * Windows: http://msdn.microsoft.com/en-us/library/ms648391(VS.85).aspx + * X11: http://fife.pastebin.com/f5b89dd6b + */ + enum NativeCursor { + // Start on 1000000 to avoid id-clashes with X11 and windows + NC_ARROW = 1000000, // Standard arrow + NC_IBEAM, // I-beam for text selection + NC_WAIT, // Hourglass + NC_CROSS, // Crosshair + NC_UPARROW, // Vertical arrow + NC_RESIZENW, // Cursor for resize in northwest corner + NC_RESIZESE, // + NC_RESIZESW, // + NC_RESIZENE, // + NC_RESIZEE, // + NC_RESIZEW, // + NC_RESIZEN, // + NC_RESIZES, // + NC_RESIZEALL, // Four-pointed arrow pointing north, south, east, and west + NC_NO, // Slashed circle + NC_HAND, // Hand. Common for links, etc. + NC_APPSTARTING, // Standard arrow and small hourglass + NC_HELP // Arrow and question mark + }; + /** Cursor class manages mouse cursor handling */ class Cursor { @@ -68,7 +97,7 @@ /** Sets the current mouse cursor type and possible pool value * @param ctype cursor type - * @param cursor_id pool id for the cursor (either image or animation) + * @param cursor_id Pool id to image or animation. For native cursors, this is the resource id to native cursor, or one of the values in NativeCursor */ void set(MouseCursorType ctype, unsigned int cursor_id=0); @@ -94,13 +123,29 @@ /** Gets the current mouse cursor pool id */ unsigned int getDragId() const { return m_drag_id; } - + + protected: + /** Sets the cursor to a native type. + * @param cursor_id Resource id to native cursor, or one of the values in NativeCursor + */ + void setNativeCursor(unsigned int cursor_id); + + /** To get some consistancy between platforms, this function checks + * if cursor_id matches any of the values in NativeCursor, and + * returns the resource ID specific to the running platform. + * If no match is found, cursor_id is returned. + * + * @param One of the values in NativeCursor + */ + unsigned int getNativeId(unsigned int cursor_id); private: unsigned int m_cursor_id; unsigned int m_drag_id; MouseCursorType m_cursor_type; MouseCursorType m_drag_type; + + SDL_Cursor* m_native_cursor; RenderBackend* m_renderbackend; ImagePool* m_imgpool; diff -r 10b5f7f36dd4 -r 51cc05d862f2 engine/core/video/video.i --- a/engine/core/video/video.i Wed Jun 03 19:29:52 2009 +0000 +++ b/engine/core/video/video.i Mon Jun 08 16:00:02 2009 +0000 @@ -167,6 +167,27 @@ CURSOR_IMAGE, CURSOR_ANIMATION }; + + enum NativeCursor { + NC_ARROW = 1000000, + NC_IBEAM, + NC_WAIT, + NC_CROSS, + NC_UPARROW, + NC_RESIZENW, + NC_RESIZESE, + NC_RESIZESW, + NC_RESIZENE, + NC_RESIZEE, + NC_RESIZEW, + NC_RESIZEN, + NC_RESIZES, + NC_RESIZEALL, + NC_NO, + NC_HAND, + NC_APPSTARTING, + NC_HELP + }; class Cursor { public: diff -r 10b5f7f36dd4 -r 51cc05d862f2 engine/core/view/renderers/cellselectionrenderer.cpp --- a/engine/core/view/renderers/cellselectionrenderer.cpp Wed Jun 03 19:29:52 2009 +0000 +++ b/engine/core/view/renderers/cellselectionrenderer.cpp Mon Jun 08 16:00:02 2009 +0000 @@ -43,14 +43,12 @@ static Logger _log(LM_VIEWVIEW); CellSelectionRenderer::CellSelectionRenderer(RenderBackend* renderbackend, int position): - RendererBase(renderbackend, position), - m_loc(NULL) { + RendererBase(renderbackend, position) { setEnabled(true); } CellSelectionRenderer::CellSelectionRenderer(const CellSelectionRenderer& old): - RendererBase(old), - m_loc(NULL) { + RendererBase(old) { setEnabled(true); } @@ -66,48 +64,63 @@ } void CellSelectionRenderer::reset() { - delete m_loc; - m_loc = NULL; + m_locations.clear(); } - void CellSelectionRenderer::selectLocation(Location* loc) { - delete m_loc; - m_loc = NULL; + void CellSelectionRenderer::selectLocation(const Location* loc) { if (loc) { - m_loc = new Location(*loc); + std::vector::const_iterator it = m_locations.begin(); + for (; it != m_locations.end(); it++) { + if (*it == *loc) return; + } + + m_locations.push_back(Location(*loc)); + } + } + + void CellSelectionRenderer::deselectLocation(const Location* loc) { + if (loc) { + std::vector::iterator it = m_locations.begin(); + for (; it != m_locations.end(); it++) { + if (*it == *loc) { + m_locations.erase(it); + break; + } + } } } void CellSelectionRenderer::render(Camera* cam, Layer* layer, std::vector& instances) { - if (!m_loc) { - return; - } - - if (layer != m_loc->getLayer()) { - return; - } - - CellGrid* cg = layer->getCellGrid(); - if (!cg) { - FL_WARN(_log, "No cellgrid assigned to layer, cannot draw selection"); - return; - } + std::vector::const_iterator locit = m_locations.begin(); + + for (; locit != m_locations.end(); locit++) { + const Location loc = *locit; + if (layer != loc.getLayer()) { + continue; + } + + CellGrid* cg = layer->getCellGrid(); + if (!cg) { + FL_WARN(_log, "No cellgrid assigned to layer, cannot draw selection"); + continue; + } - std::vector vertices; - cg->getVertices(vertices, m_loc->getLayerCoordinates()); - std::vector::const_iterator it = vertices.begin(); - ScreenPoint firstpt = cam->toScreenCoordinates(cg->toMapCoordinates(*it)); - Point pt1(firstpt.x, firstpt.y); - Point pt2; - ++it; - for (; it != vertices.end(); it++) { - ScreenPoint pts = cam->toScreenCoordinates(cg->toMapCoordinates(*it)); - pt2.x = pts.x; pt2.y = pts.y; - Point cpt1 = pt1; - Point cpt2 = pt2; - m_renderbackend->drawLine(cpt1, cpt2, 255, 0, 0); - pt1 = pt2; + std::vector vertices; + cg->getVertices(vertices, loc.getLayerCoordinates()); + std::vector::const_iterator it = vertices.begin(); + ScreenPoint firstpt = cam->toScreenCoordinates(cg->toMapCoordinates(*it)); + Point pt1(firstpt.x, firstpt.y); + Point pt2; + ++it; + for (; it != vertices.end(); it++) { + ScreenPoint pts = cam->toScreenCoordinates(cg->toMapCoordinates(*it)); + pt2.x = pts.x; pt2.y = pts.y; + Point cpt1 = pt1; + Point cpt2 = pt2; + m_renderbackend->drawLine(cpt1, cpt2, 255, 0, 0); + pt1 = pt2; + } + m_renderbackend->drawLine(pt2, Point(firstpt.x, firstpt.y), 255, 0, 0); } - m_renderbackend->drawLine(pt2, Point(firstpt.x, firstpt.y), 255, 0, 0); } } diff -r 10b5f7f36dd4 -r 51cc05d862f2 engine/core/view/renderers/cellselectionrenderer.h --- a/engine/core/view/renderers/cellselectionrenderer.h Wed Jun 03 19:29:52 2009 +0000 +++ b/engine/core/view/renderers/cellselectionrenderer.h Mon Jun 08 16:00:02 2009 +0000 @@ -31,10 +31,13 @@ // First block: files included from the FIFE root src directory // Second block: files included from the same folder #include "view/rendererbase.h" +#include "model/structures/location.h" namespace FIFE { class RenderBackend; + /** CellSelectionRenderer renders a frame around selected cells. + */ class CellSelectionRenderer: public RendererBase { public: /** constructor. @@ -52,22 +55,31 @@ void render(Camera* cam, Layer* layer, std::vector& instances); + /** Returns the renderer name */ std::string getName() { return "CellSelectionRenderer"; } /** returns instance used in given view */ static CellSelectionRenderer* getInstance(IRendererContainer* cnt); + /** Deselects all locations */ void reset(); /** Selects given location on map - * If NULL is given, deselects + */ + void selectLocation(const Location* loc); + + /** Deselects given location on map */ - void selectLocation(Location* loc); + void deselectLocation(const Location* loc); + + /** Returns selected locations + */ + const std::vector getLocations() const { return m_locations; } private: - // selected location - Location* m_loc; + // selected locations + std::vector m_locations; }; } diff -r 10b5f7f36dd4 -r 51cc05d862f2 engine/core/view/renderers/cellselectionrenderer.i --- a/engine/core/view/renderers/cellselectionrenderer.i Wed Jun 03 19:29:52 2009 +0000 +++ b/engine/core/view/renderers/cellselectionrenderer.i Mon Jun 08 16:00:02 2009 +0000 @@ -32,7 +32,10 @@ virtual ~CellSelectionRenderer(); std::string getName(); static CellSelectionRenderer* getInstance(IRendererContainer* cnt); - void selectLocation(Location* loc); + void reset(); + void selectLocation(const Location* loc); + void deselectLocation(const Location* loc); + const std::vector getLocations() const; private: CellSelectionRenderer(RenderBackend* renderbackend, int position); diff -r 10b5f7f36dd4 -r 51cc05d862f2 engine/extensions/fife_timer.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/engine/extensions/fife_timer.py Mon Jun 08 16:00:02 2009 +0000 @@ -0,0 +1,110 @@ +# -*- coding: utf-8 -*- +import fife + +""" +Convenient timers +================= + +Usage:: + import timer + timer.init( my_fife_engine.getTimeManager() ) + def spam(): + print "SPAM SPAM ", + return "More spam?" # a string is a true value, so it's repeated. + repeater = timer.repeatCall(500,spam) + def stop_spam(): + repeater.stop() + print "BACON EGGS AND SPAM" + timer.delayCall(50000,stop_spam) + +""" + + +_manager = None +_alltimers = {} + +def init(timemanager): + """ + Initialize timers. + + @param timemanager: A L{fife.TimeManager} as retuned by L{fife.Engine.getTimeManager}. + """ + global _manager + _manager = timemanager + +class Timer(fife.TimeEvent): + def __init__(self,delay=0,callback=None): + super(Timer,self).__init__(0) + self.manager = _manager + self.is_registered = False + self.callback = callback + self.setPeriod(delay) + + def start(self): + if self.is_registered: + return + self.is_registered = True + global _alltimers + _alltimers[self]=1 + self.manager.registerEvent(self) + + def stop(self): + if not self.is_registered: + return + self.is_registered = False + global _alltimers + del _alltimers[self] + self.manager.unregisterEvent(self) + + def updateEvent(self,delta): + if callable(self.callback): + self.callback() + +def delayCall(delay,callback): + """ + Delay a function call by a number of milliseconds. + + @param delay Delay in milliseconds. + @param callback The function to call. + + @return The timer. + """ + timer = Timer(delay) + def cbwa(c, *args): + c(*args) + def real_callback(c, t): + t.stop() + c() + + timer.callback = cbwa(real_callback, callback, timer) + timer.start() + return timer + +from traceback import print_exc +def repeatCall(period,callback): + """ + Repeat a function call. + + @param period Period between calls in milliseconds. + @param callback The function to call. + + @return The timer. + + The call is repeated until the callback returns a False + value (i.e. None) or the timer is stopped. + """ + timer = Timer(period) + def real_callback(): + try: + if not callback(): + timer.stop() + except Exception: + print_exc() + timer.stop() + + timer.callback = real_callback + timer.start() + return timer + +__all__ = [init,Timer,delayCall,repeatCall] + diff -r 10b5f7f36dd4 -r 51cc05d862f2 engine/extensions/filebrowser.py --- a/engine/extensions/filebrowser.py Wed Jun 03 19:29:52 2009 +0000 +++ b/engine/extensions/filebrowser.py Mon Jun 08 16:00:02 2009 +0000 @@ -39,7 +39,7 @@ }) self._setDirectory() if self.savefile: - self._file_entry = widgets.TextField(name='saveField', text='') + self._file_entry = widgets.TextField(name='saveField', text=u'') self._widget.findChild(name="fileColumn").addChild(self._file_entry) self._widget.show() diff -r 10b5f7f36dd4 -r 51cc05d862f2 engine/extensions/pychan/__init__.py --- a/engine/extensions/pychan/__init__.py Wed Jun 03 19:29:52 2009 +0000 +++ b/engine/extensions/pychan/__init__.py Mon Jun 08 16:00:02 2009 +0000 @@ -253,18 +253,20 @@ ### Initialisation ### manager = None -def init(engine,debug=False): +def init(engine,debug=False, compat_layout=False): """ This has to be called before any other pychan methods can be used. It sets up a manager object which is available under pychan.manager. @param engine: The FIFE engine object. + @param debug: bool - Enables and disables debugging output. Default is False. + @param compat_layout: bool - Enables and disables compat layout. Default is False. """ from compat import _munge_engine_hook from internal import Manager global manager - manager = Manager(_munge_engine_hook(engine),debug) + manager = Manager(_munge_engine_hook(engine),debug,compat_layout) # XML Loader @@ -357,7 +359,7 @@ self.indent = self.indent[:-4] if manager.debug: print self.indent + "" % name if self.stack.pop() in ('gui_element','spacer'): - self.root = self.root._parent or self.root + self.root = self.root.parent or self.root def loadXML(filename_or_stream): """ diff -r 10b5f7f36dd4 -r 51cc05d862f2 engine/extensions/pychan/dialogs.py --- a/engine/extensions/pychan/dialogs.py Wed Jun 03 19:29:52 2009 +0000 +++ b/engine/extensions/pychan/dialogs.py Mon Jun 08 16:00:02 2009 +0000 @@ -1,4 +1,4 @@ -# coding: utf-8 +# -*- coding: utf-8 -*- from pychan import loadXML import pychan.tools @@ -68,7 +68,7 @@ -