From efe4f0baddf10124581e4fcb88d55a52838b06a1 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sun, 9 Sep 2012 17:51:10 +0200 Subject: Refactoring in src/common - refactored CInstanceManager and some headers - removed old headers --- src/physics/physics.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/physics/physics.h') diff --git a/src/physics/physics.h b/src/physics/physics.h index 2e1f5eb..17cfd44 100644 --- a/src/physics/physics.h +++ b/src/physics/physics.h @@ -19,7 +19,7 @@ #pragma once -#include "common/misc.h" +#include "common/global.h" #include "object/object.h" #include "math/vector.h" -- cgit v1.2.3-1-g7c22 From 479a67a731be5a5e8035ea7acce0344c7c605814 Mon Sep 17 00:00:00 2001 From: Zaba999 Date: Mon, 10 Sep 2012 23:29:38 +0200 Subject: Merge with changes from Zaba999 fork. --- src/physics/physics.h | 57 ++++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 26 deletions(-) (limited to 'src/physics/physics.h') diff --git a/src/physics/physics.h b/src/physics/physics.h index 2e1f5eb..79d28e4 100644 --- a/src/physics/physics.h +++ b/src/physics/physics.h @@ -1,5 +1,6 @@ // * This file is part of the COLOBOT source code // * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012, Polish Portal of Colobot (PPC) // * // * 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 @@ -14,10 +15,14 @@ // * You should have received a copy of the GNU General Public License // * along with this program. If not, see http://www.gnu.org/licenses/. -// physics.h - #pragma once +/** + * \file physics/physics.h + * \brief Responsible for physics "and more" in game + */ + + #include "common/misc.h" #include "object/object.h" @@ -25,17 +30,17 @@ class CInstanceManager; -class CCamera; class CObject; class CBrain; class CMotion; -class CSound; +class CSoundInterface; namespace Gfx { +class CCamera; class CEngine; class CLight; -class CParticule; +class CParticle; class CTerrain; class CWater; }; @@ -170,7 +175,7 @@ protected: void SoundMotorStop(float rTime, ObjectType type); void SoundReactorFull(float rTime, ObjectType type); void SoundReactorStop(float rTime, ObjectType type); - void FrameParticule(float aTime, float rTime); + void FrameParticle(float aTime, float rTime); void MotorUpdate(float aTime, float rTime); void EffectUpdate(float aTime, float rTime); void UpdateMotionStruct(float rTime, Motion &motion); @@ -182,24 +187,24 @@ protected: bool ExploOther(ObjectType iType, CObject *pObj, ObjectType oType, float force); int ExploHimself(ObjectType iType, ObjectType oType, float force); - void PowerParticule(float factor, bool bBreak); - void CrashParticule(float crash); - void MotorParticule(float aTime, float rTime); - void WaterParticule(float aTime, Math::Vector pos, ObjectType type, float floor, float advance, float turn); - void WheelParticule(int color, float width); + void PowerParticle(float factor, bool bBreak); + void CrashParticle(float crash); + void MotorParticle(float aTime, float rTime); + void WaterParticle(float aTime, Math::Vector pos, ObjectType type, float floor, float advance, float turn); + void WheelParticle(int color, float width); protected: - CInstanceManager* m_iMan; + CInstanceManager* m_iMan; Gfx::CEngine* m_engine; Gfx::CLightManager* m_lightMan; Gfx::CParticle* m_particle; Gfx::CTerrain* m_terrain; Gfx::CWater* m_water; Gfx::CCamera* m_camera; - CObject* m_object; - CBrain* m_brain; - CMotion* m_motion; - CSound* m_sound; + CObject* m_object; + CBrain* m_brain; + CMotion* m_motion; + CSoundInterface* m_sound; PhysicsType m_type; // TYPE_* float m_gravity; // force of gravity @@ -217,15 +222,15 @@ protected: float m_linVibrationFactor; float m_cirVibrationFactor; float m_inclinaisonFactor; - float m_lastPowerParticule; - float m_lastSlideParticule; - float m_lastMotorParticule; - float m_lastWaterParticule; - float m_lastUnderParticule; - float m_lastPloufParticule; - float m_lastFlameParticule; - bool m_bWheelParticuleBrake; - Math::Vector m_wheelParticulePos[2]; + float m_lastPowerParticle; + float m_lastSlideParticle; + float m_lastMotorParticle; + float m_lastWaterParticle; + float m_lastUnderParticle; + float m_lastPloufParticle; + float m_lastFlameParticle; + bool m_bWheelParticleBrake; + Math::Vector m_wheelParticlePos[2]; float m_absorbWater; float m_reactorTemperature; float m_reactorRange; @@ -234,7 +239,7 @@ protected: float m_lastEnergy; float m_lastSoundWater; float m_lastSoundInsect; - float m_restBreakParticule; + float m_restBreakParticle; float m_floorLevel; // ground level float m_floorHeight; // height above the ground int m_soundChannel; -- cgit v1.2.3-1-g7c22