-
Notifications
You must be signed in to change notification settings - Fork 5
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
FloreauLuca
wants to merge
68
commits into
develop
Choose a base branch
from
sprint3_physfs
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Sprint3 physfs #63
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…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
…ngine into sprint2_logger
…ngine into sprint3_physfs
PhysFS can be toggled on/off and the tests in 'tests/physfs/' will be toggled with the wrapper
…t comp_graph sync by moving manage event into sync
…ow and adding keyboard and gamepad controls to imgui
…changing context between thread
…File with no RAII
…faster) + corrected the benchmark
# 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
…ngine into sprint3_physfs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I integrated PhysFS into the ResourceManager. Could you review and merge this branch.
Thank you and sorry for the inconvenience