diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-13 22:48:35 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-13 22:48:35 +0200 |
commit | b735913debff93c1a6444ec731cd4bf99ae2a5c2 (patch) | |
tree | efa532d3b4231e5ffd6df8eddcb0ec8cf5d4b28b /src/ui/slider.h | |
parent | b5d16ef340208bbe1a76f33f7498fb168f6405b6 (diff) | |
download | colobot-b735913debff93c1a6444ec731cd4bf99ae2a5c2.tar.gz colobot-b735913debff93c1a6444ec731cd4bf99ae2a5c2.tar.bz2 colobot-b735913debff93c1a6444ec731cd4bf99ae2a5c2.zip |
FPOINT -> Math::Point & other math functions
- changed FPOINT to Math::Point and some functions
from math module to the new implementation
- moved old function and FPOINT struct declarations to math3d.cpp
- removed some unused functions in math module
- fixed some #include dependencies
- moved #define STRICT and #define D3D_OVERLOADS to compile options
Diffstat (limited to 'src/ui/slider.h')
-rw-r--r-- | src/ui/slider.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/ui/slider.h b/src/ui/slider.h index 8d1033f..a1eb127 100644 --- a/src/ui/slider.h +++ b/src/ui/slider.h @@ -20,7 +20,6 @@ #include "ui/control.h"
-#include "common/struct.h"
class CD3DEngine;
@@ -34,10 +33,10 @@ public: CSlider(CInstanceManager* iMan);
~CSlider();
- bool Create(FPOINT pos, FPOINT dim, int icon, EventMsg eventMsg);
+ bool Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
- void SetPos(FPOINT pos);
- void SetDim(FPOINT dim);
+ void SetPos(Math::Point pos);
+ void SetDim(Math::Point dim);
bool SetState(int state, bool bState);
bool SetState(int state);
@@ -57,7 +56,7 @@ public: protected:
void MoveAdjust();
void AdjustGlint();
- void DrawVertex(FPOINT pos, FPOINT dim, int icon);
+ void DrawVertex(Math::Point pos, Math::Point dim, int icon);
protected:
CButton* m_buttonLeft;
@@ -72,7 +71,7 @@ protected: float m_marginButton;
bool m_bCapture;
- FPOINT m_pressPos;
+ Math::Point m_pressPos;
float m_pressValue;
EventMsg m_eventUp;
|