src/xrPhysics - the case of letters in include strings has been changed

OpenXRay · Jun 30, 2018 · 259e035 · 259e035
1 parent 65b7a4d
commit 259e035
Show file tree

Hide file tree

Showing 58 changed files with 119 additions and 120 deletions.
diff --git a/src/xrPhysics/ElevatorState.h b/src/xrPhysics/ElevatorState.h
@@ -1,7 +1,7 @@
 #ifndef ELEVATOR_STAETE
 #define ELEVATOR_STAETE
 
-#include "ielevatorstate.h"
+#include "IElevatorState.h"
 class CPHCharacter;
 struct dContact;
 struct SGameMtl;

diff --git a/src/xrPhysics/ExtendedGeom.cpp b/src/xrPhysics/ExtendedGeom.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "extendedgeom.h"
-#include "dcylinder/dcylinder.h"
+#include "ExtendedGeom.h"
+#include "dcylinder/dCylinder.h"
 bool IsCyliderContact(const dContact& c)
 {
     int geomClass = -1;

diff --git a/src/xrPhysics/ExtendedGeom.h b/src/xrPhysics/ExtendedGeom.h
@@ -8,7 +8,7 @@
 
 #include <ode/common.h>
 #include <ode/collision.h>
-#include "physicscommon.h"
+#include "PhysicsCommon.h"
 #include "MathUtils.h"
 #ifdef DEBUG
 #include "debug_output.h"

diff --git a/src/xrPhysics/Geometry.h b/src/xrPhysics/Geometry.h
@@ -3,8 +3,8 @@
 #define GEOMETRY_H
 #include "PhysicsCommon.h"
 #include "ExtendedGeom.h"
-#include "mathutilsode.h"
-#include "xrEngine/iphysicsgeometry.h"
+#include "MathUtilsOde.h"
+#include "xrEngine/IPhysicsGeometry.h"
 #include "xrCore/_cylinder.h"
 
 // this is equivalent dMULTIPLYOP0_333 whith consequent transposion of A

diff --git a/src/xrPhysics/GeometryBits.cpp b/src/xrPhysics/GeometryBits.cpp
@@ -2,8 +2,8 @@
 
 #include "GeometryBits.h"
 
-#include "phworld.h"
-#include "geometry.h"
+#include "PHWorld.h"
+#include "Geometry.h"
 
 enum geom_category { gct_static = 1 << 0, gct_dynamic = 1 << 1 };
 

diff --git a/src/xrPhysics/IActivationShape.cpp b/src/xrPhysics/IActivationShape.cpp
@@ -1,9 +1,9 @@
 #include "stdafx.h"
-#include "iactivationshape.h"
-#include "phactivationshape.h"
-#include "physics.h"
-#include "iphysicsshellholder.h"
-#include "phcollidevalidator.h"
+#include "IActivationShape.h"
+#include "PHActivationShape.h"
+#include "Physics.h"
+#include "IPhysicsShellHolder.h"
+#include "PHCollideValidator.h"
 void ActivateShapeExplosive(IPhysicsShellHolder* self_obj, const Fvector& size, Fvector& out_size, Fvector& in_out_pos)
 {
     //////////////

diff --git a/src/xrPhysics/IPHStaticGeomShell.h b/src/xrPhysics/IPHStaticGeomShell.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "physicsexternalcommon.h"
+#include "PhysicsExternalCommon.h"
 class IPHStaticGeomShell
 {
 protected:

diff --git a/src/xrPhysics/IPHWorld.h b/src/xrPhysics/IPHWorld.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "physicsexternalcommon.h"
+#include "PhysicsExternalCommon.h"
 #include "iphysics_scripted.h"
 #include "xrCore/FTimer.h"
 #include "xrCDB/xrCDB.h" // build_callback

diff --git a/src/xrPhysics/MovementBoxDynamicActivate.cpp b/src/xrPhysics/MovementBoxDynamicActivate.cpp
@@ -1,14 +1,14 @@
 #include "stdafx.h"
 
-#include "movementboxdynamicactivate.h"
+#include "MovementBoxDynamicActivate.h"
 
 #include "ExtendedGeom.h"
 #include "MathUtils.h"
 #include "Physics.h"
 #include "ph_valid_ode.h"
 #include "MathUtilsOde.h"
-#include "iphysicsshellholder.h"
-#include "phcharacter.h"
+#include "IPhysicsShellHolder.h"
+#include "PHCharacter.h"
 #include "xrEngine/GameMtlLib.h"
 
 ObjectContactCallbackFun* saved_callback = 0;

diff --git a/src/xrPhysics/PHAICharacter.cpp b/src/xrPhysics/PHAICharacter.cpp
@@ -4,9 +4,9 @@
 #include "Physics.h"
 #include "ExtendedGeom.h"
 #include "xrCDB/Intersect.hpp"
-#include "tri-colliderKNoOPC\__aabb_tri.h"
+#include "tri-colliderknoopc/__aabb_tri.h"
 
-#include "phaicharacter.h"
+#include "PHAICharacter.h"
 #include "xrEngine/device.h"
 
 #ifdef DEBUG

diff --git a/src/xrPhysics/PHActivationShape.cpp b/src/xrPhysics/PHActivationShape.cpp
@@ -3,9 +3,9 @@
 
 #include "Physics.h"
 #include "MathUtils.h"
-#include "phvalidevalues.h"
+#include "PHValideValues.h"
 
-#include "Extendedgeom.h"
+#include "ExtendedGeom.h"
 #include "SpaceUtils.h"
 #include "MathUtils.h"
 #include "xrEngine/GameMtlLib.h"
@@ -19,7 +19,7 @@
 
 #include "PHDynamicData.h"
 #include "xrServerEntities/PHSynchronize.h"
-#include "xrServerEntities/phnetstate.h"
+#include "xrServerEntities/PHNetState.h"
 static float max_depth = 0.f;
 static float friction_factor = 0.f;
 static const float cfm = 1.e-10f;

diff --git a/src/xrPhysics/PHActivationShape.h b/src/xrPhysics/PHActivationShape.h
@@ -2,7 +2,7 @@
 #define PH_ACTIVATION_SHAPE
 #endif
 
-#include "phvalidevalues.h"
+#include "PHValideValues.h"
 #include "PHObject.h"
 class IPhysicsShellHolder;
 class CPHActivationShape : public CPHObject

diff --git a/src/xrPhysics/PHActorCharacter.cpp b/src/xrPhysics/PHActorCharacter.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
-#include "phactorcharacter.h"
-#include "Extendedgeom.h"
+#include "PHActorCharacter.h"
+#include "ExtendedGeom.h"
 #include "PhysicsCommon.h"
 
 #include "IPhysicsShellHolder.h"

diff --git a/src/xrPhysics/PHActorCharacter.h b/src/xrPhysics/PHActorCharacter.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "phsimplecharacter.h"
+#include "PHSimpleCharacter.h"
 #include "PHActorCharacterInline.h"
 
 class CPhysicShellHolder;

diff --git a/src/xrPhysics/PHCapture.cpp b/src/xrPhysics/PHCapture.cpp
@@ -1,17 +1,17 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
-#include "StdAfx.h"
+#include "stdafx.h"
 
 #include "PHCapture.h"
-#include "phcharacter.h"
+#include "PHCharacter.h"
 #include "Physics.h"
 #include "ExtendedGeom.h"
 
 #include "Include/xrRender/Kinematics.h"
-#include "iphysicsshellholder.h"
+#include "IPhysicsShellHolder.h"
 #include "xrCore/Animation/Bone.hpp"
 #include "xrEngine/device.h"
-#include "mathutilsode.h"
-#include "phelement.h"
+#include "MathUtilsOde.h"
+#include "PHElement.h"
 
 ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////

diff --git a/src/xrPhysics/PHCaptureInit.cpp b/src/xrPhysics/PHCaptureInit.cpp
@@ -1,13 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////
-#include "StdAfx.h"
-#include "phcharacter.h"
+#include "stdafx.h"
+#include "PHCharacter.h"
 #include "Physics.h"
 #include "ExtendedGeom.h"
 #include "PHCapture.h"
 
 #include "Include/xrRender/Kinematics.h"
 
-#include "iphysicsshellholder.h"
+#include "IPhysicsShellHolder.h"
 #include "xrCore/Animation/Bone.hpp"
 #include "xrEngine/device.h"
 extern class CPHWorld* ph_world;
@@ -248,7 +248,7 @@ void CPHCapture::Release()
 
     e_state = cstReleased;
 }
-#include "phelement.h"
+#include "PHElement.h"
 void CPHCapture::Deactivate()
 {
     Release();

diff --git a/src/xrPhysics/PHCharacter.cpp b/src/xrPhysics/PHCharacter.cpp
@@ -1,19 +1,19 @@
 #include "stdafx.h"
 
-#include "phcharacter.h"
+#include "PHCharacter.h"
 #include "PHDynamicData.h"
 #include "Physics.h"
 #include "ExtendedGeom.h"
-#include "iphysicsshellholder.h"
+#include "IPhysicsShellHolder.h"
 
 #include "xrCDB/Intersect.hpp"
 #include "xrEngine/GameMtlLib.h"
 
-#include "tri-colliderKNoOPC\__aabb_tri.h"
+#include "tri-colliderknoopc/__aabb_tri.h"
 #include "ode/ode/src/util.h"
 #include "ph_valid_ode.h"
-#include "Phaicharacter.h"
-#include "phactorcharacter.h"
+#include "PHAICharacter.h"
+#include "PHActorCharacter.h"
 
 CPHCharacter::CPHCharacter(void) : CPHDisablingTranslational()
 {

diff --git a/src/xrPhysics/PHCollideValidator.cpp b/src/xrPhysics/PHCollideValidator.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "PHObject.h"
-#include "phcollidevalidator.h"
+#include "PHCollideValidator.h"
 
 CGID CPHCollideValidator::freeGroupID = 0;
 _flags<CLClassBits> CPHCollideValidator::ClassFlags = {CLClassBits(0)};
@@ -61,10 +61,9 @@ void CPHCollideValidator::SetRagDollClassNotCollide(CPHObject& obj)
     obj.collide_class_bits().set(cbNCClassRagDoll, TRUE);
 }
 
-//Относит физический объект к классу анимированных объектов
+//Relates a physical object to the class of animated objects
 void CPHCollideValidator::SetAnimatedClass(CPHObject& obj) { obj.collide_class_bits().set(cbClassAnimated, TRUE); }
-//Задаёт игнорирование коллизий данного физического
-//объекта с анимированными телами
+//Sets ignoring collision of the physical object with animated objects (bodies)
 void CPHCollideValidator::SetAnimatedClassNotCollide(CPHObject& obj)
 {
     obj.collide_class_bits().set(cbNCClassAnimated, TRUE);

diff --git a/src/xrPhysics/PHCollideValidator.h b/src/xrPhysics/PHCollideValidator.h
@@ -1,7 +1,7 @@
 #ifndef PH_COLLIDE_VALIDATOR
 #define PH_COLLIDE_VALIDATOR
 
-#include "icollidevalidator.h"
+#include "ICollideValidator.h"
 typedef u32 CLClassBits;
 typedef u32 CLBits;
 class CPHObject;
@@ -19,8 +19,8 @@ class CPHCollideValidator
         cbNCClassSmall = 1 << 7,
         cbClassRagDoll = 1 << 8,
         cbNCClassRagDoll = 1 << 9,
-        cbClassAnimated = 1 << 10, //класс анимированного физического объекта
-        cbNCClassAnimated = 1 << 11, //свойство игнорирования класса анимированного физического объекта
+        cbClassAnimated = 1 << 10, //animated physical object class
+        cbNCClassAnimated = 1 << 11, //ignore property of animated physical object class
         cbNone = 1 << 12
 
     };

diff --git a/src/xrPhysics/PHContactBodyEffector.cpp b/src/xrPhysics/PHContactBodyEffector.cpp
@@ -4,7 +4,7 @@
 #include "tri-colliderknoopc/dTriList.h"
 #include "PhysicsCommon.h"
 #include "xrEngine/GameMtlLib.h"
-#include "mathutilsode.h"
+#include "MathUtilsOde.h"
 void CPHContactBodyEffector::Init(dBodyID body, const dContact& contact, SGameMtl* material)
 {
     CPHBaseBodyEffector::Init(body);

diff --git a/src/xrPhysics/PHDisabling.cpp b/src/xrPhysics/PHDisabling.cpp
@@ -2,7 +2,7 @@
 #include "PHDisabling.h"
 #include "PhysicsCommon.h"
 #include "Physics.h"
-#include "mathutilsode.h"
+#include "MathUtilsOde.h"
 #ifdef DEBUG
 #include "debug_output.h"
 #endif

diff --git a/src/xrPhysics/PHElement.cpp b/src/xrPhysics/PHElement.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "stdafx.h"
 #include "PHDynamicData.h"
 #include "Physics.h"
 #include "tri-colliderknoopc/dTriList.h"

diff --git a/src/xrPhysics/PHElement.h b/src/xrPhysics/PHElement.h
@@ -3,7 +3,7 @@
 ///////////////////////////Implemetation//for//CPhysicsElement//////////////////
 ////////////////////////////////////////////////////////////////////////////////
 #include "Geometry.h"
-#include "phdefs.h"
+#include "PHDefs.h"
 #include "PhysicsCommon.h"
 #include "xrServerEntities/PHSynchronize.h"
 #include "PHDisabling.h"

diff --git a/src/xrPhysics/PHElementNetState.cpp b/src/xrPhysics/PHElementNetState.cpp
@@ -1,10 +1,10 @@
-#include "StdAfx.h"
-#include "physicsshell.h"
-#include "phinterpolation.h"
-#include "phelement.h"
-#include "phobject.h"
-#include "phworld.h"
-#include "phshell.h"
+#include "stdafx.h"
+#include "PhysicsShell.h"
+#include "PHInterpolation.h"
+#include "PHElement.h"
+#include "PHObject.h"
+#include "PHWorld.h"
+#include "PHShell.h"
 
 void CPHElement::get_State(SPHNetState& state)
 {

diff --git a/src/xrPhysics/PHGeometryOwner.cpp b/src/xrPhysics/PHGeometryOwner.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "PHGeometryOwner.h"
-#include "phworld.h"
+#include "PHWorld.h"
 
 #include "Include/xrRender/Kinematics.h"
 #include "xrCore/Animation/Bone.hpp"

diff --git a/src/xrPhysics/PHIsland.cpp b/src/xrPhysics/PHIsland.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #include "PHIsland.h"
-#include "physics.h"
+#include "Physics.h"
 #include "ph_valid_ode.h"
 void CPHIsland::Step(dReal step)
 {

diff --git a/src/xrPhysics/PHJoint.cpp b/src/xrPhysics/PHJoint.cpp
@@ -1,4 +1,4 @@
-#include "StdAfx.h"
+#include "stdafx.h"
 #include "PHDynamicData.h"
 #include "Physics.h"
 #include "tri-colliderknoopc/dTriList.h"

diff --git a/src/xrPhysics/PHJointDestroyInfo.cpp b/src/xrPhysics/PHJointDestroyInfo.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #include "PHJointDestroyInfo.h"
 #include "PhysicsCommon.h"
-#include "mathutilsode.h"
+#include "MathUtilsOde.h"
 #include "console_vars.h"
 CPHJointDestroyInfo::CPHJointDestroyInfo(float break_force, float break_torque)
 {

diff --git a/src/xrPhysics/PHMoveStorage.cpp b/src/xrPhysics/PHMoveStorage.cpp
@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "phmovestorage.h"
+#include "PHMoveStorage.h"
 #pragma warning(push)
 #pragma warning(disable : 4995)
 #pragma warning(disable : 4267)

diff --git a/src/xrPhysics/PHMoveStorage.h b/src/xrPhysics/PHMoveStorage.h
@@ -1,6 +1,6 @@
 #ifndef PHMOVESTORAGE_H
 #define PHMOVESTORAGE_H
-#include "phgeometryowner.h"
+#include "PHGeometryOwner.h"
 // DEFINE_VECTOR(dReal *&,POSITIONS_STORAGE,POSITIONS_I);
 
 class CPHPositionsPairs

diff --git a/src/xrPhysics/PHObject.h b/src/xrPhysics/PHObject.h
@@ -1,7 +1,7 @@
 #pragma once
 #ifndef CPHOBJECT
 #define CPHOBJECT
-#include "xrCDB/ispatial.h"
+#include "xrCDB/ISpatial.h"
 #include "PHItemList.h"
 #include "PHIsland.h"
 typedef u32 CLClassBits;