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

1 files changed, 6 insertions, 5 deletions

diff --git a/src/graphics/common/planet.h b/src/graphics/common/planet.h
index fd2f0f2..14c8111 100644
--- a/src/graphics/common/planet.h
+++ b/src/graphics/common/planet.h
@@ -19,7 +19,8 @@
 #pragma once

 

 

-#include "common/struct.h"

+#include "common/event.h"

+#include "math/point.h"

 

 

 class CInstanceManager;

@@ -32,13 +33,13 @@ const int MAXPLANET = 10;
 struct Planet

 {

 	char		bUsed;		// true -> planet exists

-	FPOINT		start;		// initial position in degrees

-	FPOINT		angle;		// current position in degrees

+	Math::Point		start;		// initial position in degrees

+	Math::Point		angle;		// current position in degrees

 	float		dim;		// dimensions (0..1)

 	float		speed;		// speed

 	float		dir;		// direction in the sky

 	char		name[20];	// name of the texture

-	FPOINT		uv1, uv2;	// texture mapping

+	Math::Point		uv1, uv2;	// texture mapping

 	char		bTGA;		// texture .TGA

 };

 

@@ -53,7 +54,7 @@ public:
 

 	void		Flush();

 	bool		EventProcess(const Event &event);

-	bool		Create(int mode, FPOINT start, float dim, float speed, float dir, char *name, FPOINT uv1, FPOINT uv2);

+	bool		Create(int mode, Math::Point start, float dim, float speed, float dir, char *name, Math::Point uv1, Math::Point uv2);

 	bool		PlanetExist();

 	void		LoadTexture();

 	void		Draw();