Removed FLTK dependencies from headless stage #86
Conversation
This file contains hidden or 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
I've separated gui-specific code to libstage-gui library, so base simulation does not need fltk anymore. Now stage compiles two executables: stage and stage-headless. Headless variant does not needs FLTK Fixed most of compiler errors. Linker to be fixed
Introduced MenuManager class. It descendants should deal with adding options to actuial GUI implementation All model drawing functions now get a pointer to Canvas instance. No more need to kep a pointer to world data just to get Canvas from it (after another dynamic_cast) And many more cleaning as well Code compiles now
Fixed image loading Reworkrd World::Run a bit. Now there is separate WorldGui::Run for scenes with gui support
Old libstage with FLTK-GUI remains the same. Now there is libstage_core, that works without FLTK
Stripped Push/PopColor from Model class. Model often obtains direct pointer to canvas, so it can call this methods directly Added explicit 'override' keywords for overriden methods. Now we strongly need c++11 Updated CMakeLists.txt and stage-config to properly install headers for GUI
All classes should use void DataVisualize(Camera *cam, Canvas* canvas) signature. Seems like I've missed camera and blinkenlight during my fix.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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've made some work to separate simulation part from FLTK.
I've separated libstage to two separate libraries: libstage-core and libstage. libstage-core implements headless simulation, and now it contains no references to FLTK. libstage includes libstage-core and FLTK implementation for GUI.
There are also two variants of executables: 'legacy' stage and stage-headless. Legacy variant works the same, with -gui option. stage-headless can only be headless, without any GUI.
Things that I have refactored to make it work: