Mercurial > malikania
changeset 48:3be179ba3226
Client: remove useless stuff
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Thu, 08 Dec 2016 20:19:02 +0100 |
| parents | 7097a91b08a8 |
| children | 2804ae55c70f |
| files | libclient/CMakeLists.txt libclient/malikania/client-target-loading.cpp libclient/malikania/client-target-loading.hpp libclient/malikania/client-target-map.cpp libclient/malikania/client-target-map.hpp libclient/malikania/client-target.hpp libclient/malikania/client.cpp libclient/malikania/client.hpp libclient/malikania/label.cpp libclient/malikania/label.hpp |
| diffstat | 10 files changed, 0 insertions(+), 439 deletions(-) [+] |
line wrap: on
line diff
--- a/libclient/CMakeLists.txt Wed Dec 07 20:51:19 2016 +0100 +++ b/libclient/CMakeLists.txt Thu Dec 08 20:19:02 2016 +0100 @@ -20,15 +20,9 @@ HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/malikania/animation.hpp ${CMAKE_CURRENT_SOURCE_DIR}/malikania/animator.hpp -# ${CMAKE_CURRENT_SOURCE_DIR}/malikania/client.hpp -# ${CMAKE_CURRENT_SOURCE_DIR}/malikania/client_resources_loader.hpp -# ${CMAKE_CURRENT_SOURCE_DIR}/malikania/client-target.hpp -# ${CMAKE_CURRENT_SOURCE_DIR}/malikania/client-target-loading.hpp -# ${CMAKE_CURRENT_SOURCE_DIR}/malikania/client-target-map.hpp ${CMAKE_CURRENT_SOURCE_DIR}/malikania/color.hpp ${CMAKE_CURRENT_SOURCE_DIR}/malikania/font.hpp ${CMAKE_CURRENT_SOURCE_DIR}/malikania/image.hpp -# ${CMAKE_CURRENT_SOURCE_DIR}/malikania/label.hpp ${CMAKE_CURRENT_SOURCE_DIR}/malikania/line.hpp ${CMAKE_CURRENT_SOURCE_DIR}/malikania/point.hpp ${CMAKE_CURRENT_SOURCE_DIR}/malikania/rectangle.hpp @@ -43,14 +37,10 @@ set( SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/malikania/animator.cpp -# ${CMAKE_CURRENT_SOURCE_DIR}/malikania/client.cpp ${CMAKE_CURRENT_SOURCE_DIR}/malikania/client_resources_loader.cpp -# ${CMAKE_CURRENT_SOURCE_DIR}/malikania/client-target-loading.cpp -# ${CMAKE_CURRENT_SOURCE_DIR}/malikania/client-target-map.cpp ${CMAKE_CURRENT_SOURCE_DIR}/malikania/color.cpp ${CMAKE_CURRENT_SOURCE_DIR}/malikania/font.cpp ${CMAKE_CURRENT_SOURCE_DIR}/malikania/image.cpp -# ${CMAKE_CURRENT_SOURCE_DIR}/malikania/label.cpp ${CMAKE_CURRENT_SOURCE_DIR}/malikania/sprite.cpp ${CMAKE_CURRENT_SOURCE_DIR}/malikania/window.cpp ${CMAKE_CURRENT_SOURCE_DIR}/malikania/${WITH_BACKEND_DIRECTORY}/font_backend.cpp
--- a/libclient/malikania/client-target-loading.cpp Wed Dec 07 20:51:19 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -/* - * client-target-loading.cpp -- client loading target - * - * Copyright (c) 2013-2016 Malikania Authors - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include "client-target-loading.hpp" - -namespace malikania { - -void Client::LoadingTarget::update(Client &) -{ -} - -void Client::LoadingTarget::draw(Client &) -{ -} - -} // !malikania
--- a/libclient/malikania/client-target-loading.hpp Wed Dec 07 20:51:19 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -/* - * client-target-loading.hpp -- client loading target - * - * Copyright (c) 2013-2016 Malikania Authors - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef MALIKANIA_CLIENT_TARGET_LOADING_HPP -#define MALIKANIA_CLIENT_TARGET_LOADING_HPP - -#include "client-target.hpp" - -namespace malikania { - -class Client::LoadingTarget : public Client::Target { -public: - virtual void update(Client &client); - - virtual void draw(Client &client); -}; - -} // !malikania - -#endif // !MALIKANIA_CLIENT_TARGET_LOADING_HPP
--- a/libclient/malikania/client-target-map.cpp Wed Dec 07 20:51:19 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,31 +0,0 @@ -/* - * client-target-map.cpp -- client map target - * - * Copyright (c) 2013-2016 Malikania Authors - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include "client-target-map.hpp" - -namespace malikania { - -void Client::MapTarget::update(Client &) -{ -} - -void Client::MapTarget::draw(Client &) -{ -} - -} // !malikania
--- a/libclient/malikania/client-target-map.hpp Wed Dec 07 20:51:19 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,35 +0,0 @@ -/* - * client-target-map.hpp -- client map target - * - * Copyright (c) 2013-2016 Malikania Authors - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef MALIKANIA_CLIENT_TARGET_MAP_HPP -#define MALIKANIA_CLIENT_TARGET_MAP_HPP - -#include "client-target.hpp" - -namespace malikania { - -class Client::MapTarget : public Client::Target { -public: - virtual void update(Client &client); - - virtual void draw(Client &client); -}; - -} // !malikania - -#endif // !MALIKANIA_CLIENT_TARGET_MAP_HPP
--- a/libclient/malikania/client-target.hpp Wed Dec 07 20:51:19 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,55 +0,0 @@ -/* - * client-target.hpp -- client graphical target state - * - * Copyright (c) 2013-2016 Malikania Authors - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef MALIKANIA_CLIENT_TARGET_HPP -#define MALIKANIA_CLIENT_TARGET_HPP - -#include "client.hpp" - -namespace malikania { - -class Client::Target { -public: - Target() = default; - - virtual ~Target() = default; - - virtual void load(Client &client) - { - (void)client; - } - - virtual void update(Client &client) - { - (void)client; - } - - virtual void draw(Client &client) - { - (void)client; - } - - virtual void unload(Client &client) - { - (void)client; - } -}; - -} // !malikania - -#endif // !MALIKANIA_CLIENT_TARGET_HPP
--- a/libclient/malikania/client.cpp Wed Dec 07 20:51:19 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -/* - * client.cpp -- main client class - * - * Copyright (c) 2013-2016 Malikania Authors - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include "client-target-loading.hpp" -#include "client-target-map.hpp" -#include "window.hpp" - -namespace malikania { - -Client::Client() - : m_loadingTarget(std::make_shared<LoadingTarget>()) - , m_mapTarget(std::make_shared<MapTarget>()) - , m_target(m_loadingTarget) -{ - m_target->load(*this); -} - -void Client::setTarget(std::shared_ptr<Target> target) -{ - m_targetNext = std::move(target); -} - -void Client::update() -{ - if (m_targetNext) { - m_target->unload(*this); - m_target = std::move(m_targetNext); - m_target->load(*this); - } - - m_target->update(*this); -} - -void Client::draw() -{ - m_target->draw(*this); -} - -} // !malikania
--- a/libclient/malikania/client.hpp Wed Dec 07 20:51:19 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +0,0 @@ -/* - * client.hpp -- main client class - * - * Copyright (c) 2013-2016 Malikania Authors - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef MALIKANIA_CLIENT_HPP -#define MALIKANIA_CLIENT_HPP - -#if 0 - -#include <memory> - -#include "window.hpp" - -namespace malikania { - -class Client : public Window { -public: - class Target; - class LoadingTarget; - class MapTarget; - -private: - std::shared_ptr<LoadingTarget> m_loadingTarget; - std::shared_ptr<MapTarget> m_mapTarget; - - std::shared_ptr<Target> m_target; - std::shared_ptr<Target> m_targetNext; - -public: - Client(); - - inline const std::shared_ptr<LoadingTarget> &loadingTarget() noexcept - { - return m_loadingTarget; - } - - inline void setLoadingTarget(std::shared_ptr<LoadingTarget> loadingTarget) noexcept - { - m_loadingTarget = std::move(loadingTarget); - } - - inline const std::shared_ptr<MapTarget> &mapTarget() noexcept - { - return m_mapTarget; - } - - inline void setMapTarget(std::shared_ptr<MapTarget> mapTarget) noexcept - { - m_mapTarget = std::move(mapTarget); - } - - void setTarget(std::shared_ptr<Target> target); - - void update(); - - void draw(); -}; - -} // !malikania - -#endif - -#endif // !MALIKANIA_CLIENT_HPP
--- a/libclient/malikania/label.cpp Wed Dec 07 20:51:19 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ -/* - * label.cpp -- GUI label - * - * Copyright (c) 2013-2016 Malikania Authors - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include "label.hpp" - -namespace malikania { - -Label::Label(std::string text, std::shared_ptr<Font> font, Rectangle frame, Color textColor, Color backgroundColor) - : m_text(std::move(text)) - , m_font(std::move(font)) - , m_frame(std::move(frame)) - , m_textColor(std::move(textColor)) - , m_backgroundColor(std::move(backgroundColor)) -{ -} - -int Label::fontSize() const noexcept -{ - // TODO - return 12; -} - -void Label::draw(Window &, const Rectangle &) -{ -} - -}// !malikania
--- a/libclient/malikania/label.hpp Wed Dec 07 20:51:19 2016 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,69 +0,0 @@ -/* - * label.hpp -- GUI label - * - * Copyright (c) 2013-2016 Malikania Authors - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#ifndef MALIKANIA_LABEL_HPP -#define MALIKANIA_LABEL_HPP - -#include "color.hpp" -#include "font.hpp" -#include "image.hpp" -#include "rectangle.hpp" - -namespace malikania { - -class Window; - -class Label { -private: - std::string m_text; - std::shared_ptr<Font> m_font; - Rectangle m_frame; - Color m_textColor; - Color m_backgroundColor; - -public: - Label(std::string text, std::shared_ptr<Font> font, Rectangle frame, Color textColor = {0, 0, 0, 255}, Color backgroundColor = {255, 255, 255, 0}); - - inline const std::string text() const noexcept - { - return m_text; - } - - inline std::string text() noexcept - { - return m_text; - } - - inline const std::shared_ptr<Font> &font() const noexcept - { - return m_font; - } - - inline std::shared_ptr<Font> &font() noexcept - { - return m_font; - } - - int fontSize() const noexcept; - - void draw(Window &window, const Rectangle &rectangle); -}; - -}// !malikania - -#endif // !MALIKANIA_LABEL_HPP