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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/build-helloworld-vita.yml vendored
View File

@ -49,6 +49,13 @@ jobs:
export PATH=$VITASDK/bin:$PATH export PATH=$VITASDK/bin:$PATH
git submodule update --init --recursive git submodule update --init --recursive
- name: Build Tools:
run: |
mkdir tools
cd tools
cmake .. -DDAWN_BUILD_TARGET=target-tools
make
- name: Build Game - name: Build Game
run: | run: |
export PATH=$VITASDK/bin:$PATH export PATH=$VITASDK/bin:$PATH

4
cmake/targets/CMakeLists.txt
View File

@ -6,9 +6,9 @@
# Check for build target, or default. This is pretty much not guaranteed. # Check for build target, or default. This is pretty much not guaranteed.
if(NOT DEFINED DAWN_BUILD_TARGET) if(NOT DEFINED DAWN_BUILD_TARGET)
if(WIN32) if(WIN32)
set(DAWN_BUILD_TARGET "target-rose-win32-glfw") set(DAWN_BUILD_TARGET "target-helloworld-win32-glfw")
elseif(UNIX AND NOT APPLE) elseif(UNIX AND NOT APPLE)
set(DAWN_BUILD_TARGET "target-rose-linux64-glfw") set(DAWN_BUILD_TARGET "target-helloworld-linux64-glfw")
endif() endif()
endif() endif()

6
cmake/targets/target-tools/CMakeLists.txt Normal file
View File

@ -0,0 +1,6 @@
# Copyright (c) 2023 Dominic Masters
#
# This software is released under the MIT License.
# https://opensource.org/licenses/MIT
set(DAWN_BUILDING dawntools CACHE INTERNAL ${DAWN_CACHE_TARGET})

81
src/CMakeLists.txt
View File

@ -12,58 +12,53 @@ set(
# Include shared libs # Include shared libs
add_subdirectory(dawnshared) add_subdirectory(dawnshared)
# Include tools
add_subdirectory(dawntools)
# Change what we are building. Pulled from the cmake/targets dir. # Change what we are building. Pulled from the cmake/targets dir.
add_subdirectory(${DAWN_BUILDING}) add_subdirectory(${DAWN_BUILDING})
# Validate game project includes the target name # Validate game project includes the target name
if(NOT DEFINED DAWN_TARGET_NAME) if(DEFINED DAWN_TARGET_NAME)
message(FATAL_ERROR "You need to define a DAWN_TARGET_NAME") # Add in base library
endif() add_subdirectory(dawn)
# Add in base library # Compile entry targets
add_subdirectory(dawn) 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 # Host Libraries
if(DAWN_TARGET_WIN32) target_link_libraries(${DAWN_TARGET_NAME}
add_subdirectory(dawnwin32) PUBLIC
elseif(DAWN_TARGET_LINUX64) ${DAWN_BUILD_HOST_LIBS}
add_subdirectory(dawnlinux64) )
elseif(DAWN_TARGET_VITA)
add_subdirectory(dawnvita)
else()
message(FATAL_ERROR "You need to define an entry target")
endif()
# Host Libraries # Compile support targets
target_link_libraries(${DAWN_TARGET_NAME} if(DAWN_TARGET_GLFW)
PUBLIC add_subdirectory(dawnglfw)
${DAWN_BUILD_HOST_LIBS} add_subdirectory(dawnopengl)
) endif()
# Compile support targets if(DAWN_TARGET_SDL2)
if(DAWN_TARGET_GLFW) add_subdirectory(dawnsdl2)
add_subdirectory(dawnglfw) add_subdirectory(dawnopengl)
add_subdirectory(dawnopengl) endif()
endif()
if(DAWN_TARGET_SDL2) if(DAWN_TARGET_VITA)
add_subdirectory(dawnsdl2) add_subdirectory(dawnopengl)
add_subdirectory(dawnopengl) endif()
endif()
if(DAWN_TARGET_VITA) if(DAWN_TARGET_OPENAL)
add_subdirectory(dawnopengl) add_subdirectory(dawnopenal)
endif() endif()
if(DAWN_TARGET_OPENAL) # Late definitions, used by tools
add_subdirectory(dawnopenal) if(NOT DAWN_TARGET_DEPENDENCIES_LAST)
endif() else()
add_dependencies(${DAWN_TARGET_NAME} ${DAWN_TARGET_DEPENDENCIES_LAST})
# Late definitions, used by tools endif()
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 myCollider = item->getComponent<Collider3D>();
auto colliders = getScene()->findComponents<Collider3D>(); auto colliders = getScene()->findComponents<Collider3D>();
auto itCollider = colliders.begin(); auto itCollider = colliders.begin();
while(itCollider != colliders.end()) { // while(itCollider != colliders.end()) {
(*itCollider)-> // (*itCollider)->
++itCollider; // ++itCollider;
} // }
// Move / Update // Move / Update
transform->setLocalPosition(transform->getLocalPosition() + (velocity * delta)); transform->setLocalPosition(transform->getLocalPosition() + (velocity * delta));