-
Notifications
You must be signed in to change notification settings - Fork 34
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #580 from sdslabs/transform-system
Transform System
- Loading branch information
Showing
9 changed files
with
201 additions
and
175 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,97 +1,88 @@ | ||
| #pragma once | ||
|
|
||
| #include "core/renderer/renderer.h" | ||
| #include "core/renderer/render_pass.h" | ||
| #include "core/resource_files/basic_material_resource_file.h" | ||
| #include "main/window.h" | ||
| #include "framework/ecs_factory.h" | ||
| #include "framework/scene.h" | ||
| #include "framework/system.h" | ||
| #include "framework/components/visual/camera_component.h" | ||
| #include "components/visual/model/model_component.h" | ||
| #include "components/visual/model/animated_model_component.h" | ||
| #include "components/visual/model/sprite_component.h" | ||
|
|
||
| #include "ASSAO/ASSAO.h" | ||
|
|
||
| /// Responsible for handling all the rendering in the editor. | ||
| class RenderSystem : public System | ||
| { | ||
| EventBinder<RenderSystem> m_Binder; | ||
|
|
||
| struct LineRequests | ||
| { | ||
| Vector<float> m_Endpoints; | ||
| Vector<unsigned short> m_Indices; | ||
| }; | ||
|
|
||
| CameraComponent* m_Camera; | ||
|
|
||
| Ptr<Renderer> m_Renderer; | ||
| Vector<Matrix> m_TransformationStack; | ||
|
|
||
| Ref<BasicMaterialResourceFile> m_LineMaterial; | ||
| LineRequests m_CurrentFrameLines; | ||
|
|
||
| Microsoft::WRL::ComPtr<ID3D11Buffer> m_PerFrameVSCB; | ||
| Microsoft::WRL::ComPtr<ID3D11Buffer> m_PerCameraChangeVSCB; | ||
|
|
||
| Microsoft::WRL::ComPtr<ID3D11Buffer> m_PerCameraChangePSCB; | ||
| Microsoft::WRL::ComPtr<ID3D11Buffer> m_PerFrameCustomPSCB; | ||
| Microsoft::WRL::ComPtr<ID3D11Buffer> m_PerFramePSCB; | ||
| Microsoft::WRL::ComPtr<ID3D11Buffer> m_PerScenePSCB; | ||
|
|
||
| bool m_IsEditorRenderPassEnabled; | ||
|
|
||
| RenderSystem(); | ||
| RenderSystem(RenderSystem&) = delete; | ||
|
|
||
| void renderPassRender(float deltaMilliseconds, RenderPass renderPass); | ||
|
|
||
| Variant onOpenedScene(const Event* event); | ||
|
|
||
| public: | ||
| static RenderSystem* GetSingleton(); | ||
|
|
||
| void setConfig(const SceneSettings& sceneSettings) override; | ||
| void update(float deltaMilliseconds) override; | ||
| void renderLines(); | ||
|
|
||
| void submitLine(const Vector3& from, const Vector3& to); | ||
|
|
||
| void submitBox(const Vector3& min, const Vector3& max); | ||
| void submitSphere(const Vector3& center, const float& radius); | ||
| void submitCone(const Matrix& transform, const float& height, const float& radius); | ||
|
|
||
| void recoverLostDevice(); | ||
|
|
||
| void setCamera(CameraComponent* camera); | ||
| void restoreCamera(); | ||
|
|
||
| void calculateTransforms(Scene* scene); | ||
| void pushMatrix(const Matrix& transform); | ||
| void pushMatrixOverride(const Matrix& transform); | ||
| void popMatrix(); | ||
|
|
||
| void enableWireframeRasterizer(); | ||
| void resetDefaultRasterizer(); | ||
|
|
||
| void setPerCameraVSCBs(); | ||
| void setPerFrameVSCBs(float fogStart, float fogEnd); | ||
| void setPerCameraChangePSCBs(); | ||
| void setPerFramePSCBs(const Color& fogColor); | ||
| void setPerScenePSCBs(); | ||
| void updateStaticLights(); | ||
| void updatePerSceneBinds(); | ||
|
|
||
| void setIsEditorRenderPass(bool enabled) { m_IsEditorRenderPassEnabled = enabled; } | ||
|
|
||
| void enableLineRenderMode(); | ||
| void resetRenderMode(); | ||
|
|
||
| CameraComponent* getCamera() const { return m_Camera; } | ||
| const Matrix& getCurrentMatrix() const; | ||
| Renderer* getRenderer() const { return m_Renderer.get(); } | ||
|
|
||
| void draw() override; | ||
| }; | ||
| #pragma once | ||
|
|
||
| #include "core/renderer/renderer.h" | ||
| #include "core/renderer/render_pass.h" | ||
| #include "core/resource_files/basic_material_resource_file.h" | ||
| #include "main/window.h" | ||
| #include "framework/components/visual/camera_component.h" | ||
| #include "components/visual/model/model_component.h" | ||
| #include "components/visual/model/animated_model_component.h" | ||
| #include "components/visual/model/sprite_component.h" | ||
| #include "transform_system.h" | ||
|
|
||
| #include "ASSAO/ASSAO.h" | ||
|
|
||
| /// Responsible for handling all the rendering in the editor. | ||
| class RenderSystem : public System | ||
| { | ||
| EventBinder<RenderSystem> m_Binder; | ||
|
|
||
| struct LineRequests | ||
| { | ||
| Vector<float> m_Endpoints; | ||
| Vector<unsigned short> m_Indices; | ||
| }; | ||
|
|
||
| CameraComponent* m_Camera; | ||
|
|
||
| Ptr<Renderer> m_Renderer; | ||
|
|
||
| Ref<BasicMaterialResourceFile> m_LineMaterial; | ||
| LineRequests m_CurrentFrameLines; | ||
|
|
||
| Microsoft::WRL::ComPtr<ID3D11Buffer> m_PerFrameVSCB; | ||
| Microsoft::WRL::ComPtr<ID3D11Buffer> m_PerCameraChangeVSCB; | ||
|
|
||
| Microsoft::WRL::ComPtr<ID3D11Buffer> m_PerCameraChangePSCB; | ||
| Microsoft::WRL::ComPtr<ID3D11Buffer> m_PerFrameCustomPSCB; | ||
| Microsoft::WRL::ComPtr<ID3D11Buffer> m_PerFramePSCB; | ||
| Microsoft::WRL::ComPtr<ID3D11Buffer> m_PerScenePSCB; | ||
|
|
||
| bool m_IsEditorRenderPassEnabled; | ||
|
|
||
| RenderSystem(); | ||
| RenderSystem(RenderSystem&) = delete; | ||
|
|
||
| void renderPassRender(float deltaMilliseconds, RenderPass renderPass); | ||
|
|
||
| Variant onOpenedScene(const Event* event); | ||
|
|
||
| public: | ||
| static RenderSystem* GetSingleton(); | ||
|
|
||
| void setConfig(const SceneSettings& sceneSettings) override; | ||
| void update(float deltaMilliseconds) override; | ||
| void renderLines(); | ||
|
|
||
| void submitLine(const Vector3& from, const Vector3& to); | ||
|
|
||
| void submitBox(const Vector3& min, const Vector3& max); | ||
| void submitSphere(const Vector3& center, const float& radius); | ||
| void submitCone(const Matrix& transform, const float& height, const float& radius); | ||
|
|
||
| void recoverLostDevice(); | ||
|
|
||
| void setCamera(CameraComponent* camera); | ||
| void restoreCamera(); | ||
|
|
||
| void enableWireframeRasterizer(); | ||
| void resetDefaultRasterizer(); | ||
|
|
||
| void setPerCameraVSCBs(); | ||
| void setPerFrameVSCBs(float fogStart, float fogEnd); | ||
| void setPerCameraChangePSCBs(); | ||
| void setPerFramePSCBs(const Color& fogColor); | ||
| void setPerScenePSCBs(); | ||
| void updateStaticLights(); | ||
| void updatePerSceneBinds(); | ||
|
|
||
| void setIsEditorRenderPass(bool enabled) { m_IsEditorRenderPassEnabled = enabled; } | ||
|
|
||
| void enableLineRenderMode(); | ||
| void resetRenderMode(); | ||
|
|
||
| CameraComponent* getCamera() const { return m_Camera; } | ||
| Renderer* getRenderer() const { return m_Renderer.get(); } | ||
|
|
||
| void draw() override; | ||
| }; |
Oops, something went wrong.