From 10b2c562fb7635f9850f1441f08ba8b1a71e31e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Konopacki?= Date: Wed, 15 Aug 2012 01:48:49 +0200 Subject: First approach to port 2D UI Interface - changes in src/ui ; be CAREFUL, not every file is changed in a proper way -> bugs - necessary changes in object/robotmain.h and common/misc.h/.cpp in order to compile --- src/ui/compass.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ui/compass.h') diff --git a/src/ui/compass.h b/src/ui/compass.h index 0014f3d..ac5f608 100644 --- a/src/ui/compass.h +++ b/src/ui/compass.h @@ -22,7 +22,7 @@ #include "ui/control.h" -class CD3DEngine; +//class CEngine; @@ -32,7 +32,7 @@ public: CCompass(CInstanceManager* iMan); virtual ~CCompass(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); bool EventProcess(const Event &event); -- cgit v1.2.3-1-g7c22 From 574c07e388dfd902b6565bc4a5ac9b915c73074e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Konopacki?= Date: Sat, 18 Aug 2012 22:56:42 +0200 Subject: Further improvements in UI porting --- src/ui/compass.h | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/ui/compass.h') diff --git a/src/ui/compass.h b/src/ui/compass.h index ac5f608..1d48907 100644 --- a/src/ui/compass.h +++ b/src/ui/compass.h @@ -1,5 +1,6 @@ // * This file is part of the COLOBOT source code // * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) // * // * This program is free software: you can redistribute it and/or modify // * it under the terms of the GNU General Public License as published by @@ -21,15 +22,16 @@ #include "ui/control.h" +namespace Gfx { +class CEngine; +} -//class CEngine; - - - +namespace Ui { class CCompass : public CControl { public: - CCompass(CInstanceManager* iMan); +// CCompass(CInstanceManager* iMan); + CCompass(); virtual ~CCompass(); bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); @@ -39,7 +41,7 @@ public: void Draw(); void SetDirection(float dir); - float RetDirection(); + float GetDirection(); protected: @@ -48,3 +50,4 @@ protected: }; +} -- cgit v1.2.3-1-g7c22 From 01cc0fbc49696a19a56dfdd8359d4bb77e868925 Mon Sep 17 00:00:00 2001 From: erihel Date: Tue, 11 Sep 2012 12:49:41 +0200 Subject: * latest changes * all files except studio, map and maindialog should compile * did some code cleanup --- src/ui/compass.h | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) (limited to 'src/ui/compass.h') diff --git a/src/ui/compass.h b/src/ui/compass.h index 1d48907..e8ccc17 100644 --- a/src/ui/compass.h +++ b/src/ui/compass.h @@ -20,34 +20,35 @@ #pragma once -#include "ui/control.h" +#include "control.h" namespace Gfx { -class CEngine; + class CEngine; } namespace Ui { -class CCompass : public CControl -{ -public: -// CCompass(CInstanceManager* iMan); - CCompass(); - virtual ~CCompass(); - bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); + class CCompass : public CControl + { + public: + // CCompass(CInstanceManager* iMan); + CCompass(); + virtual ~CCompass(); - bool EventProcess(const Event &event); + bool Create(Math::Point pos, Math::Point dim, int icon, EventType eventType); - void Draw(); + bool EventProcess(const Event &event); - void SetDirection(float dir); - float GetDirection(); + void Draw(); -protected: + void SetDirection(float dir); + float GetDirection(); -protected: - float m_dir; -}; + protected: + + protected: + float m_dir; + }; } -- cgit v1.2.3-1-g7c22