Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sprint3 physfs #63

Open
wants to merge 68 commits into
base: develop
Choose a base branch
from
Open

Sprint3 physfs #63

wants to merge 68 commits into from

Conversation

FloreauLuca
Copy link
Collaborator

I integrated PhysFS into the ResourceManager. Could you review and merge this branch.
Thank you and sorry for the inconvenience

FloreauLuca and others added 30 commits February 24, 2020 14:15
…and write the log results into a file.

The LogManager has been added to the service locator and can be accessed with "Log"
- Added a constructor
- Added a Start, Wait and Close method to manage the LogManager thread
- Put some critical variables as atomic
- Added a LogManagerStatus enum to get the status of LogManger at any point
- Added a LogCategory enum to sort each log message in separate categories
- Added constructors to take LogCategory into account
- Put some redundant chunk of code directly in methods in the LogMessage struct
- Changed how the execution loop is performed

Other miscellaneous changes:
- Added a log message for when writing the log file
- Added a new test in test_logger.cpp
- Better handling of critical section
- Removed unecessary LogManager instance
- Changed Log tags order
PhysFS can be toggled on/off and the tests in 'tests/physfs/' will be
toggled with the wrapper
EliasFarhan and others added 30 commits March 17, 2020 18:16
…t comp_graph sync by moving manage event into sync
…ow and adding keyboard and gamepad controls to imgui
# Conflicts:
#	CMakeLists.txt
#	cmake/neko_executable.cmake
#	common/gles3_wrapper/CMakeLists.txt
#	common/gles3_wrapper/src/shader.cpp
#	common/sdl_engine/src/gl/gles3_window.cpp
#	core/include/engine/custom_allocator.h
#	core/src/engine/custom_allocator.cpp
#	core/src/engine/log.cpp
#	core/src/utilities/file_utility.cpp
#	core/src/utilities/json_utility.cpp
#	test/CMakeLists.txt
#	test/test_custom_allocator.cpp
#	test/test_jobsystem.cpp
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants