YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Separating tools slowly

Browse Source
This commit is contained in:
Dominic Masters
2023-03-20 12:17:36 -07:00
parent a0b1cc1cdc
commit 01fa374a68
5 changed files with 57 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/CMakeLists.txt
View File

@ -12,58 +12,53 @@ set(
# Include shared libs
add_subdirectory(dawnshared)
# Include tools
add_subdirectory(dawntools)
# Change what we are building. Pulled from the cmake/targets dir.
add_subdirectory(${DAWN_BUILDING})
# Validate game project includes the target name
if(NOT DEFINED DAWN_TARGET_NAME)
message(FATAL_ERROR "You need to define a DAWN_TARGET_NAME")
endif()
if(DEFINED DAWN_TARGET_NAME)
# Add in base library
add_subdirectory(dawn)
# Add in base library
add_subdirectory(dawn)
# Compile entry targets
if(DAWN_TARGET_WIN32)
add_subdirectory(dawnwin32)
elseif(DAWN_TARGET_LINUX64)
add_subdirectory(dawnlinux64)
elseif(DAWN_TARGET_VITA)
add_subdirectory(dawnvita)
else()
message(FATAL_ERROR "You need to define an entry target")
endif()
# Compile entry targets
if(DAWN_TARGET_WIN32)
add_subdirectory(dawnwin32)
elseif(DAWN_TARGET_LINUX64)
add_subdirectory(dawnlinux64)
elseif(DAWN_TARGET_VITA)
add_subdirectory(dawnvita)
else()
message(FATAL_ERROR "You need to define an entry target")
endif()
# Host Libraries
target_link_libraries(${DAWN_TARGET_NAME}
PUBLIC
${DAWN_BUILD_HOST_LIBS}
)
# Host Libraries
target_link_libraries(${DAWN_TARGET_NAME}
PUBLIC
${DAWN_BUILD_HOST_LIBS}
)
# Compile support targets
if(DAWN_TARGET_GLFW)
add_subdirectory(dawnglfw)
add_subdirectory(dawnopengl)
endif()
# Compile support targets
if(DAWN_TARGET_GLFW)
add_subdirectory(dawnglfw)
add_subdirectory(dawnopengl)
endif()
if(DAWN_TARGET_SDL2)
add_subdirectory(dawnsdl2)
add_subdirectory(dawnopengl)
endif()
if(DAWN_TARGET_SDL2)
add_subdirectory(dawnsdl2)
add_subdirectory(dawnopengl)
endif()
if(DAWN_TARGET_VITA)
add_subdirectory(dawnopengl)
endif()
if(DAWN_TARGET_VITA)
add_subdirectory(dawnopengl)
endif()
if(DAWN_TARGET_OPENAL)
add_subdirectory(dawnopenal)
endif()
if(DAWN_TARGET_OPENAL)
add_subdirectory(dawnopenal)
endif()
# Late definitions, used by tools
if(NOT DAWN_TARGET_DEPENDENCIES_LAST)
else()
add_dependencies(${DAWN_TARGET_NAME} ${DAWN_TARGET_DEPENDENCIES_LAST})
# Late definitions, used by tools
if(NOT DAWN_TARGET_DEPENDENCIES_LAST)
else()
add_dependencies(${DAWN_TARGET_NAME} ${DAWN_TARGET_DEPENDENCIES_LAST})
endif()
endif()

8
src/dawn/scene/components/physics/3d/CharacterController3D.cpp
View File

@ -24,10 +24,10 @@ void CharacterController3D::onStart() {
auto myCollider = item->getComponent<Collider3D>();
auto colliders = getScene()->findComponents<Collider3D>();
auto itCollider = colliders.begin();
while(itCollider != colliders.end()) {
(*itCollider)->
++itCollider;
}
// while(itCollider != colliders.end()) {
// (*itCollider)->
// ++itCollider;
// }
// Move / Update
transform->setLocalPosition(transform->getLocalPosition() + (velocity * delta));