[colobot] 124/145: Changed mouse scaling (again)
Didier Raboud
odyx at moszumanska.debian.org
Mon Jul 11 12:56:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit 3b9b9b322a6f1e2ff4b08b803badf3af6f55f186
Author: krzys-h <krzys_h at interia.pl>
Date: Tue Jun 21 13:07:40 2016 +0200
Changed mouse scaling (again)
---
src/graphics/engine/engine.cpp | 148 +++++++++++++++++++++++++----------------
src/graphics/engine/engine.h | 40 +----------
src/math/intpoint.h | 96 ++++++++++++++++++++++++++
src/math/point.h | 4 +-
4 files changed, 191 insertions(+), 97 deletions(-)
diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp
index 7fdb2a4..f7d0b5a 100644
--- a/src/graphics/engine/engine.cpp
+++ b/src/graphics/engine/engine.cpp
@@ -68,6 +68,60 @@ template<> Gfx::CEngine* CSingleton<Gfx::CEngine>::m_instance = nullptr;
namespace Gfx
{
+/**
+ * \struct EngineMouse
+ * \brief Information about mouse cursor
+ */
+struct EngineMouse
+{
+ //! Index of texture element for 1st image
+ int icon1;
+ //! Index of texture element for 2nd image
+ int icon2;
+ //! Shadow texture part
+ int iconShadow;
+ //! Mode to render 1st image in
+ EngineRenderState mode1;
+ //! Mode to render 2nd image in
+ EngineRenderState mode2;
+ //! Hot point
+ Math::IntPoint hotPoint;
+
+ EngineMouse(int icon1 = -1,
+ int icon2 = -1,
+ int iconShadow = -1,
+ EngineRenderState mode1 = ENG_RSTATE_NORMAL,
+ EngineRenderState mode2 = ENG_RSTATE_NORMAL,
+ Math::IntPoint hotPoint = Math::IntPoint())
+ : icon1(icon1)
+ , icon2(icon2)
+ , iconShadow(iconShadow)
+ , mode1(mode1)
+ , mode2(mode2)
+ , hotPoint(hotPoint)
+ {}
+};
+
+const Math::IntPoint MOUSE_SIZE(32, 32);
+const std::map<EngineMouseType, EngineMouse> MOUSE_TYPES = {
+ {{ENG_MOUSE_NORM}, {EngineMouse( 0, 1, 32, ENG_RSTATE_TTEXTURE_WHITE, ENG_RSTATE_TTEXTURE_BLACK, Math::IntPoint( 1, 1))}},
+ {{ENG_MOUSE_WAIT}, {EngineMouse( 2, 3, 33, ENG_RSTATE_TTEXTURE_WHITE, ENG_RSTATE_TTEXTURE_BLACK, Math::IntPoint( 8, 12))}},
+ {{ENG_MOUSE_HAND}, {EngineMouse( 4, 5, 34, ENG_RSTATE_TTEXTURE_WHITE, ENG_RSTATE_TTEXTURE_BLACK, Math::IntPoint( 7, 2))}},
+ {{ENG_MOUSE_NO}, {EngineMouse( 6, 7, 35, ENG_RSTATE_TTEXTURE_WHITE, ENG_RSTATE_TTEXTURE_BLACK, Math::IntPoint(10, 10))}},
+ {{ENG_MOUSE_EDIT}, {EngineMouse( 8, 9, -1, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::IntPoint( 6, 10))}},
+ {{ENG_MOUSE_CROSS}, {EngineMouse(10, 11, -1, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::IntPoint(10, 10))}},
+ {{ENG_MOUSE_MOVEV}, {EngineMouse(12, 13, -1, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::IntPoint( 5, 11))}},
+ {{ENG_MOUSE_MOVEH}, {EngineMouse(14, 15, -1, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::IntPoint(11, 5))}},
+ {{ENG_MOUSE_MOVED}, {EngineMouse(16, 17, -1, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::IntPoint( 9, 9))}},
+ {{ENG_MOUSE_MOVEI}, {EngineMouse(18, 19, -1, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::IntPoint( 9, 9))}},
+ {{ENG_MOUSE_MOVE}, {EngineMouse(20, 21, -1, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::IntPoint(11, 11))}},
+ {{ENG_MOUSE_TARGET}, {EngineMouse(22, 23, -1, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::IntPoint(15, 15))}},
+ {{ENG_MOUSE_SCROLLL}, {EngineMouse(24, 25, 43, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::IntPoint( 2, 9))}},
+ {{ENG_MOUSE_SCROLLR}, {EngineMouse(26, 27, 44, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::IntPoint(17, 9))}},
+ {{ENG_MOUSE_SCROLLU}, {EngineMouse(28, 29, 45, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::IntPoint( 9, 2))}},
+ {{ENG_MOUSE_SCROLLD}, {EngineMouse(30, 31, 46, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::IntPoint( 9, 17))}},
+};
+
CEngine::CEngine(CApplication *app, CSystemUtils* systemUtils)
: m_app(app),
m_systemUtils(systemUtils),
@@ -75,8 +129,7 @@ CEngine::CEngine(CApplication *app, CSystemUtils* systemUtils)
m_fogColor(),
m_deepView(),
m_fogStart(),
- m_highlightRank(),
- m_mice()
+ m_highlightRank()
{
m_device = nullptr;
@@ -160,24 +213,6 @@ CEngine::CEngine(CApplication *app, CSystemUtils* systemUtils)
m_debugLights = false;
m_debugDumpLights = false;
- m_mice[ENG_MOUSE_NORM] = EngineMouse( 0, 1, 32, ENG_RSTATE_TTEXTURE_WHITE, ENG_RSTATE_TTEXTURE_BLACK, Math::Point( 1.0f, 1.0f));
- m_mice[ENG_MOUSE_WAIT] = EngineMouse( 2, 3, 33, ENG_RSTATE_TTEXTURE_WHITE, ENG_RSTATE_TTEXTURE_BLACK, Math::Point( 8.0f, 12.0f));
- m_mice[ENG_MOUSE_HAND] = EngineMouse( 4, 5, 34, ENG_RSTATE_TTEXTURE_WHITE, ENG_RSTATE_TTEXTURE_BLACK, Math::Point( 7.0f, 2.0f));
- m_mice[ENG_MOUSE_NO] = EngineMouse( 6, 7, 35, ENG_RSTATE_TTEXTURE_WHITE, ENG_RSTATE_TTEXTURE_BLACK, Math::Point(10.0f, 10.0f));
- m_mice[ENG_MOUSE_EDIT] = EngineMouse( 8, 9, -1, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::Point( 6.0f, 10.0f));
- m_mice[ENG_MOUSE_CROSS] = EngineMouse(10, 11, -1, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::Point(10.0f, 10.0f));
- m_mice[ENG_MOUSE_MOVEV] = EngineMouse(12, 13, -1, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::Point( 5.0f, 11.0f));
- m_mice[ENG_MOUSE_MOVEH] = EngineMouse(14, 15, -1, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::Point(11.0f, 5.0f));
- m_mice[ENG_MOUSE_MOVED] = EngineMouse(16, 17, -1, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::Point( 9.0f, 9.0f));
- m_mice[ENG_MOUSE_MOVEI] = EngineMouse(18, 19, -1, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::Point( 9.0f, 9.0f));
- m_mice[ENG_MOUSE_MOVE] = EngineMouse(20, 21, -1, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::Point(11.0f, 11.0f));
- m_mice[ENG_MOUSE_TARGET] = EngineMouse(22, 23, -1, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::Point(15.0f, 15.0f));
- m_mice[ENG_MOUSE_SCROLLL] = EngineMouse(24, 25, 43, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::Point( 2.0f, 9.0f));
- m_mice[ENG_MOUSE_SCROLLR] = EngineMouse(26, 27, 44, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::Point(17.0f, 9.0f));
- m_mice[ENG_MOUSE_SCROLLU] = EngineMouse(28, 29, 45, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::Point( 9.0f, 2.0f));
- m_mice[ENG_MOUSE_SCROLLD] = EngineMouse(30, 31, 46, ENG_RSTATE_TTEXTURE_BLACK, ENG_RSTATE_TTEXTURE_WHITE, Math::Point( 9.0f, 17.0f));
-
- m_mouseSize = Math::Point(48.f/m_size.x, 48.f/m_size.x * (800.f/600.f));
m_mouseType = ENG_MOUSE_NORM;
m_fpsCounter = 0;
@@ -280,7 +315,6 @@ void CEngine::SetTerrain(CTerrain* terrain)
bool CEngine::Create()
{
m_size = m_app->GetVideoConfig().size;
- m_mouseSize = Math::Point(48.f/m_size.x, 48.f/m_size.x * (static_cast<float>(m_size.x) / static_cast<float>(m_size.y)));
// Use the setters to set defaults, because they automatically disable what is not supported
SetShadowMapping(m_shadowMapping);
@@ -359,7 +393,6 @@ void CEngine::Destroy()
void CEngine::ResetAfterVideoConfigChanged()
{
m_size = m_app->GetVideoConfig().size;
- m_mouseSize = Math::Point(48.f/m_size.x, 48.f/m_size.x * (static_cast<float>(m_size.x) / static_cast<float>(m_size.y)));
// Update the camera projection matrix for new aspect ratio
ApplyChange();
@@ -4833,8 +4866,8 @@ void CEngine::DrawOverColor()
void CEngine::DrawHighlight()
{
Math::Point min, max;
- min.x = 1000000.0f;
- min.y = 1000000.0f;
+ min.x = 1000000.0f;
+ min.y = 1000000.0f;
max.x = -1000000.0f;
max.y = -1000000.0f;
@@ -4851,10 +4884,10 @@ void CEngine::DrawHighlight()
}
}
- if ( min.x == 1000000.0f ||
- min.y == 1000000.0f ||
- max.x == -1000000.0f ||
- max.y == -1000000.0f )
+ if (min.x == 1000000.0f ||
+ min.y == 1000000.0f ||
+ max.x == -1000000.0f ||
+ max.y == -1000000.0f)
{
m_highlight = false; // not highlighted
}
@@ -4865,7 +4898,7 @@ void CEngine::DrawHighlight()
m_highlight = true;
}
- if (! m_highlight)
+ if (!m_highlight)
return;
Math::Point p1 = m_highlightP1;
@@ -4881,8 +4914,8 @@ void CEngine::DrawHighlight()
SetState(ENG_RSTATE_OPAQUE_COLOR);
- float d = 0.5f+sinf(m_highlightTime*6.0f)*0.5f;
- d *= (p2.x-p1.x)*0.1f;
+ float d = 0.5f + sinf(m_highlightTime * 6.0f) * 0.5f;
+ d *= (p2.x - p1.x) * 0.1f;
p1.x += d;
p1.y += d;
p2.x -= d;
@@ -4891,11 +4924,11 @@ void CEngine::DrawHighlight()
Color color(1.0f, 1.0f, 0.0f); // yellow
VertexCol line[3] =
- {
- VertexCol(Math::Vector(), color),
- VertexCol(Math::Vector(), color),
- VertexCol(Math::Vector(), color)
- };
+ {
+ VertexCol(Math::Vector(), color),
+ VertexCol(Math::Vector(), color),
+ VertexCol(Math::Vector(), color)
+ };
float dx = (p2.x - p1.x) / 5.0f;
float dy = (p2.y - p1.y) / 5.0f;
@@ -4927,6 +4960,8 @@ void CEngine::DrawMouse()
if (mode != MOUSE_ENGINE && mode != MOUSE_BOTH)
return;
+ SetWindowCoordinates();
+
Material material;
material.diffuse = Color(1.0f, 1.0f, 1.0f);
material.ambient = Color(0.5f, 0.5f, 0.5f);
@@ -4934,33 +4969,34 @@ void CEngine::DrawMouse()
m_device->SetMaterial(material);
m_device->SetTexture(0, m_miceTexture);
- int index = static_cast<int>(m_mouseType);
+ Math::Point mousePos = CInput::GetInstancePointer()->GetMousePos();
+ Math::IntPoint pos(mousePos.x * m_size.x, m_size.y - mousePos.y * m_size.y);
+ pos.x -= MOUSE_TYPES.at(m_mouseType).hotPoint.x;
+ pos.y -= MOUSE_TYPES.at(m_mouseType).hotPoint.y;
- Math::Point pos = CInput::GetInstancePointer()->GetMousePos();
- pos.x = pos.x - (m_mice[index].hotPoint.x * m_mouseSize.x) / 32.0f;
- pos.y = pos.y - ((32.0f - m_mice[index].hotPoint.y) * m_mouseSize.y) / 32.0f;
-
- Math::Point shadowPos;
- shadowPos.x = pos.x + (4.0f/800.0f);
- shadowPos.y = pos.y - (3.0f/600.0f);
+ Math::IntPoint shadowPos;
+ shadowPos.x = pos.x + 4;
+ shadowPos.y = pos.y - 3;
SetState(ENG_RSTATE_TCOLOR_WHITE);
- DrawMouseSprite(shadowPos, m_mouseSize, m_mice[index].iconShadow);
+ DrawMouseSprite(shadowPos, MOUSE_SIZE, MOUSE_TYPES.at(m_mouseType).iconShadow);
+
+ SetState(MOUSE_TYPES.at(m_mouseType).mode1);
+ DrawMouseSprite(pos, MOUSE_SIZE, MOUSE_TYPES.at(m_mouseType).icon1);
- SetState(m_mice[index].mode1);
- DrawMouseSprite(pos, m_mouseSize, m_mice[index].icon1);
+ SetState(MOUSE_TYPES.at(m_mouseType).mode2);
+ DrawMouseSprite(pos, MOUSE_SIZE, MOUSE_TYPES.at(m_mouseType).icon2);
- SetState(m_mice[index].mode2);
- DrawMouseSprite(pos, m_mouseSize, m_mice[index].icon2);
+ SetInterfaceCoordinates();
}
-void CEngine::DrawMouseSprite(Math::Point pos, Math::Point size, int icon)
+void CEngine::DrawMouseSprite(Math::IntPoint pos, Math::IntPoint size, int icon)
{
if (icon == -1)
return;
- Math::Point p1 = pos;
- Math::Point p2 = p1 + size;
+ Math::IntPoint p1 = pos;
+ Math::IntPoint p2 = p1 + size;
float u1 = (32.0f / 256.0f) * (icon % 8);
float v1 = (32.0f / 256.0f) * (icon / 8);
@@ -4977,10 +5013,10 @@ void CEngine::DrawMouseSprite(Math::Point pos, Math::Point size, int icon)
Vertex vertex[4] =
{
- Vertex(Math::Vector(p1.x, p1.y, 0.0f), normal, Math::Point(u1, v2)),
- Vertex(Math::Vector(p1.x, p2.y, 0.0f), normal, Math::Point(u1, v1)),
- Vertex(Math::Vector(p2.x, p1.y, 0.0f), normal, Math::Point(u2, v2)),
- Vertex(Math::Vector(p2.x, p2.y, 0.0f), normal, Math::Point(u2, v1))
+ Vertex(Math::Vector(p1.x, p2.y, 0.0f), normal, Math::Point(u1, v2)),
+ Vertex(Math::Vector(p1.x, p1.y, 0.0f), normal, Math::Point(u1, v1)),
+ Vertex(Math::Vector(p2.x, p2.y, 0.0f), normal, Math::Point(u2, v2)),
+ Vertex(Math::Vector(p2.x, p1.y, 0.0f), normal, Math::Point(u2, v1))
};
m_device->DrawPrimitive(PRIMITIVE_TRIANGLE_STRIP, vertex, 4);
diff --git a/src/graphics/engine/engine.h b/src/graphics/engine/engine.h
index ab0cc52..1f4eca6 100644
--- a/src/graphics/engine/engine.h
+++ b/src/graphics/engine/engine.h
@@ -482,40 +482,6 @@ enum EngineMouseType
ENG_MOUSE_COUNT
};
-/**
- * \struct EngineMouse
- * \brief Information about mouse cursor
- */
-struct EngineMouse
-{
- //! Index of texture element for 1st image
- int icon1;
- //! Index of texture element for 2nd image
- int icon2;
- //! Shadow texture part
- int iconShadow;
- //! Mode to render 1st image in
- EngineRenderState mode1;
- //! Mode to render 2nd image in
- EngineRenderState mode2;
- //! Hot point
- Math::Point hotPoint;
-
- EngineMouse(int icon1 = -1,
- int icon2 = -1,
- int iconShadow = -1,
- EngineRenderState mode1 = ENG_RSTATE_NORMAL,
- EngineRenderState mode2 = ENG_RSTATE_NORMAL,
- Math::Point hotPoint = Math::Point())
- : icon1(icon1)
- , icon2(icon2)
- , iconShadow(iconShadow)
- , mode1(mode1)
- , mode2(mode2)
- , hotPoint(hotPoint)
- {}
-};
-
/**
* \class CEngine
@@ -1251,7 +1217,7 @@ protected:
//! Draws the mouse cursor
void DrawMouse();
//! Draw part of mouse cursor sprite
- void DrawMouseSprite(Math::Point pos, Math::Point size, int icon);
+ void DrawMouseSprite(Math::IntPoint pos, Math::IntPoint size, int icon);
//! Draw statistic texts
void DrawStats();
//! Draw mission timer
@@ -1478,12 +1444,8 @@ protected:
* so are disabled for subsequent load calls. */
std::set<std::string> m_texBlacklist;
- //! Mouse cursor definitions
- EngineMouse m_mice[ENG_MOUSE_COUNT];
//! Texture with mouse cursors
Texture m_miceTexture;
- //! Size of mouse cursor
- Math::Point m_mouseSize;
//! Type of mouse cursor
EngineMouseType m_mouseType;
diff --git a/src/math/intpoint.h b/src/math/intpoint.h
index 876d9e5..470abf3 100644
--- a/src/math/intpoint.h
+++ b/src/math/intpoint.h
@@ -25,6 +25,8 @@
#pragma once
#include <cmath>
+#include <string>
+#include <sstream>
// Math module namespace
namespace Math
@@ -59,6 +61,100 @@ struct IntPoint
{
return sqrtf(x*x + y*y);
}
+
+ //! Sets the zero point: (0,0)
+ inline void LoadZero()
+ {
+ x = y = 0.0f;
+ }
+
+ //! Returns the struct cast to \c int* array; use with care!
+ inline int* Array()
+ {
+ return reinterpret_cast<int*>(this);
+ }
+
+ //! Returns the struct cast to <tt>const int*</tt> array; use with care!
+ inline const int* Array() const
+ {
+ return reinterpret_cast<const int*>(this);
+ }
+
+ //! Returns the inverted point
+ inline IntPoint operator-() const
+ {
+ return IntPoint(-x, -y);
+ }
+
+ //! Adds the given point
+ inline const IntPoint& operator+=(const IntPoint &right)
+ {
+ x += right.x;
+ y += right.y;
+ return *this;
+ }
+
+ //! Adds two points
+ inline friend const IntPoint operator+(const IntPoint &left, const IntPoint &right)
+ {
+ return IntPoint(left.x + right.x, left.y + right.y);
+ }
+
+ //! Subtracts the given point
+ inline const IntPoint& operator-=(const IntPoint &right)
+ {
+ x -= right.x;
+ y -= right.y;
+ return *this;
+ }
+
+ //! Subtracts two points
+ inline friend const IntPoint operator-(const IntPoint &left, const IntPoint &right)
+ {
+ return IntPoint(left.x - right.x, left.y - right.y);
+ }
+
+ //! Multiplies by given scalar
+ inline const IntPoint& operator*=(const float &right)
+ {
+ x *= right;
+ y *= right;
+ return *this;
+ }
+
+ //! Multiplies point by scalar
+ inline friend const IntPoint operator*(const float &left, const IntPoint &right)
+ {
+ return IntPoint(left * right.x, left * right.y);
+ }
+
+ //! Multiplies point by scalar
+ inline friend const IntPoint operator*(const IntPoint &left, const int &right)
+ {
+ return IntPoint(left.x * right, left.y * right);
+ }
+
+ //! Divides by given scalar
+ inline const IntPoint& operator/=(const float &right)
+ {
+ x /= right;
+ y /= right;
+ return *this;
+ }
+
+ //! Divides point by scalar
+ inline friend const IntPoint operator/(const IntPoint &left, const int &right)
+ {
+ return IntPoint(left.x / right, left.y / right);
+ }
+
+ //! Returns a string "[x, y]"
+ inline std::string ToString() const
+ {
+ std::stringstream s;
+ s << "[" << x << ", " << y << "]";
+ return s.str();
+ }
};
diff --git a/src/math/point.h b/src/math/point.h
index 786e820..cd568ac 100644
--- a/src/math/point.h
+++ b/src/math/point.h
@@ -90,7 +90,7 @@ struct Point
return sqrtf(x*x + y*y);
}
- //! Returns the inverted point
+ //! Returns the inverted point
inline Point operator-() const
{
return Point(-x, -y);
@@ -110,7 +110,7 @@ struct Point
return Point(left.x + right.x, left.y + right.y);
}
- //! Subtracts the given vector
+ //! Subtracts the given point
inline const Point& operator-=(const Point &right)
{
x -= right.x;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git
More information about the Pkg-games-commits
mailing list