Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-14 19:44:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

UIMap just got in

Browse Source
This commit is contained in:
Eduardo Bart
2011-08-29 00:04:23 -03:00
parent fe9591ca8d
commit a8afbf9b3f
10 changed files with 193 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/otclient/otclient.cpp
View File

@@ -227,10 +227,6 @@ void OTClient::poll()
void OTClient::render()
{
//TODO: UIMap for map drawing
if(g_game.isOnline())
g_map.draw(Rect(0, 0, g_graphics.getScreenSize()));
// everything is rendered by UI components
g_ui.render();
}
@@ -276,6 +272,7 @@ void OTClient::saveConfigurations()
void OTClient::onClose()
{
//TODO: make and use g_lua.callGlobalField
if(m_onCloseCallback)
m_onCloseCallback();
else
@@ -292,39 +289,17 @@ void OTClient::onPlatformEvent(const PlatformEvent& event)
{
bool fireUi = true;
if(event.type == EventKeyDown) {
if(!event.ctrl && !event.alt && !event.shift) {
if(event.keycode == Fw::KeyUp)
g_game.walk(Otc::North);
else if(event.keycode == Fw::KeyRight)
g_game.walk(Otc::East);
else if(event.keycode == Fw::KeyDown)
g_game.walk(Otc::South);
else if(event.keycode == Fw::KeyLeft)
g_game.walk(Otc::West);
}
else if(event.ctrl && !event.alt && !event.shift) {
if(event.keycode == Fw::KeyUp)
g_game.turn(Otc::North);
else if(event.keycode == Fw::KeyRight)
g_game.turn(Otc::East);
else if(event.keycode == Fw::KeyDown)
g_game.turn(Otc::South);
else if(event.keycode == Fw::KeyLeft)
g_game.turn(Otc::West);
else if(event.keycode == Fw::KeyApostrophe) {
// TODO: move these events to lua
UIWidgetPtr console = g_ui.getRootWidget()->getChildById("consolePanel");
if(!console->isExplicitlyVisible()) {
g_ui.getRootWidget()->lockChild(console);
console->setVisible(true);
} else {
g_ui.getRootWidget()->unlockChild(console);
console->setVisible(false);
}
fireUi = false;
}
if(event.type == EventKeyDown && event.ctrl && !event.alt && !event.shift && event.keycode == Fw::KeyApostrophe) {
// TODO: move this events to lua
UIWidgetPtr console = g_ui.getRootWidget()->getChildById("consolePanel");
if(!console->isExplicitlyVisible()) {
g_ui.getRootWidget()->lockChild(console);
console->setVisible(true);
} else {
g_ui.getRootWidget()->unlockChild(console);
console->setVisible(false);
}
fireUi = false;
}
if(fireUi)

4
src/otclient/otclientluafunctions.cpp
View File

@@ -28,6 +28,7 @@
#include <otclient/core/spritemanager.h>
#include <otclient/net/protocollogin.h>
#include <otclient/net/protocolgame.h>
#include <otclient/ui/uimap.h>
void OTClient::registerLuaFunctions()
{
@@ -45,4 +46,7 @@ void OTClient::registerLuaFunctions()
g_lua.registerClass<Game>();
g_lua.bindClassStaticFunction<Game>("loginWorld", std::bind(&Game::loginWorld, &g_game, _1, _2, _3, _4, _5));
g_lua.registerClass<UIMap, UIWidget>();
g_lua.bindClassStaticFunction<UIMap>("create", &UIWidget::create<UIMap>);
}

22
src/otclient/ui/declarations.h Normal file
View File

@@ -0,0 +1,22 @@
/*
* Copyright (c) 2010-2011 OTClient <https://github.com/edubart/otclient>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/

77
src/otclient/ui/uimap.cpp Normal file
View File

@@ -0,0 +1,77 @@
/*
* Copyright (c) 2010-2011 OTClient <https://github.com/edubart/otclient>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#include "uimap.h"
#include <otclient/core/map.h>
#include <otclient/core/game.h>
void UIMap::setup()
{
UIWidget::setup();
}
void UIMap::render()
{
if(g_game.isOnline())
g_map.draw(m_rect);
UIWidget::render();
}
bool UIMap::onKeyPress(uchar keyCode, char keyChar, int keyboardModifiers)
{
if(keyboardModifiers == Fw::KeyboardNoModifier) {
if(keyCode == Fw::KeyUp) {
g_game.walk(Otc::North);
return true;
} else if(keyCode == Fw::KeyRight) {
g_game.walk(Otc::East);
return true;
} else if(keyCode == Fw::KeyDown) {
g_game.walk(Otc::South);
return true;
} else if(keyCode == Fw::KeyLeft) {
g_game.walk(Otc::West);
return true;
}
} else if(keyboardModifiers == Fw::KeyboardCtrlModifier) {
if(keyCode == Fw::KeyUp) {
g_game.turn(Otc::North);
return true;
} else if(keyCode == Fw::KeyRight) {
g_game.turn(Otc::East);
return true;
} else if(keyCode == Fw::KeyDown) {
g_game.turn(Otc::South);
return true;
} else if(keyCode == Fw::KeyLeft) {
g_game.turn(Otc::West);
return true;
}
}
return UIWidget::onKeyPress(keyCode, keyChar, keyboardModifiers);
}
bool UIMap::onMousePress(const Point& mousePos, Fw::MouseButton button)
{
return UIWidget::onMousePress(mousePos, button);
}

43
src/otclient/ui/uimap.h Normal file
View File

@@ -0,0 +1,43 @@
/*
* Copyright (c) 2010-2011 OTClient <https://github.com/edubart/otclient>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
#ifndef UIMAP_H
#define UIMAP_H
#include "declarations.h"
#include <framework/ui/uiwidget.h>
class UIMap : public UIWidget
{
public:
void setup();
void render();
protected:
virtual bool onKeyPress(uchar keyCode, char keyChar, int keyboardModifiers);
virtual bool onMousePress(const Point& mousePos, Fw::MouseButton button);
private:
};
#endif