Skip to content

Commit

Permalink
Merge pull request #220 from q4a/xd_dev_inc
Browse files Browse the repository at this point in the history
The case of letters in include strings has been changed
  • Loading branch information
Xottab-DUTY committed Jun 30, 2018
2 parents 90864ad + 2b53d37 commit c31911f
Show file tree
Hide file tree
Showing 81 changed files with 143 additions and 144 deletions.
2 changes: 1 addition & 1 deletion Externals/OPCODE/OPC_TreeBuilders.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#ifndef __OPC_TREEBUILDERS_H__
#define __OPC_TREEBUILDERS_H__

#include "opc_aabbtree.h"
#include "OPC_AABBTree.h"
#include "xrCore/xrPool.h"

//! Tree splitting rules
Expand Down
2 changes: 1 addition & 1 deletion Externals/OPCODE/Opcode.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ using namespace IceCore;
#endif

#ifndef __ICEMATHS_H__
#include <Math.h>
#include <math.h>
#define ICEMATHS_API OPCODE_API
namespace IceMaths
{
Expand Down
2 changes: 1 addition & 1 deletion src/Include/xrRender/Kinematics.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#pragma once

#include "RenderVisual.h"
#include "Layers\xrRender\KinematicsAddBoneTransform.hpp" //--#SM+#--
#include "Layers/xrRender/KinematicsAddBoneTransform.hpp" //--#SM+#--

typedef void (*UpdateCallback)(IKinematics* P);

Expand Down
2 changes: 1 addition & 1 deletion src/Include/xrRender/KinematicsAnimated.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "xrCore/Animation/SkeletonMotions.hpp"
#include "animation_blend.h"
#include "Layers/xrrender/KinematicAnimatedDefs.h"
#include "Layers/xrRender/KinematicAnimatedDefs.h"
#include "Layers/xrRender/KinematicsAddBoneTransform.hpp" //--#SM+#--

class IKinematics;
Expand Down
2 changes: 1 addition & 1 deletion src/xrAICore/Navigation/graph_edge.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#pragma once

#include <loki/emptytype.h>
#include <loki/EmptyType.h>

template <typename _edge_weight_type, typename _vertex_type>
class CEdgeBase
Expand Down
2 changes: 1 addition & 1 deletion src/xrCDB/ISpatial.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "xrEngine/xr_object.h"
#include "xrEngine/PS_Instance.h"
#endif
#include "xrEngine/Device.h"
#include "xrEngine/device.h"
#include "xrEngine/GameFont.h"
#include "xrEngine/PerformanceAlert.hpp"
#include "xrCore/Threading/Lock.hpp"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/xrEngine/Device_destroy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "Include/xrRender/DrawUtils.h"
#include "Render.h"
#include "IGame_Persistent.h"
#include "xr_IOConsole.h"
#include "XR_IOConsole.h"
#include "xr_input.h"

void CRenderDevice::Destroy()
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/FDemoRecord.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "x_ray.h"

#include "GameFont.h"
#include "fDemoRecord.h"
#include "FDemoRecord.h"
#include "XR_IOConsole.h"
#include "xr_input.h"
#include "xr_object.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/stdafx.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "xrCore/log.h"
#endif
#include "device.h"
#include "xrCore/fs.h"
#include "xrCore/FS.h"

#include "xrCDB/xrXRC.h"

Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/xrTheora_Stream.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "xrtheora_stream.h"
#include "xrTheora_Stream.h"

#ifdef _EDITOR
//# pragma comment(lib, "x:\\oggB.lib")
Expand Down
2 changes: 1 addition & 1 deletion src/xrEngine/xrTheora_Stream.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#pragma once

#include <theora/theora.h>
#include "xrCore/Stream_Reader.h"
#include "xrCore/stream_reader.h"

class ENGINE_API CTheoraStream
{
Expand Down
4 changes: 2 additions & 2 deletions src/xrEngine/xrTheora_Surface.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "stdafx.h"
#include "xrtheora_surface.h"
#include "xrtheora_stream.h"
#include "xrTheora_Surface.h"
#include "xrTheora_Stream.h"

CTheoraSurface::CTheoraSurface()
{
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/xrNetServer/NET_AuthCheck.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#ifndef NET_AUTH_CHECK_INCLUDED
#define NET_AUTH_CHECK_INCLUDED

#include "net_shared.h"
#include "NET_Shared.h"

using xr_auth_strings_t = xr_vector<shared_str>;
void XRNETSERVER_API fill_auth_check_params(xr_auth_strings_t& ignore, xr_auth_strings_t& check);
Expand Down
6 changes: 3 additions & 3 deletions src/xrNetServer/NET_Client.cpp
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "stdafx.h"
#include "NET_Common.h"
#include "net_Client.h"
#include "net_Server.h"
#include "net_Messages.h"
#include "NET_Client.h"
#include "NET_Server.h"
#include "NET_Messages.h"
#include "NET_Log.h"
#include "xrCore/Threading/Lock.hpp"

Expand Down
2 changes: 1 addition & 1 deletion src/xrNetServer/NET_Log.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "stdafx.h"
#include "net_log.h"
#include "NET_Log.h"
#include "xrCore/Threading/Lock.hpp"
//---------------------------------------------------------
string64 PacketName[] = {"M_UPDATE", // DUAL: Update state
Expand Down
2 changes: 1 addition & 1 deletion src/xrNetServer/NET_Server.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "net_shared.h"
#include "NET_Shared.h"
#include "ip_filter.h"
#include "NET_Common.h"
#include "NET_PlayersMonitor.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/ElevatorState.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef ELEVATOR_STAETE
#define ELEVATOR_STAETE

#include "ielevatorstate.h"
#include "IElevatorState.h"
class CPHCharacter;
struct dContact;
struct SGameMtl;
Expand Down
4 changes: 2 additions & 2 deletions src/xrPhysics/ExtendedGeom.cpp
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/ExtendedGeom.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/xrPhysics/Geometry.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/xrPhysics/GeometryBits.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 };

Expand Down
10 changes: 5 additions & 5 deletions src/xrPhysics/IActivationShape.cpp
Original file line number Diff line number Diff line change
@@ -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)
{
//////////////
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/IPHStaticGeomShell.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "physicsexternalcommon.h"
#include "PhysicsExternalCommon.h"
class IPHStaticGeomShell
{
protected:
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/IPHWorld.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/xrPhysics/MovementBoxDynamicActivate.cpp
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/xrPhysics/PHAICharacter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/xrPhysics/PHActivationShape.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHActivationShape.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define PH_ACTIVATION_SHAPE
#endif

#include "phvalidevalues.h"
#include "PHValideValues.h"
#include "PHObject.h"
class IPhysicsShellHolder;
class CPHActivationShape : public CPHObject
Expand Down
4 changes: 2 additions & 2 deletions src/xrPhysics/PHActorCharacter.cpp
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHActorCharacter.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "phsimplecharacter.h"
#include "PHSimpleCharacter.h"
#include "PHActorCharacterInline.h"

class CPhysicShellHolder;
Expand Down
10 changes: 5 additions & 5 deletions src/xrPhysics/PHCapture.cpp
Original file line number Diff line number Diff line change
@@ -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"

///////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////
Expand Down
8 changes: 4 additions & 4 deletions src/xrPhysics/PHCaptureInit.cpp
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -248,7 +248,7 @@ void CPHCapture::Release()

e_state = cstReleased;
}
#include "phelement.h"
#include "PHElement.h"
void CPHCapture::Deactivate()
{
Release();
Expand Down
10 changes: 5 additions & 5 deletions src/xrPhysics/PHCharacter.cpp
Original file line number Diff line number Diff line change
@@ -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()
{
Expand Down
7 changes: 3 additions & 4 deletions src/xrPhysics/PHCollideValidator.cpp
Original file line number Diff line number Diff line change
@@ -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)};
Expand Down Expand Up @@ -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);
Expand Down
Loading

0 comments on commit c31911f

Please sign in to comment.