Skip to content

Commit

Permalink
Rename tri-colliderKNoOPC to tri-colliderknoopc
Browse files Browse the repository at this point in the history
  • Loading branch information
q4a committed Jun 27, 2018
1 parent df3311b commit 8fac2dc
Show file tree
Hide file tree
Showing 15 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/xrNetServer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
)

#list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tri-colliderKNoOPC/dcTriListCollider.cpp")
#list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tri-colliderknoopc/dcTriListCollider.cpp")
#list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda.h")

add_definitions(-DXRNETSERVER_EXPORTS)
Expand Down
6 changes: 3 additions & 3 deletions src/xrPhysics/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ project(xrPhysics)

list(APPEND DIRS
"."
"tri-colliderKNoOPC"
"dCylinder"
"tri-colliderknoopc"
"dcylinder"
)

add_dir("${DIRS}")
Expand All @@ -14,7 +14,7 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
)

list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tri-colliderKNoOPC/dcTriListCollider.cpp")
list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tri-colliderknoopc/dcTriListCollider.cpp")
#list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda.h")

add_definitions(-DXRPHYSICS_EXPORTS -DdSINGLE -D_SECURE_SCL=0)
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/CalculateTriangle.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "MathUtils.h"

#include "Geometry.h"
#include "tri-colliderKNoOPC/dTriColliderMath.h"
#include "tri-colliderknoopc/dTriColliderMath.h"

#include "ode_redefine.h"
#include "xrCDB/xr_area.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHAICharacter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#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 "xrEngine/device.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHCharacter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#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"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHContactBodyEffector.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "PHContactBodyEffector.h"
#include "ExtendedGeom.h"
#include "tri-colliderKNoOPC/dTriList.h"
#include "tri-colliderknoopc/dTriList.h"
#include "PhysicsCommon.h"
#include "xrEngine/GameMtlLib.h"
#include "MathUtilsOde.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHElement.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "PHDynamicData.h"
#include "Physics.h"
#include "tri-colliderKNoOPC/dTriList.h"
#include "tri-colliderknoopc/dTriList.h"
#include "PHFracture.h"
#include "PHContactBodyEffector.h"
#include "MathUtils.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHJoint.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "PHDynamicData.h"
#include "Physics.h"
#include "tri-colliderKNoOPC/dTriList.h"
#include "tri-colliderknoopc/dTriList.h"
#include "PHJointDestroyInfo.h"
///////////////////////////////////////////////////////////////
//#pragma warning(push)
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHShell.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "stdafx.h"
#include "PHDynamicData.h"
#include "Physics.h"
#include "tri-colliderKNoOPC/dTriList.h"
#include "tri-colliderknoopc/dTriList.h"
#include "PHShellSplitter.h"
#include "PHFracture.h"
#include "PHJointDestroyInfo.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHShellActivate.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "PHDynamicData.h"
#include "Physics.h"
#include "tri-colliderKNoOPC/dTriList.h"
#include "tri-colliderknoopc/dTriList.h"
#include "PHShellSplitter.h"
#include "PHFracture.h"
#include "PHJointDestroyInfo.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/PHSimpleCharacter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "ExtendedGeom.h"
#include "xrCDB/Intersect.hpp"
#include "xrEngine/xr_object_list.h"
#include "tri-colliderKNoOPC/__aabb_tri.h"
#include "tri-colliderknoopc/__aabb_tri.h"
#include "PHSimpleCharacter.h"
#include "PHContactBodyEffector.h"

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

#include "PHWorld.h"
#include "tri-colliderKNoOPC/dTriList.h"
#include "tri-colliderknoopc/dTriList.h"
#include "PhysicsCommon.h"

#include "ExtendedGeom.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/Physics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "PHDynamicData.h"
#include "Physics.h"
#include "tri-colliderKNoOPC/dTriList.h"
#include "tri-colliderknoopc/dTriList.h"
#include "PHContactBodyEffector.h"
#include "xrEngine/GameMtlLib.h"

Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/ShellHit.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "stdafx.h"
#include "PHDynamicData.h"
#include "Physics.h"
#include "tri-colliderKNoOPC/dTriList.h"
#include "tri-colliderknoopc/dTriList.h"
#include "PHShellSplitter.h"
#include "PHFracture.h"
#include "PHJointDestroyInfo.h"
Expand Down
2 changes: 1 addition & 1 deletion src/xrPhysics/dcylinder/dCylinder.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "stdafx.h"
#include <xrPhysics/tri-colliderKNoOPC/dTriColliderCommon.h>
#include <xrPhysics/tri-colliderknoopc/dTriColliderCommon.h>
#include "dCylinder.h"
#include "xrPhysics/ode_include.h"

Expand Down

0 comments on commit 8fac2dc

Please sign in to comment.