libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 14:50:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ZVISION: Remove Vector2 class

Browse Source 
Originally, the render table needed int32 (x, y) coords, so I created a copy of
Common::Point that used int32. After some code changes, the render table
reverted to int16 coords. Therefore, this class is unnessessary since
Common::Point uses int16 coords.
This commit is contained in:
RichieSams 2013-10-02 14:56:38 -05:00
parent 8a69bcfe97
commit 39a8243c69
3 changed files with 4 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
engines/zvision/render_table.cpp
View File

@ -24,7 +24,7 @@
#include "zvision/render_table.h"
#include "zvision/vector2.h"
#include "common/rect.h"
#include "graphics/colormasks.h"
@ -37,7 +37,7 @@ RenderTable::RenderTable(uint numColumns, uint numRows)
_renderState(FLAT) {
assert(numRows != 0 && numColumns != 0);
_internalBuffer = new Vector2[numRows * numColumns];
_internalBuffer = new Common::Point[numRows * numColumns];
}
RenderTable::~RenderTable() {

5
engines/zvision/render_table.h
View File

@ -23,10 +23,9 @@
#ifndef ZVISION_RENDER_TABLE_H
#define ZVISION_RENDER_TABLE_H
#include "zvision/vector2.h"
#include "common/rect.h"
namespace ZVision {
class RenderTable {
@ -43,7 +42,7 @@ public:
private:
uint _numColumns, _numRows;
Vector2 *_internalBuffer;
Common::Point *_internalBuffer;
RenderState _renderState;
struct {

82
engines/zvision/vector2.h
View File

@ -1,82 +0,0 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* 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 the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
*/
#ifndef ZVISION_VECTOR2_H
#define ZVISION_VECTOR2_H
#include "common/scummsys.h"
#include "common/util.h"
namespace ZVision {
/**
* Simple class for handling both 2D position and size.
*/
class Vector2 {
public:
int16 x; ///< The horizontal part of the point
int16 y; ///< The vertical part of the point
public:
Vector2() : x(0), y(0) {}
Vector2(int16 x1, int16 y1) : x(x1), y(y1) {}
public:
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 Vector2 &delta) {
x += delta.x;
y += delta.y;
}
void operator-=(const Vector2 &delta) {
x -= delta.x;
y -= delta.y;
}
/**
* Return the square of the distance between this point and the point p.
*
* @param p the other point
* @return the distance between this and p
*/
uint sqrDist(const Vector2 &p) const {
int diffx = ABS(p.x - x);
if (diffx >= 0x1000)
return 0xFFFFFF;
int diffy = ABS(p.y - y);
if (diffy >= 0x1000)
return 0xFFFFFF;
return uint(diffx * diffx + diffy * diffy);
}
};
} // End of namespace ZVision
#endif