libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-20 17:03:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ZVISION: Rename Point template class to Vector2

Browse Source 
Also remove templating
This commit is contained in:
richiesams 2013-07-29 15:03:08 -05:00
parent f8bc82080a
commit 48b9741f41
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/zvision/render_table.cpp
View File

@ -25,7 +25,7 @@
#include "graphics/colormasks.h"
#include "zvision/render_table.h"
#include "zvision/point.h"
#include "zvision/vector2.h"
namespace ZVision {
@ -35,7 +35,7 @@ RenderTable::RenderTable(uint32 numColumns, uint32 numRows)
_renderState(RenderState::FLAT) {
assert(numRows != 0 && numColumns != 0);
_internalBuffer = new Point<int16>[numRows * numColumns];
_internalBuffer = new Vector2[numRows * numColumns];
}
RenderTable::~RenderTable() {

4
engines/zvision/render_table.h
View File

@ -26,7 +26,7 @@
#include "common/types.h"
#include "common/rect.h"
#include "zvision/point.h"
#include "zvision/vector2.h"
namespace ZVision {
@ -44,7 +44,7 @@ public:
private:
uint32 _numColumns, _numRows;
Point<int16> *_internalBuffer;
Vector2 *_internalBuffer;
RenderState _renderState;
struct {

27
engines/zvision/point.h → engines/zvision/vector2.h
View File

@ -23,35 +23,34 @@
#ifndef COMMON_ZVISION_POINT_H
#define COMMON_ZVISION_POINT_H
#include "common/types.h"
#include "common/scummsys.h"
namespace ZVision {
/**
* Simple class for handling both 2D position and size.
*/
template<class T>
class Point {
class Vector2 {
public:
T x; ///< The horizontal part of the point
T y; ///< The vertical part of the point
int16 x; ///< The horizontal part of the point
int16 y; ///< The vertical part of the point
public:
Point() : x(0), y(0) {}
Point(T x1, T y1) : x(x1), y(y1) {}
Vector2() : x(0), y(0) {}
Vector2(int16 x1, int16 y1) : x(x1), y(y1) {}
public:
bool operator==(const Point &p) const { return x == p.x && y == p.y; }
bool operator!=(const Point &p) const { return x != p.x || y != p.y; }
Point operator+(const Point &delta) const { return Point(x + delta.x, y + delta.y); }
Point operator-(const Point &delta) const { return Point(x - delta.x, y - delta.y); }
bool operator==(const Vector2 &p) const { return x == p.x && y == p.y; }
bool operator!=(const Vector2 &p) const { return x != p.x || y != p.y; }
Vector2 operator+(const Vector2 &delta) const { return Vector2(x + delta.x, y + delta.y); }
Vector2 operator-(const Vector2 &delta) const { return Vector2(x - delta.x, y - delta.y); }
void operator+=(const Point &delta) {
void operator+=(const Vector2 &delta) {
x += delta.x;
y += delta.y;
}
void operator-=(const Point &delta) {
void operator-=(const Vector2 &delta) {
x -= delta.x;
y -= delta.y;
}
@ -62,7 +61,7 @@ public:
* @param p the other point
* @return the distance between this and p
*/
uint sqrDist(const Point &p) const {
uint sqrDist(const Vector2 &p) const {
int diffx = ABS(p.x - x);
if (diffx >= 0x1000)
return 0xFFFFFF;