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/cloud.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/graphics/common/cloud.h') diff --git a/src/graphics/common/cloud.h b/src/graphics/common/cloud.h index cf97bc7..d806c03 100644 --- a/src/graphics/common/cloud.h +++ b/src/graphics/common/cloud.h @@ -19,7 +19,9 @@ #pragma once -#include "common/struct.h" +#include "common/event.h" +#include "math/point.h" +#include "graphics/d3d/d3dengine.h" class CInstanceManager; @@ -57,7 +59,7 @@ public: protected: bool EventFrame(const Event &event); - void AdjustLevel(D3DVECTOR &pos, D3DVECTOR &eye, float deep, FPOINT &uv1, FPOINT &uv2); + void AdjustLevel(D3DVECTOR &pos, D3DVECTOR &eye, float deep, Math::Point &uv1, Math::Point &uv2); bool CreateLine(int x, int y, int len); protected: @@ -67,7 +69,7 @@ protected: char m_filename[100]; float m_level; // overall level - FPOINT m_speed; // feedrate (wind) + Math::Point m_speed; // feedrate (wind) D3DCOLORVALUE m_diffuse; // diffuse color D3DCOLORVALUE m_ambient; // ambient color float m_time; -- cgit v1.2.3-1-g7c22