1
0
mirror of https://github.com/VCMP-SqMod/SqMod.git synced 2026-07-09 01:57:09 +02:00

Dumped the old implementation. Started with a more simple approach.

This commit is contained in:
Sandu Liviu Catalin
2016-02-21 00:25:00 +02:00
parent 96ded94026
commit 06e598acfb
293 changed files with 37439 additions and 92564 deletions
+30 -45
View File
@@ -2,21 +2,21 @@
#define _BASE_CIRCLE_HPP_
// ------------------------------------------------------------------------------------------------
#include "Config.hpp"
#include "Base/Vector2f.hpp"
#include "SqBase.hpp"
#include "Base/Vector2.hpp"
// ------------------------------------------------------------------------------------------------
namespace SqMod {
/* ------------------------------------------------------------------------------------------------
* ...
*
*/
struct Circle
{
/* --------------------------------------------------------------------------------------------
* ...
*/
typedef SQFloat Value;
typedef float Value;
/* --------------------------------------------------------------------------------------------
* ...
@@ -33,58 +33,43 @@ struct Circle
/* --------------------------------------------------------------------------------------------
* ...
*/
Vector2f pos;
Vector2 pos;
Value rad;
/* --------------------------------------------------------------------------------------------
* ...
*
*/
Circle();
/* --------------------------------------------------------------------------------------------
* ...
*/
Circle(Value r);
Circle(Value rv);
/* --------------------------------------------------------------------------------------------
* ...
*/
Circle(const Vector2f & p);
Circle(const Vector2 & pv, Value rv);
/* --------------------------------------------------------------------------------------------
* ...
*/
Circle(const Vector2f & p, Value r);
Circle(Value xv, Value yv, Value rv);
/* --------------------------------------------------------------------------------------------
* ...
*
*/
Circle(Value x, Value y, Value r);
Circle(const Circle & o);
/* --------------------------------------------------------------------------------------------
* ...
*/
Circle(const Circle & c);
/* --------------------------------------------------------------------------------------------
* ...
*/
Circle(Circle && c);
/* --------------------------------------------------------------------------------------------
* ...
*
*/
~Circle();
/* --------------------------------------------------------------------------------------------
* ...
*
*/
Circle & operator = (const Circle & c);
/* --------------------------------------------------------------------------------------------
* ...
*/
Circle & operator = (Circle && c);
Circle & operator = (const Circle & o);
/* --------------------------------------------------------------------------------------------
* ...
@@ -94,7 +79,7 @@ struct Circle
/* --------------------------------------------------------------------------------------------
* ...
*/
Circle & operator = (const Vector2f & p);
Circle & operator = (const Vector2 & p);
/* --------------------------------------------------------------------------------------------
* ...
@@ -149,27 +134,27 @@ struct Circle
/* --------------------------------------------------------------------------------------------
* ...
*/
Circle & operator += (const Vector2f & p);
Circle & operator += (const Vector2 & p);
/* --------------------------------------------------------------------------------------------
* ...
*/
Circle & operator -= (const Vector2f & p);
Circle & operator -= (const Vector2 & p);
/* --------------------------------------------------------------------------------------------
* ...
*/
Circle & operator *= (const Vector2f & p);
Circle & operator *= (const Vector2 & p);
/* --------------------------------------------------------------------------------------------
* ...
*/
Circle & operator /= (const Vector2f & p);
Circle & operator /= (const Vector2 & p);
/* --------------------------------------------------------------------------------------------
* ...
*/
Circle & operator %= (const Vector2f & p);
Circle & operator %= (const Vector2 & p);
/* --------------------------------------------------------------------------------------------
* ...
@@ -244,27 +229,27 @@ struct Circle
/* --------------------------------------------------------------------------------------------
* ...
*/
Circle operator + (const Vector2f & p) const;
Circle operator + (const Vector2 & p) const;
/* --------------------------------------------------------------------------------------------
* ...
*/
Circle operator - (const Vector2f & p) const;
Circle operator - (const Vector2 & p) const;
/* --------------------------------------------------------------------------------------------
* ...
*/
Circle operator * (const Vector2f & p) const;
Circle operator * (const Vector2 & p) const;
/* --------------------------------------------------------------------------------------------
* ...
*/
Circle operator / (const Vector2f & p) const;
Circle operator / (const Vector2 & p) const;
/* --------------------------------------------------------------------------------------------
* ...
*/
Circle operator % (const Vector2f & p) const;
Circle operator % (const Vector2 & p) const;
/* --------------------------------------------------------------------------------------------
* ...
@@ -309,12 +294,12 @@ struct Circle
/* --------------------------------------------------------------------------------------------
* ...
*/
SQInteger Cmp(const Circle & c) const;
Int32 Cmp(const Circle & c) const;
/* --------------------------------------------------------------------------------------------
* ...
*/
const SQChar * ToString() const;
CSStr ToString() const;
/* --------------------------------------------------------------------------------------------
* ...
@@ -329,12 +314,12 @@ struct Circle
/* --------------------------------------------------------------------------------------------
* ...
*/
void Set(const Vector2f & np);
void Set(const Vector2 & np);
/* --------------------------------------------------------------------------------------------
* ...
*/
void Set(const Vector2f & np, Value nr);
void Set(const Vector2 & np, Value nr);
/* --------------------------------------------------------------------------------------------
* ...
@@ -349,7 +334,7 @@ struct Circle
/* --------------------------------------------------------------------------------------------
* ...
*/
void Set(const SQChar * values, SQChar delim);
void Set(CSStr values, SQChar delim);
/* --------------------------------------------------------------------------------------------
* ...