Command and Observer/Subject Patterns #27
Merged
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
- escapePress() is set to the disable tools command - Added SketchDisableToolsCommand to sketchcommands - Added Keyboard class
- removed sketch_mode_callback(), sketch_select_addPoint(), and sketch_select_removePoint() - Changed mBuffers to take int key - Changed updateBuffer(), deleteBuffer(), and createDeviceBuffer() to take int id instead of BufferName - render(), renderSketchGrid(), renderSketchPoints(), renderSketchNotes(), renderSketchPointTool() have been commented out -- onNotify() takes care of rendering for now - CADRender inherits from Observer - Model inherits from Model - Sketch::notify() calls Render->onNotify() - Added Observer and Subject classes - Added RenderItems struct - Model now has RenderItems member variable - New Sketch in gui now sets Render as the observer of the new sketch - Added leftMouseHold and leftMouseRelease() functions to Mouse - Added SketchMoveCommand, SketchSelectPointCommand, SketchDeselectPointCommand, and SketchDeleteCommand - Implemented these commands in the keyboard and mouse and in callbacks.cpp
- Added Middle mouse click and release functions to Mouse - Added CameraPanCommand and CameraUnsetPanCommand to cameracommands - Replaced Render.Cam with middle mouse click and release in callbacks - Added rendercommands.hpp/cpp
- Added Input class - Removed Keyboard and Mouse from CADRender - Added Input to Cadera - Set Cadera::input as user pointer for GLFW3 - Restructured includes so commands have access to CADRender - Commands now get set to Cadera::input keyboard and mouse - Disabled framebuffer resize and left CTRL callbacks for now
- Added LCtrlRelease() to Keyboard - Added framebufferresizeSlot and setter to Input - Fixed RenderFramebufferResizeCommand in rendercommands - Added Commands to Cadera: SketchSelectSet/UnsetCtrlCmds and RenderFramebufferResizeCmd - Setup added commands in cadera.cpp - All 3 commands are now executed in callbacks
- Cadera now has Selector as a member variable called mSelector - Changed Cadera::Render to mRender - Changed Cadera::Sketch to mSketch - Removed render functions from CADRender, render(), renderSketchGrid(), renderSketchPoints(), renderSketchPointTool() - callbacks.hpp is now included in cadera.hpp and not cadrender.hpp - Removed normalPos local variable in Camera::zoom as it is not needed or used - Removed Render.Sel from gui.cpp, which now points to the parameter Selector
- Moved selection to render/ - Made renderlib target sketchlib and textlib publicly - CaderaApp target no longer targets sketchlib and textlib - Removed unneeded include of rendercommands.hpp in cadera.hpp - Fixed issue where dragging imgui window would move sketch points at the same time
- Added Test Fixture TextRenderTest - Added 3 tests clearTexts, generateQuads, and generateIndices that use TextRenderTest - Made constructor of TextRender initialize variables instead of copy assignment - Made TextRender::setCursorPos() to private - Text struct value initializes members
- Added inputlib - CaderaApp now links to inputlib - inputlib now links to renderlib - Added test_input and 2 tests: inputFramebufferResized_Throw and inputFramebufferResized_NoThrow - TextRenderTest::generateQuads and generateIndices now tests both 1 and 2 characters
- updated cadrender::createCommandBuffers() - added vector of txt::Text to RenderItems - Sketch::notify() now updates mRenderItems::texts
- Added constructor to cadrender - Added setupDebugUtils(), cmd_being_label(), cmd_end_label(), setObjectName() to cadrender - Renamed Pipelines to pipelines - For destroying device, surfaces, and instance, device.destroy() and instance.destroy() are used instead of vkDestroy.. functions - Close csv file in TextRender::loadFont() - Added test_render
- Selector is now a subject - Render observes Selector - Added render() to CADRender and is called in the mainloop() - Selector notifies for sketch move, select, deselect, and delete commands - CADRender now keeps a map of each RenderData it observes CADRender when notified adds/updates the renderData for the subject. - CADRender iterates over RenderData in the command buffers - Added constant number_of_buffers_per_model - Renamed RenderItems to RenderData - Model id now starts at 1, 0 is reserved for Selector - Sketch points now dynamically change color when changed in debug menu
Owner
Author
|
Build failures left for future fixes. |
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.
Added Commands and Observer/Subject patterns for user input and rendering entities