From b735913debff93c1a6444ec731cd4bf99ae2a5c2 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Wed, 13 Jun 2012 22:48:35 +0200 Subject: 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 --- src/graphics/common/terrain.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/graphics/common/terrain.h') diff --git a/src/graphics/common/terrain.h b/src/graphics/common/terrain.h index 1ea5a6a..dd04377 100644 --- a/src/graphics/common/terrain.h +++ b/src/graphics/common/terrain.h @@ -19,7 +19,8 @@ #pragma once -#include "math/old/math3d.h" +#include "common/struct.h" +#include "math/point.h" #include "graphics/d3d/d3dengine.h" @@ -29,7 +30,7 @@ class CWater; -const float FLATLIMIT = (5.0f*PI/180.0f); +const float FLATLIMIT = (5.0f*Math::PI/180.0f); enum TerrainRes @@ -154,7 +155,7 @@ protected: bool CreateSquare(bool bMultiRes, int x, int y); TerrainMaterial* LevelSearchMat(int id); - void LevelTextureName(int x, int y, char *name, FPOINT &uv); + void LevelTextureName(int x, int y, char *name, Math::Point &uv); float LevelRetHeight(int x, int y); bool LevelGetDot(int x, int y, float min, float max, float slope); int LevelTestMat(char *mat); -- cgit v1.2.3-1-g7c22