96a7896da9
changed includes to SHHandle and SHResourceLibrary
2022-10-23 12:50:56 +08:00
679533819f
Merge branch 'main' into SP3-141-Camera-System
2022-10-23 12:43:39 +08:00
c15994532b
Added a function for editor camera update
2022-10-23 12:42:25 +08:00
6039ec534d
Added clamping of camera, and copying of position and rotation from transform
2022-10-23 12:32:08 +08:00
77aa5b8c7d
Bindings and Controllers
2022-10-22 23:27:43 +08:00
6ea5ae7707
Added serialization and deserialization of pipeline on the material (no shader loading yet)
2022-10-22 21:36:02 +08:00
ebfcf1c6bb
Transform now stores orientation as Quaternions. Interface unchanged
2022-10-22 20:16:38 +08:00
9d8dfd334f
Added serialization interfaces for Material (missing Shader)
2022-10-22 19:38:02 +08:00
db751bd141
Editor & Scripts can now override Physics-Based objects' Transforms
2022-10-22 18:22:26 +08:00
76f83068ba
Added type information to SHShaderBlockInterface variables
2022-10-22 02:07:28 +08:00
304071cb0a
Apparently static keyword gives error but it compiles
2022-10-22 00:42:50 +08:00
459d9dd9fd
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-22 00:08:43 +08:00
bc8b5f8167
Merge branch 'main' into SP3-8-RenderableSerialization
2022-10-21 22:48:50 +08:00
cc6e2189fa
WIP
2022-10-21 20:56:14 +08:00
44833d22c6
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-21 20:52:28 +08:00
d6123c8ed7
Merge branch 'main' into SP3-4-editor_fix
2022-10-21 20:45:16 +08:00
99a69b0020
tweaks + add new ui font
2022-10-21 20:45:03 +08:00
9df517f3b3
SP3-170 SP3-238 Restructured asset and asset loading library types to be derived from common base class.
...
Storage of assets and loaders based on pointers.
Created general templated calls to get data from asset manager based on asset type passed in as template argument.
More concise internal interface when loading and storing assets with libraries
2022-10-21 20:28:54 +08:00
b3ed320f9b
Transform Gizmo done. (Commands for it are wonky)
2022-10-21 18:39:50 +08:00
1ea482ff38
Added serialization of SHRenderable (only Mesh)
2022-10-21 18:36:56 +08:00
e5628fbed8
Added functionality to retrieve AssetID from SHResourceManager using a Handle
2022-10-21 17:09:50 +08:00
82e416fe9e
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-10-21 16:29:31 +08:00
43c2680a82
Added generic Handles and fixed bugs with SHResourceManager
2022-10-21 15:38:39 +08:00
7e15edb052
Completed initial implementation of SHResourceManager
2022-10-21 13:58:27 +08:00
7e04bee8d6
Defaults main camera if the mainCamera is still unset
2022-10-21 10:17:32 +08:00
267ad5f8c6
Set up the CameraDirector creation and setting of main camera
2022-10-21 09:53:19 +08:00
31ad8b8c87
Added Resource Lib and handle for CameraDirector into camera system
2022-10-21 09:29:13 +08:00
bf0e7ab256
Merge branch 'main' into SP3-4-editor_fix
2022-10-21 08:57:25 +08:00
e8073bb67f
WIP
2022-10-21 08:42:58 +08:00
29b6e7050d
camera director WIP
2022-10-21 08:11:12 +08:00
c252e4ce4b
Some restructuring with render graph storage.
...
Lesser parameters passed around.
2022-10-21 07:01:51 +08:00
a52f0ddeed
Added a degree getter and setter for rotation
2022-10-21 00:08:24 +08:00
fda33f7461
Fixed multi-level transform updates
2022-10-20 22:55:59 +08:00
c177dabcd0
WIP (not working)
2022-10-20 19:36:43 +08:00
e01a608d8c
Transform gizmo finally rendering correctly
2022-10-20 19:16:03 +08:00
0fadbc8a9d
Renamed Handle, ResourceManager and ResourceLibrary to SHHandle, SHResourceHub and SHResourceLibrary
2022-10-20 19:00:36 +08:00
314d497b66
Reparenting objects maintain world transforms
2022-10-20 18:35:57 +08:00
5a0b34ceea
Added Event for Scene Graph Change Parent
2022-10-20 17:47:32 +08:00
6172ff35b6
Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph
2022-10-20 17:15:28 +08:00
f5060ba0b0
Merge pull request #102 from SHADE-DP/SP3-6-c-scripting
...
Added Script Serialization and Deserialization
2022-10-20 11:19:10 +08:00
323a95e5d5
Merge branch 'main' into SP3-6-c-scripting
2022-10-20 11:08:41 +08:00
166a036142
Completed script serialization in YAML
2022-10-20 11:08:20 +08:00
d32eb790ba
Some clean up
2022-10-20 09:34:33 +08:00
736d7b652b
Added camera turning
2022-10-20 03:21:42 +08:00
c23da81f68
Merge branch 'main' into SP3-141-Camera-System
2022-10-19 23:57:16 +08:00
4f177bc455
Reworked script serialization and deserialization functions (WIP)
2022-10-19 20:43:22 +08:00
6051b7ded5
Tfm gizmo wip
2022-10-19 20:42:38 +08:00
51eba31ad4
Added animation asset class
...
Added animation reading from assimp scene
Separated assimp loading from mesh loader in preparation for exe use
2022-10-19 18:38:11 +08:00
125ce7b564
Merge branch 'main' into SP3-4-editor_fix
2022-10-19 17:43:22 +08:00
a7e8320008
Copy/Paste Entities
2022-10-19 17:23:25 +08:00
603470eeb6
Fixed some camera resizing issues
2022-10-19 17:06:37 +08:00
212e1e7c1f
Merge remote-tracking branch 'origin/main' into CameraIntegration
2022-10-19 16:54:24 +08:00
d9136de134
Integrated Daniel's camera
...
Still need to integrate camera directors
2022-10-19 16:53:45 +08:00
a3c4c347bb
Added Time class for C#
2022-10-19 16:06:26 +08:00
284ee12205
Broken Camera
2022-10-19 15:32:07 +08:00
efe8ba4f11
Added some editor camera controls
2022-10-19 10:32:52 +08:00
896d399a54
Merge branch 'main' into SP3-6-RangeAttribute
2022-10-19 10:13:15 +08:00
7df24e7a66
Fixed RangeAttribute not working correctly
2022-10-19 10:12:56 +08:00
33b173ab9e
Merge branch 'main' into SP3-141-Camera-System
2022-10-19 09:57:52 +08:00
5bd5cec9d4
Merge branch 'main' into SP3-4-editor_fix
2022-10-19 09:49:10 +08:00
3a3f7efb29
[WIP] Transform Gizmo
2022-10-19 01:31:48 +08:00
96f5b29418
Serialization/Deserialization
2022-10-19 01:03:32 +08:00
2f429f33f8
Merge branch 'main' into SP3-8-serialization
2022-10-19 00:26:14 +08:00
ceb4c6c4ca
Added Range Attribute
2022-10-18 22:34:46 +08:00
5727bf3905
Merge branch 'main' into SP3-6-c-scripting
2022-10-18 20:10:06 +08:00
87cf3ffa61
Added script inspector tooltips support via Tooltip attribute
2022-10-18 20:09:50 +08:00
b18d1f66ae
Merge branch 'main' into SP3-8-serialization
2022-10-18 19:50:20 +08:00
da99a5559e
Merge branch 'main' into RenderingEditorVPIntegration
2022-10-18 19:09:08 +08:00
15a17deaf0
select picked entity in hierarchy panel
2022-10-18 19:08:31 +08:00
9ce5a4a47b
Mouse picking system now uses cursor returned from editor
...
- This new cursor position is relative to where the viewport is rendering
- Window resize callback in Graphics system now checks if editor is enabled before signaling for resize. This is because editor will handle the signaling for resizing when its enabled. When its disabled, the graphics system will signal itself to resize when the window resize callback is called.
2022-10-18 17:41:14 +08:00
a221cfc1cd
Modified SHScriptEngine's serialization functions to take in EntityID instead of SHEntity
2022-10-18 17:25:45 +08:00
033ba48304
Editor changes to support viewport integration
2022-10-18 15:04:25 +08:00
e76bc6ef58
World render graph now doesn't render to swapchain image.
...
world render graph now only renders to "Scene" resource.
Editor render graph renders to "Present" swapchain image.
Removed some unnecessary if statements slowing down the resizing
Printing for success also disabled for now
2022-10-18 02:41:27 +08:00
7b7533420e
WIP
2022-10-18 01:12:03 +08:00
ec6772657f
Hierarchy QOL
...
Undo/Redo Parent Child
Shift select
Undo/Redo create entity
2022-10-17 21:25:59 +08:00
17b71393f3
Restructured abit
2022-10-17 16:50:53 +08:00
013bb71325
Functions to retrieve mesh and texture data
2022-10-17 15:04:38 +08:00
b10f490e45
SP3-102 SP3-248 Saving of SHMETA files with asset IDs, retrieval of asset data under works, currently all assets are loaded into memory automatically
2022-10-16 23:15:11 +08:00
95ee4b7b55
Resize half working
2022-10-16 19:42:44 +08:00
7fc417e35a
Parent/child multiple entities (WIP)
2022-10-16 18:16:05 +08:00
c16bea2d39
WIP
2022-10-16 17:35:15 +08:00
1117ecc5ef
WIP
2022-10-16 17:31:53 +08:00
0d02ece4c1
Wrote handle resize for mouse picking objects
2022-10-16 16:28:29 +08:00
7f2935dcf6
add window pos change for editor windows
...
add git ignore for user ini
2022-10-16 15:36:14 +08:00
2830dad8e3
Fixed Kai Wei's issues (sampler move ctor never move device :D)
2022-10-16 15:35:32 +08:00
228868604a
Editor fixes
...
Integration of mouse pick
Add editor state
Add editor layout
2022-10-16 14:20:35 +08:00
808274fce0
Lots of changes
...
- World renderer graph add new resource for scene
- G-Buffer Write subpass now renders offscreen to a color attachment
- Added a new subpass "Scene layout transition" to get vulkan to help transition our scene image layout to shader read
- Added back SHEDITOR check
- Created a post offscreen render system to create the necessary objects
- SH_ATT_DESC_TYPE is now SH_ATT_DESC_TYPE_FLAGS. Render graph resources also now store a bit field instead of a single type.
- Render graph nodes now have more customization when it comes to registering resources. They now have the option to not clear resources on begin.
2022-10-16 14:16:14 +08:00
20cedbb4ec
Merge branch 'main' into SP3-4-editor_fix
2022-10-14 15:53:12 +08:00
49575893fe
Made Editor a system and create editor routine so that the editor routine will run between graphics routines
2022-10-14 15:39:43 +08:00
e027318d22
Inspector View - Collider Component
2022-10-14 14:35:09 +08:00
d6101c936e
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-14 11:53:06 +08:00
faa55847cb
Mouse picking is working from rendering side
...
- Buffer now has function to get data from mapped pointer if it exists
- Batches now also pass a buffer of EIDs to the GPU
- Global vertex attributes now have 1 extra instanced attribute for storing EntityIDs
- Render graph resources now have a usage flags on top of the usage flags calculated in the graph AddResource function. This is to tell vulkan that we want some resources to be copyable for example (EID render target copy to buffer).
- Mouse pick system stores eid picked
2022-10-14 11:52:15 +08:00
d265aa4541
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-14 00:10:45 +08:00
ab09d78e42
removed routines for graphics from application (remember to add back after ingui update routine is added).
...
Scene graph and physics system had some extra couts
input system bug fix (this change is now in main)
Mouse pick system wip
2022-10-14 00:08:14 +08:00
288f58c978
fixed timing of memcpy of keys to keysLast
...
This in turn fixes GetKeyDown() and GetKeyUp() as the input manager now knows changes of keys between the last frame and current frame.
2022-10-13 23:03:30 +08:00
acd3174c39
Merge branch 'SP3-16-Math' into SP3-2-Physics
2022-10-13 18:15:52 +08:00
e1fb92e3f1
Adding Bounding Spheres
2022-10-13 17:32:53 +08:00
0a3d211f02
Added a render target to store entity ID
...
Pipelines created from pipeline library now checks if the resources pointed to by a subpass requires blending and adds a blend state accordingly.
Fragment shader writes to this new render target for testing (works)
2022-10-13 16:57:08 +08:00
381217a1b8
Added Colour
2022-10-13 03:03:21 +08:00
d95dbd5ce6
Reworked Bounding Boxes
2022-10-12 21:59:34 +08:00
2fa71f0fd9
Added Ray
2022-10-12 19:12:34 +08:00
ff9b504bc5
Moved collider interface into physics object. Added support for removing rigidbodies
2022-10-11 01:26:12 +08:00
e68ef89c00
synced rigidbodies through physics object
2022-10-10 21:21:20 +08:00
46a082b62e
Moved rigidbody creation into physics object
2022-10-10 21:13:14 +08:00
7c4a9ca004
Added conversions for shade math to reactphysics math
2022-10-10 18:07:21 +08:00
db0b61d16f
Reflect RB Enumeration
...
Add RB to inspector view
2022-10-02 10:56:13 +08:00
0e518c52a9
Fixed bug when SceneGraph is destroyed
2022-10-02 04:22:32 +08:00
3f334da934
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-02 03:09:25 +08:00
0dba60f9f1
Small fix
2022-10-02 03:09:09 +08:00
45514ac77e
Fixed warnings and errors
2022-10-02 03:06:13 +08:00
39302bc7f1
Merge pull request #79 from SHADE-DP/SP3-6-c-scripting
...
Added Undo-Redo support for Script Inspectors
2022-10-02 02:47:47 +08:00
4771fbfb76
WIP
2022-10-02 02:28:50 +08:00
e5df98aaa6
Added missing move assignment and extra check for command buffer destructor
2022-10-02 02:00:11 +08:00
cfa07e9b3b
Temp fix for SceneGraph crash
2022-10-02 02:00:10 +08:00
d432822608
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-02 01:13:43 +08:00
9fabb7d672
Window can close properly (with the exception of scene graph dtor crash)
2022-10-02 01:13:04 +08:00
8a6ef1fc2d
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-10-02 01:01:50 +08:00
9e8b4414d1
add window close callback
2022-10-02 01:00:07 +08:00
201ce17a40
Fixed validation errors when closing the app
2022-10-02 00:56:34 +08:00
64d1c2ab2e
Minimize is now working
2022-10-02 00:47:26 +08:00
32a3cc0674
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-10-02 00:00:07 +08:00
d273c24410
Merge pull request #81 from SHADE-DP/SP3-13-Assets-Manager
...
SP3-13 Assets Management
Fixed all warnings
2022-10-01 23:57:19 +08:00
61e353164b
Fixed all asset related warnings
2022-10-01 23:57:26 +08:00
0f13476c08
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-10-01 23:57:13 +08:00
e2b86545bb
Window resize working
2022-10-01 23:57:08 +08:00
77653ebde5
add window isMinimized
2022-10-01 23:56:45 +08:00
01f648ceb6
Serialize/Deserialize [WIP]
2022-10-01 23:43:00 +08:00
8e60d4b771
Changed asserts to SHLOG related functions
2022-10-01 23:42:54 +08:00
6fd1cadf01
Merge branch 'main' into SP3-8-serialization
2022-10-01 23:41:55 +08:00
1a14e5241b
Added names for SHGraphicsSystem Routines
2022-10-01 23:14:42 +08:00
15c39d7028
Removed mixed tabs and spaces
2022-10-01 22:58:19 +08:00
5e07383cf1
Merge branch 'main' into SP3-6-c-scripting
2022-10-01 22:56:33 +08:00
f717b61c88
Added undo and redo support for script changes in the inspector
2022-10-01 22:56:15 +08:00
4007120dbd
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-01 22:06:50 +08:00
3a9a1d878a
Merge pull request #77 from SHADE-DP/SP3-129-AudioSystem
...
fix audiosystem warnings
2022-10-01 21:38:45 +08:00
8a3a08986b
fix audiosystem warnings
2022-10-01 21:29:40 +08:00
1a725c24e2
Stored renderpass attachement information in SHVkRenderpass
2022-10-01 21:25:22 +08:00
9913e5a68b
Merge branch 'main' into SP3-4-editor_fix
2022-10-01 21:19:07 +08:00
c5efefcf4f
Editor warning fixes
2022-10-01 21:18:54 +08:00
e4a6877ed3
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-01 20:43:18 +08:00
48413bdc1f
Merge pull request #75 from SHADE-DP/ProjectWarningDisables
...
Warning disables
2022-10-01 19:44:17 +08:00
a6e17847bf
Warning disables
...
Remove SDL hint that gave warning (it was unnecessary anyway)
2022-10-01 18:58:13 +08:00
3c58a538ae
Mouse Vel & UpdateInput called from SBApplication
2022-10-01 18:02:27 +08:00
857f88c4a8
Merge branch 'main' into SP3-10-input-management
2022-10-01 17:03:58 +08:00
374f1a961d
Integrated rigidbodies into physics system
2022-10-01 16:50:50 +08:00
b657ad8884
Handled resizing for the render graph resource (not tested)
2022-10-01 16:33:16 +08:00
4f56a32a9b
Added physics system (untested)
2022-10-01 15:26:08 +08:00
0c78eca1bc
added audiosystem back in
...
added a button for the audio
2022-10-01 15:09:26 +08:00
b3b565454f
Merge branch 'main' into SP3-6-c-scripting
2022-10-01 14:50:46 +08:00
0360a8bfa1
made the Input Manager NOT be a System anymore
2022-10-01 14:34:30 +08:00
dc8d58d95c
fix GetMouseWindowPosition()
2022-10-01 13:49:11 +08:00
af24ed78dc
Fixed MSIL warning when building scripts
2022-10-01 13:43:34 +08:00
adbb77932c
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-01 13:29:51 +08:00
c82d01631c
SP3-237 Texture load/compile successfully
2022-10-01 13:27:51 +08:00
5069a42319
SP3-237 Mesh compile and load successfully. Although now path to load/compile is hardcoded. Flow will be done after MS1
2022-10-01 13:12:37 +08:00
e956797441
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-01 01:13:13 +08:00
8a3d3c8d4e
SP3-237 SP3-103 SP3-104 Implemented SHTexture and SHMesh binary file writing and loading. NOT TESTED
...
Added file level comments
2022-09-30 22:08:17 +08:00
e4be5e0987
Added event manager include
2022-09-30 20:34:46 +08:00
2d07fb0afc
Added component added and removed events
2022-09-30 20:25:26 +08:00
114ae86a9f
Fixed SHFamilyID for SHSystem and SHComponent but still have issues with SHScene
2022-09-30 20:13:18 +08:00
584b7e425f
WIP Write meta files to track whether raw asset (fbx/gltf/dds) have been compiled into custom binary
2022-09-30 08:57:25 +08:00
a51cbb7e70
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-29 10:55:49 +08:00
b1a799cf05
Attempt using dllimport/dllexport
2022-09-29 07:59:04 +08:00
566c12a922
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Application/src/Scenes/SBTestScene.cpp
# SHADE_Engine/src/Editor/SHEditorWidgets.hpp
2022-09-28 23:27:48 +08:00
0e07960938
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-09-28 21:30:57 +08:00
561f2b091f
Added PhysicsObject to handle interface between components and physics system
2022-09-28 21:09:27 +08:00
363e09bd55
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-28 20:39:42 +08:00
78f216e445
Rendered multiple racoons
2022-09-28 20:33:29 +08:00
371f8e5e6f
Add simple profiler
2022-09-28 19:45:40 +08:00
10f5817c15
Merge branch 'main' into SP3-4-editor_fix
2022-09-28 19:01:18 +08:00
a96ef67ec4
change engine premake to copy fmod lib over
2022-09-28 18:53:53 +08:00
a1775db60b
Merge branch 'main' into SP3-4-editor_fix
2022-09-28 18:36:44 +08:00
02ec5d88e8
Add remaining controls to component view
2022-09-28 18:36:22 +08:00
219aaa1707
Split texture loader into 2 paths for dds and shtexture format.
...
SHTexture binary load half done
2022-09-28 18:35:59 +08:00
201b19e8a6
SP3-237
...
Renamed MeshWriter to MeshCompiler
Implemented texture compiler
2022-09-28 18:35:22 +08:00
e71941cccf
removing not needed buttons
2022-09-28 18:12:01 +08:00
c698bac731
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-09-28 17:52:02 +08:00
658562bdc4
Merge branch 'main' into SP3-129-AudioSystem
2022-09-28 17:51:40 +08:00
bed6a144f8
banks curr working
2022-09-28 17:25:14 +08:00
6ef30bc415
post processing copy for publish build
2022-09-28 17:22:22 +08:00
2ce927d471
Merge pull request #60 from SHADE-DP/SP3-16-Math
...
SP3-16 Fixed vector subscript operator return type
BUGFIX
SHVec2, 3 & 4 (non-const) subscript operators now return a reference to the element
2022-09-28 17:09:58 +08:00
a9932d5494
Merge pull request #59 from SHADE-DP/SP3-19-frame-rate-controller
...
FRC changed
FRC code changed to adapt better with current state of the engine. Sole purpose to retrieve the varying raw delta time
Only two functions:
Get the varying raw delta time of the current frame
Update the FRC to update the raw delta time
2022-09-28 17:09:31 +08:00
170ae5ac6b
Fixed vector subscript operators return types
2022-09-28 17:06:37 +08:00
097b1be3f7
Added Physics System
2022-09-28 16:15:36 +08:00
2df9252e17
Fixed material desc set binding
2022-09-28 15:31:37 +08:00
3730c2125f
Modified script inspectors to use the vector widgets from SHEditorWidgets. SHEditorWidget is now a static class.
2022-09-28 15:28:59 +08:00
658054bc14
Merge branch 'SP3-12-SceneGraph' into SP3-2-Physics
2022-09-28 15:26:07 +08:00
d9582cd0bd
Fixed first instance in MDI call being wrong
2022-09-28 14:47:50 +08:00
a23f4f5218
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-28 10:28:19 +08:00
d9cdf26098
Changed depth buffer format
2022-09-28 10:28:12 +08:00
766abbc0ec
#comment Added camera component and system
2022-09-28 07:43:37 +08:00
7010e1b688
Added initial implementation of script inspector
2022-09-28 00:06:47 +08:00
7fcac5e0eb
god knows whats diff but audio is sort of working ish
2022-09-27 23:57:11 +08:00
1813ad138c
FRC changed
2022-09-27 22:05:59 +08:00
d71fbc22de
Merge branch 'SP3-1-Rendering' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-1-Rendering
...
# Conflicts:
# TempShaderFolder/TestCubeFs.glsl
# TempShaderFolder/TestCubeFs.spv
2022-09-27 21:07:55 +08:00
cebb1a2cf8
Deserialization WIP
2022-09-27 21:06:25 +08:00
61219f5136
Added tests for material binding and fixed some crashes
2022-09-27 21:06:14 +08:00
36b3872fb6
combo box for enumerations [WIP]
2022-09-27 21:05:49 +08:00
70940534e1
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-27 20:07:29 +08:00
055a0a1711
Fixed textures not loading correctly
2022-09-27 19:52:36 +08:00
d6cff821dd
Merge branch 'main' into SP3-4-editor_fix
2022-09-27 19:48:08 +08:00
b7adf8815b
Fixed camera. Can see texture now
2022-09-27 19:18:45 +08:00
a57c4d0d73
WIP Script Inspector
2022-09-27 19:17:53 +08:00
cfd387e51c
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-09-27 19:07:27 +08:00
e58bb4f061
Changed predicate type for scene graph traverse to std::function
2022-09-27 17:15:43 +08:00
4effe016e4
Options to rebuild scripts at runtime are now present in the editor
2022-09-27 17:13:32 +08:00
14cd0b4be9
Fixed SHTextureLoader loading wrong mipmap offsets
2022-09-27 16:45:35 +08:00
337894ebc2
Merge branch 'main' into SP3-6-c-scripting
2022-09-27 16:39:02 +08:00
357b36a9b0
Added RigidBody Component
2022-09-27 16:24:08 +08:00
04b452543c
Modified TextureLibrary to use SHTextureAsset instead of SHDDSAsset
2022-09-27 16:05:47 +08:00
10b22374c0
Merge branch 'main' into SP3-1-Rendering
...
# Conflicts:
# SHADE_Application/src/Scenes/SBTestScene.cpp
2022-09-27 15:48:51 +08:00
b3417c2011
Made SHGraphicsGlobalData static and modified SHBatch to generate and bind material descriptor set
2022-09-27 15:44:36 +08:00
4c23151a14
Merge pull request #57 from SHADE-DP/SP3-13-Assets-Manager
...
SP3-13 Assets Management
Changed texture struct to contain pre processed information ready for buffer
2022-09-27 14:27:28 +08:00
76617ae571
Enabled Multi-Draw Indirect feature
2022-09-27 14:12:14 +08:00
5d022b7123
Fixed mipoffset
2022-09-27 14:12:05 +08:00
65c67c14b7
Fixed crash if no textures were loaded
2022-09-27 14:11:56 +08:00
3c3b6a285b
Merge branch 'main' into SP3-129-AudioSystem
2022-09-27 14:11:16 +08:00
ee7cb36896
added the banks for testing
2022-09-27 14:11:04 +08:00
60540b1adc
Temp function to retrieve all textures
2022-09-27 14:09:44 +08:00
a7badba8b9
Copied over function from Texture Library to Texture loader to convert dds format to vk format
2022-09-27 13:58:19 +08:00
e9496bead6
Fixed bug where different Renderables of different meshes are thrown into the same SubBatch
2022-09-27 13:43:59 +08:00
ce721b99e5
include SH_API.h
2022-09-27 13:37:52 +08:00
7487602151
SP3-104
...
Renamed DDS to Texture in most places
Prepared SHTextureAsset for ease of load into buffer and compilation
Added Copy constructor for SHTextureAsset
2022-09-27 13:02:12 +08:00
187329c384
Fixed texture issues
2022-09-27 12:02:06 +08:00
c4ed199165
Serialize Vec 2/3/4
2022-09-27 07:03:31 +08:00
233e7a0e8f
Serialization fix
2022-09-26 23:51:20 +08:00
69041980f5
added the base for bank
2022-09-26 23:27:55 +08:00
eeaf86e968
Merge branch 'main' into SP3-129-AudioSystem
2022-09-26 23:21:01 +08:00
b375ab9a50
device wait idle
2022-09-26 23:14:10 +08:00
b5f7ff1106
Merge branch 'main' into SP3-6-c-scripting
2022-09-26 22:40:35 +08:00
7247faee73
Serialization [WIP]
2022-09-26 21:08:59 +08:00
3e2bcf28b6
Added texture loading that is almost working
2022-09-26 20:59:20 +08:00
1ea4689a89
SP3-237 Mesh write to binary file
2022-09-26 19:10:32 +08:00
caab2c37ab
Added GLTF extension recognisation
2022-09-26 19:10:12 +08:00
4dd2335fb8
Removed assimp post processing flag that was removing animations
2022-09-26 19:09:45 +08:00
240e5e9394
Merge branch 'main' into Editor_widgets
2022-09-26 18:55:31 +08:00
3d7876c987
added fix for closing editor windows
2022-09-26 18:33:37 +08:00
1f45b0ceca
added all the widgets helper
2022-09-26 18:09:21 +08:00
3b0ea251f3
mouse wheel delta poll
2022-09-26 18:08:59 +08:00
a06c30266e
Merge branch 'main' into SP3-1-Rendering
2022-09-26 17:56:30 +08:00
728d615425
Merge pull request #55 from SHADE-DP/SP3-13-Assets-Manager
...
SP3-13 Assets Management
Added function in asset manager to retrieve all dds images
2022-09-26 17:49:06 +08:00
3800c01c4a
Added function in asset manager to retrieve all dds images
2022-09-26 17:48:27 +08:00
5ac90eebec
Fixed compilation errors
2022-09-26 17:26:33 +08:00
927944d55a
Merge branch 'SP3-1-Rendering' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-1-Rendering
2022-09-26 17:18:55 +08:00
d938007d8a
Added TextureLibrary updating of descriptor sets
2022-09-26 17:18:51 +08:00
5e7ffd6028
Added SHVkSampler and SHVKSamplerCache
2022-09-26 16:41:57 +08:00
de8c2ce630
Merge branch 'main' into SP3-4-editor_fix
2022-09-26 15:59:38 +08:00
2c16eb4393
Reflect transform component
2022-09-26 15:53:54 +08:00
ac7ab83c16
Merge branch 'main' into SP3-129-AudioSystem
2022-09-26 15:51:59 +08:00
d0d796781b
remove audiosourcecomponent
2022-09-26 15:50:07 +08:00
0a024e1b2d
Separated render graph contents into separate files
2022-09-26 14:49:48 +08:00
1c45b49937
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-26 14:40:57 +08:00
99534c1613
SP3-103 SP3-104 Separated mesh and texture loading
...
Added in lines in SBApplication to load racoon fbx and dds textures
Racoon shows up in renderdoc hehe
2022-09-26 14:38:12 +08:00
65a6014b1c
Merge branch 'main' into SP3-129-AudioSystem
2022-09-26 14:08:43 +08:00
247930ea68
Merge branch 'main' into SP3-4-editor_fix
2022-09-26 14:04:02 +08:00
a6f7ffab43
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-26 09:48:48 +08:00
9fe5793dd7
Split the render graph into multiple files
...
doesn't compile
2022-09-26 09:37:59 +08:00
7cbb127937
Merge branch 'main' into SP3-6-c-scripting
2022-09-26 09:09:19 +08:00
8d32d76381
Merge pull request #52 from SHADE-DP/SP3-1-Rendering
...
Render graph fixes with attachment layouts
Render graph node was not moving batcher (this is now fixed)
2022-09-26 00:53:08 +08:00
6d68e6cb5e
FIXED MY SHIT WHEE
...
(render graph color present attachment now have correct layout)
2022-09-26 00:38:36 +08:00
a5c804ca8b
Fixed SHRenderGraph not moving the batcher
2022-09-26 00:08:32 +08:00
8649833604
subpass not null anymore
2022-09-25 23:45:05 +08:00
dc6289e8cf
WIP
2022-09-25 23:25:51 +08:00
8ac2c39e2b
Fixed some render graph ctors and added if checks for buffers
2022-09-25 23:13:37 +08:00
fc5ff763f3
Added SHMaterialInstanceCache
2022-09-25 22:55:14 +08:00
335c19cfc7
Editor
2022-09-25 22:33:07 +08:00
a197ae842c
Fixed crash on AMD GPUs resulting from Nvidia treating UniformBuffers and UniformBuffersDynamic as the same
2022-09-25 21:46:57 +08:00
4e60b3495a
Handles will now properly show up automatically dereferenced or NULL in Visual Studio's debug views
2022-09-25 20:28:01 +08:00
dd46881b67
Merge branch 'main' into SP3-1-Rendering
2022-09-25 18:57:14 +08:00
8ab5afd3c4
first version of IM ready for PR
2022-09-25 16:39:01 +08:00
ef36ae462e
Merge branch 'main' into SP3-10-input-management
2022-09-25 11:36:01 +08:00
18eca1897e
Added in post build command to copy assimp dll
...
Added in SH_API to asset manager class
2022-09-24 22:52:42 +08:00
d7b5ae9f02
audiosystem base level done along with its components
2022-09-24 19:13:23 +08:00
a39230ce42
More setting up for testing of gltf loading
2022-09-24 16:07:51 +08:00
78a20173e0
Changed AssetType underlying type
...
Added mesh name to mesh asset object
Added in static token for LoadGLTF function
Fixed warning in GetTypeFromExtension
2022-09-24 16:07:26 +08:00
a907c7c575
SP3-103 SP3-104 Testing set up for loading gltf and dds
2022-09-24 13:37:12 +08:00
a8a2e90c26
SP3-237 Added header data type into mesh asset in preparation for compilation of mesh
2022-09-24 13:36:43 +08:00
cb73a8c5d1
Added file list in filesystem
2022-09-24 13:36:09 +08:00
225c247a85
Added missing SDL line back into engine premake
2022-09-24 12:59:21 +08:00
cf4f905d91
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-24 12:40:31 +08:00
15f12a2608
Fixed warnings in SHBatch.cpp
2022-09-24 02:13:09 +08:00
759c87e2a1
Material data on the GPU is now updated when material data changes
2022-09-24 02:07:47 +08:00
c4105510b8
Merge branch 'main' into SP3-129-AudioSystem
2022-09-23 23:01:22 +08:00
187142d5c3
Added Transform Component C# interface
2022-09-23 19:57:29 +08:00
32278e1564
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-23 18:50:52 +08:00
bd54b16e01
Ctor for compute pipelines
2022-09-23 18:50:40 +08:00
bb38246111
Added stress test code for 20000 objects
2022-09-23 18:49:04 +08:00
3ed1034e62
Merge branch 'main' into SP3-10-input-management
2022-09-23 17:59:30 +08:00
800732706e
input pch move, init, exit, etc definitions
2022-09-23 17:42:31 +08:00
f8391d6c9e
Modified TestScene space bar input to not destroy the object, only remove scripts
2022-09-23 16:45:06 +08:00
77cccd63be
Renderables now use TransformComponent's matrix
2022-09-23 16:41:44 +08:00
04cdb25ddd
Merge branch 'main' into SP3-1-Rendering
...
# Conflicts:
# SHADE_Application/src/Application/SBApplication.cpp
# SHADE_Application/src/Scenes/SBTestScene.cpp
2022-09-23 16:41:29 +08:00
23f0f9f77e
Triple buffered the batching buffers
2022-09-23 16:24:35 +08:00
c2e948a100
Fixed active state checks in transform system
...
Apparently entity and scene node active states do not sync....
2022-09-23 15:48:00 +08:00
ed56ad99df
Merge branch 'main' into SP3-10-input-management
2022-09-23 13:41:50 +08:00
a0c29c666f
progress on input manager, near ready for PR
2022-09-23 13:14:46 +08:00
f6bab2165c
Merge branch 'main' into SP3-129-AudioSystem
2022-09-23 09:59:52 +08:00
c77d9b2ff5
Changed editor pause for transform system to true
2022-09-22 22:58:14 +08:00
5c4384b589
Fixed SHVkBuffer initial copy data for mapped buffers and made the cube spin
2022-09-22 20:53:03 +08:00
c4ab45ad34
Merge branch 'main' into SP3-1-Rendering
...
# Conflicts:
# SHADE_Application/src/Scenes/SBTestScene.cpp
# SHADE_Application/src/Scenes/SBTestScene.h
# SHADE_Engine/SHADE_Engine.vcxproj
# SHADE_Engine/SHADE_Engine.vcxproj.filters
2022-09-22 20:51:33 +08:00
6d646851e2
Added missing transpose to transform update and a test component to application
2022-09-22 20:39:46 +08:00
2c0fa3a6b2
Fixed warning from scene graph when adding new nodes to root.
2022-09-22 20:25:42 +08:00
0250687e06
Instantiated Transform System & Update Routine
2022-09-22 20:25:23 +08:00
495d2b4b66
Added per-frame update of gpu transforms buffer
2022-09-22 20:04:53 +08:00
cb31628e66
Dummy pipeline layout ctor created
...
Renderer now can update and bind descriptor set
2022-09-22 19:38:43 +08:00
3457759ed3
Merge pull request #44 from SHADE-DP/SP3-6-c-scripting
...
Script lifecycle functions now run and ScriptEngine has been made a ECS System
2022-09-22 17:39:40 +08:00
3a908b717b
Merge remote-tracking branch 'origin/SP3-6-c-scripting' into SP3-6-c-scripting
2022-09-22 17:08:11 +08:00
5bd35cec61
Fixed SHEventReceiver constructor callback return signature.
2022-09-22 17:07:59 +08:00
2051d485eb
Merge branch 'main' into SP3-6-c-scripting
2022-09-22 17:04:18 +08:00
3b533ac03d
Added faulty registration to entityDestroyed event
2022-09-22 16:40:49 +08:00
38dbd0c217
Removed static data member...again...
2022-09-22 15:49:00 +08:00
d648fc8645
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-09-22 15:42:09 +08:00
cda7330c5b
Removed static data member for transform update routine
2022-09-22 14:56:58 +08:00
2d93c9559d
Restructured Transform system to match intended system structure
2022-09-22 14:54:06 +08:00
ed143661b3
Scene node active states propagate down the hierarchy
...
Vulkan is throwing an exception...
2022-09-22 14:26:07 +08:00
8066c3cd6a
added audioSystem(the base not working yet)
...
added components to use the audioSystme
2022-09-22 14:05:53 +08:00
f28d966ebb
Merge branch 'SP3-1-Rendering' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-1-Rendering
2022-09-22 12:40:25 +08:00
e87c4c8dc8
Fixed SHTextureLibrary compiler errors
2022-09-22 12:39:05 +08:00
5bc24b09d4
Added generalisation of csproj file location
2022-09-22 12:32:15 +08:00
8cfe58a3ad
SP3-103 SP3-104 Implemented DDS loading and error reporting
...
Not tested
2022-09-22 12:29:30 +08:00
1290e99dda
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-22 12:12:47 +08:00
7ddf665460
Updated Descriptor sets
...
Descriptor set layouts now have set index stored in them
It should be noted that when passed into a pipeline layout as global descriptor sets, these don't matter since the pipeline layout will use these in the order that they are passed in.
2022-09-22 12:12:44 +08:00
a13e8f43fd
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-22 11:41:44 +08:00
6f1592e16f
SP3-103 SP3-102 Added call to mesh loader in asset manager. Removed old references to previous maps and vectors.
2022-09-22 11:40:24 +08:00
8ac6ef95d6
SP3-103 Implemented library to load GLTF with assimp and processmesh
2022-09-22 11:26:06 +08:00
b04789945f
Merge branch 'main' into SP3-6-c-scripting
2022-09-22 11:06:26 +08:00
af1d24d874
Fixed certain DLLs and includes missing when copying
2022-09-22 10:52:07 +08:00
c1b7c7ded8
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Application/src/Application/SBApplication.cpp
# SHADE_Engine/src/Scene/SHSceneManager.h
2022-09-22 09:55:31 +08:00
ba181eb9c9
Shifted Command buffers outside of render graph
...
Command buffers now exist in renderer instead
Graphics system that calls the renderer, begins and ends the renderer recording in it's main loop as well
2022-09-22 09:23:40 +08:00
3d9abcf19c
Implemented image creation for textures in the texture bank
2022-09-22 09:19:18 +08:00
4446d0a60d
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-21 22:54:53 +08:00
d2e2e85726
Added build path ignore
...
Readded output dir and removed interdir from premake
Added DEBUG guards in SHVkPhysicalDeviceLibrary when using SHLOG_TRACE
2022-09-21 22:54:15 +08:00
ae3fb448d4
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-21 22:28:31 +08:00
124b367413
Fixed SHTransform compile error
...
Include header in math path wrong
Added proj and filter ignore into git (again)
2022-09-21 22:24:52 +08:00
ba4d85a4e1
SP3-103 SP3-104 Implementing Mesh Loader for asset manager to use assimp to load gltf
...
Loading of dds from gltf file planned ahead
2022-09-21 22:20:52 +08:00
7acf25a770
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-21 20:09:48 +08:00
791c4cd0d0
Merge branch 'SP3-1-Rendering' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-1-Rendering
2022-09-21 20:03:03 +08:00
f52fa9463d
Merge pull request #39 from SHADE-DP/SP3-16-Math
2022-09-21 20:02:20 +08:00
67d673ff80
Merge pull request #38 from SHADE-DP/SP3-12-SceneGraph
2022-09-21 20:01:44 +08:00
14eed4c726
Added missing active check in transform system
2022-09-21 18:30:20 +08:00
ac379e3ef3
Added method to scene graph to easily traverse and execute a unary function
2022-09-21 18:23:01 +08:00
270c8240c1
Shifted Graphics system to SBTestScene
2022-09-21 16:29:54 +08:00
80dc8d0a71
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-21 15:41:36 +08:00
8d2b6aec46
Descriptor set fix and camera descriptor set
...
Fixed SHVkDescriptorSetGroup bug with vkLayouts inside the ctor
Added descriptor set to renderer for camera
Logical Device now stores a buffer alignment variable for UBOs
2022-09-21 15:41:30 +08:00
415e47780c
Completed Transform System
2022-09-21 14:54:57 +08:00
0db7392eed
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-09-21 14:06:36 +08:00
9c69d41a4e
Added 90% of transform component & transform system.
2022-09-21 00:49:52 +08:00
3cd538562c
More Scene Graph Fixes
2022-09-20 19:32:28 +08:00
5f305f9609
Added SHTextureLibrary stub
2022-09-20 18:13:13 +08:00
cc6d1dd95b
Added Transform Component
2022-09-20 17:20:57 +08:00
c194765889
More warnings fixed. More graphics constants.
2022-09-20 16:12:47 +08:00
7f173b3207
Added SH_API to Math Classes
2022-09-20 16:10:47 +08:00
7b7a4788e4
Merge branch 'main' into SP3-16-Math
2022-09-20 15:42:53 +08:00
b5f3ec85aa
Merge branch 'main' into SP3-16-Math
2022-09-20 15:37:28 +08:00
f4bf895e45
Fixed constness of functions in scene graph
2022-09-20 15:35:10 +08:00
0bc3a23161
Fixed the fence with high quality wood
2022-09-20 14:15:09 +08:00
147292f91c
Fence is broken. The neighbour's kids went to knock it down again.
2022-09-20 12:15:06 +08:00
d9213fe35d
Moved a bunch of global data from Graphics System to new class
...
New class in SHGraphicsGlobalData
2022-09-20 10:39:52 +08:00
77330511ee
Fixed pipeline default color blend state
...
Remember to switch winding back to CCW after rendering in world space
2022-09-20 09:27:13 +08:00
c0290b7185
Added fixes to scene graph. Read description for details.
...
1. Scene graph creates a root on construction. EntityID is set to MaxEID. The root is not intended to be modified.
2. When adding a node, if the 2nd arg (parent) is omitted, the node will be a child of the root.
2022-09-20 01:31:59 +08:00
34685e6726
Regenerated project files
2022-09-20 00:48:27 +08:00
8772ce0cea
Fixed SHSceneManager not SH_API-ed
2022-09-20 00:03:29 +08:00
95b01fb96d
Merge branch 'main' into SP3-6-c-scripting
2022-09-19 23:12:52 +08:00
8ad0eee032
Fixed vertex data buffer being incorrect
2022-09-19 21:31:23 +08:00
9e09896984
Fixed SHVkBuffer move and reworked batching buffers to be host visible
2022-09-19 20:15:39 +08:00
c6e1ba7f15
Added tinyddsloader to dependencies
2022-09-19 18:40:27 +08:00
4023b9d136
Added tests for rendering and fixed bugs with Batching system
2022-09-19 18:37:57 +08:00
ceb96938fb
Added SHAPI to Scene graph
2022-09-19 17:28:59 +08:00
e51a3688af
Merge branch 'main' into SP3-16-Math
2022-09-19 17:17:40 +08:00
308aa35e00
Merge branch 'main' into SP3-6-c-scripting
2022-09-19 17:17:28 +08:00
620f8a01ac
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-19 17:16:51 +08:00
52efdcf65e
Merge branch 'main' into SP3-5-ECS
2022-09-19 17:12:54 +08:00
ec3470c443
Merge branch 'main' into SP3-16-Math
2022-09-19 17:08:16 +08:00
a867ecbcbf
SP3-108 Shifted definitions for functions in Event Manager from cpp to hpp
2022-09-19 17:08:08 +08:00
471ec27a6d
Added Bounding Box
2022-09-19 16:50:06 +08:00
f408247007
Linked MeshLibrary to RenderGraph
2022-09-19 15:52:51 +08:00
44611115fe
Added Scene graph functionality (un tested)
2022-09-19 15:41:52 +08:00
d025abe43a
Render graph execution now takes in graph scope buffers
2022-09-19 15:32:03 +08:00
f1e6031d2e
Added Transform, adjusted alignment in math files for better readability on smaller screens
2022-09-19 14:32:01 +08:00
8070b2dafa
Accounted for Shaders with no SHShaderBlockInterface
2022-09-19 00:11:57 +08:00
23fe51b483
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-19 00:04:42 +08:00
643efbe1bb
WIP
2022-09-19 00:00:07 +08:00
b9185eab18
Added Mesh Registration Functions to SHGraphicsSystem and a SHGraphicsSystem compatible version of mesh generation functions for SHPrimitiveGenerator
2022-09-18 23:23:48 +08:00
41daaaba9c
Added SHPrimitiveGenerator
2022-09-18 23:11:08 +08:00
28a5f8e4e5
Auto stash before merge of "SP3-1-Rendering" and "origin/SP3-1-Rendering"
2022-09-18 22:34:48 +08:00
96ec1afcdd
Changed batching system to use SHRenderable* instead of handles
2022-09-18 17:02:02 +08:00
f21aa8836c
Merge branch 'main' into SP3-5-ECS
2022-09-18 16:50:10 +08:00
b3d9a54d8f
Added entity creation event and entity destroyed events
2022-09-18 16:46:08 +08:00
ec40754eb9
Render graph, graphics system and pipeline library changes lel
...
Solved errors
Graphics system AddMaterial now takes in a subpass
Pipeline library now stored in render graph node instead since pipelines have to be compatible with a renderpass.
Renderers now bind render graphs instead of storing them
2022-09-18 15:23:10 +08:00
8c30e656f7
Modified AddMaterial() to take in a subpass
2022-09-18 14:58:32 +08:00
7a126bf1fc
SHViewport now takes in a RenderGraph instead of creating one
2022-09-18 14:49:15 +08:00
a3aa708b34
Fixed numerous template errors and warnings
2022-09-18 00:49:27 +08:00
6e4d6abd1c
Fixed Handle<> include issues
2022-09-17 23:37:22 +08:00
1c8a434b26
Added Batcher classes and fixed errors
2022-09-17 23:37:22 +08:00
c1a3a6acf1
Created global descriptor set layouts
2022-09-17 23:32:03 +08:00
6706f9acf0
SP3-108 Created templated derived classes for events to accommodate for automatic type sending ability
2022-09-17 22:33:11 +08:00
bff27a7188
Added a bunch of KW's files for batching
...
Prepared Graphics system for merging with batcher
2022-09-17 22:29:22 +08:00
5171ddd2bf
Added SHLog class and changed Debug::Log to use SHLog
2022-09-17 03:20:24 +08:00
2f2567044a
Submitted command buffer :D
2022-09-16 17:28:27 +08:00
c83a5a379e
Added Awake, Start, Update, LateUpdate, OnDestroy calls via SystemRoutines
2022-09-16 17:02:36 +08:00
eb8cbaeebb
init vulkan for imgui
2022-09-16 16:40:42 +08:00
0f63ee10d0
Converted SHScriptEngine into a SHSystem
2022-09-16 16:37:50 +08:00
941f4a135f
Merge branch 'main' into SP3-6-c-scripting
2022-09-16 16:21:58 +08:00
470e1f07f0
Merge branch 'main' into SP3-4-editor
2022-09-16 15:02:56 +08:00
c1c5e70676
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-16 14:46:48 +08:00
a42a8b0c46
SH_API EVERYWHERE
2022-09-16 14:20:21 +08:00
e976dee601
Merge pull request #27 from SHADE-DP/SP3-5-ECS
...
SP3-5 ECS
System manager rework. Added system routines
2022-09-16 14:15:23 +08:00
4b168fb2d7
Merge branch 'main' into SP3-1-Rendering
2022-09-16 14:09:14 +08:00
eb975d96c6
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-16 14:08:36 +08:00
0373754e37
Merge branch 'main' into SP3-5-ECS
2022-09-16 14:06:05 +08:00
c89fe48182
Merge branch 'BackTo5.0' into SP3-6-c-scripting
2022-09-16 14:04:56 +08:00
aaf3d67eed
Downgraded back to .NET 5.0 due to lack of VS 2019 support
2022-09-16 14:02:55 +08:00
6f67c1acc7
Base Editor (WIP, no vulkan)
2022-09-16 13:55:29 +08:00
b933b0f7fc
Added SerializeField attribute
2022-09-16 13:13:38 +08:00
f0b9f19f4d
clear color value fix
2022-09-16 12:33:42 +08:00
1dde480a9f
Merge branch 'main' into SP3-18-Events
2022-09-15 18:38:11 +08:00
f9743f394d
Added some lines in comments for clarity
2022-09-15 18:37:05 +08:00
e1074887c8
Added instructions
2022-09-15 18:34:07 +08:00
5af0bf7d25
Instructions on how to use events
2022-09-15 18:33:36 +08:00
382d75528a
Removed and ignored VS project and solution files
2022-09-15 12:50:48 +08:00
e5b7742955
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# Dependencies.bat
2022-09-15 12:22:37 +08:00
7900c52984
Merge branch 'main' into SP3-5-ECS
2022-09-15 12:18:20 +08:00
a90c137445
#comment Completed System Routine Added Unit Test version 1
2022-09-15 12:10:06 +08:00
ddf6a7bee5
SP3-108
...
Removed singleton instance from event manager and changed it to static class instead.
WARNING: Might need to change back to singleton next time, I had to do it previously for some reason but I don't remember why
2022-09-15 12:06:09 +08:00
972fe46ec2
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Engine/SHADE_Engine.vcxproj
# SHADE_Engine/SHADE_Engine.vcxproj.filters
# SHADE_Engine/premake5.lua
2022-09-15 12:05:12 +08:00
e1fb74f784
SHADE_Engine now copies the SDL2.dll to the out directory
2022-09-15 11:55:22 +08:00
9b25d909dd
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Engine/SHADE_Engine.vcxproj.filters
2022-09-15 11:43:30 +08:00
10c38a10a7
Merge branch 'DisableDllWarnings' into SP3-6-c-scripting
...
# Conflicts:
# Dependencies.bat
# SHADE_Application/SHADE_Application.vcxproj
# SHADE_Application/premake5.lua
# SHADE_Application/src/Application/SBApplication.cpp
# SHADE_Engine/SHADE_Engine.vcxproj
2022-09-15 11:43:03 +08:00
d680a07918
Merge pull request #19 from SHADE-DP/DisableDllWarnings
...
Disable DLL Export Warnings (4251)
Might not be the 100% correct way but in existing usage in GAM 200, there were no issues at all.
2022-09-15 11:38:27 +08:00
5ebdf87714
Merge pull request #18 from SHADE-DP/SP3-19-frame-rate-controller
...
FRC implemented
Handles the main game loop, which includes:
Handling restarting of scenes by freeing and initializing again
Handling changes of scenes by unloading previous scene and loading the next
Calling to update on a fixed time basis and reducing the accumulator
Calling to render on a variable time basis and adding to the accumulator
Measuring of variable time elapsed per frame
Ready for integration. Anticipating much change from this implementation during integration.
2022-09-15 11:34:53 +08:00
67290c03e7
Updated vcxproj files
2022-09-15 11:34:04 +08:00
c48a467e57
Disabled warnings for DLL export
2022-09-15 11:33:40 +08:00
12cfbb9952
Fixed SHDotNetRuntime::IsLoaded() giving incorrect data and updated qualifiers and comment formats
2022-09-15 11:25:58 +08:00
20f4b59f41
Merge branch 'main' into SDLIntegration
2022-09-15 09:30:03 +08:00
bd69c6043a
SDL Updates
2022-09-15 09:26:43 +08:00
79828740fd
Fixed hot reloading copying the wrong DLL
2022-09-15 09:21:51 +08:00
ad7df083bf
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# Premake/premake5.exe
# SHADE_Application/src/Application/SBApplication.cpp
# SHADE_Engine/SHADE_Engine.vcxproj
# SHADE_Engine/SHADE_Engine.vcxproj.filters
# SHADE_Engine/premake5.lua
2022-09-15 09:17:17 +08:00
169822c221
Render graph execution fixed
...
GetVkQueue function deleted. More specific function implemented (Present).
2022-09-15 09:16:13 +08:00
196ef93fed
CSProj for SHADE_Scripting is now generated if a build is attempted without it existing
2022-09-15 09:11:02 +08:00
d62201367a
Merge branch 'main' into SP3-18-Events
2022-09-15 09:10:49 +08:00
8e601e60e5
Added SHCommonTypes header file
...
Changed C++ std from latest to 20
Updated premake program
2022-09-15 01:51:04 +08:00
a3b1660013
SP3-108 Removed old event register method
...
added new events define
2022-09-15 01:46:11 +08:00
98d61f1ca7
Merge branch 'main' into SetWorkingDirectory
2022-09-15 01:39:10 +08:00
5e4eabc582
[WIP] SDL Window wrap
2022-09-15 00:48:43 +08:00
7bc0dfb399
Set working directory of the application to be the executable location
2022-09-15 00:33:12 +08:00
a2353e4446
frc commit, not connected yet
2022-09-14 22:00:00 +08:00
599f1e4ffe
add sdl to dependencies
2022-09-14 21:47:39 +08:00
57393ad7e4
Updated projects to use .NET 6.0
2022-09-14 20:29:40 +08:00
95c3609d21
Removed all references to Plushie
2022-09-14 20:26:31 +08:00
7e4c6a986a
Merge branch 'CleanUpPremake' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Engine/SHADE_Engine.vcxproj
# SHADE_Engine/SHADE_Engine.vcxproj.filters
2022-09-14 20:10:10 +08:00
7c64a12896
Moved spdlog lib link to SHADE_Engine and removed KTX references in Premake
2022-09-14 20:09:01 +08:00
e67b90c6a8
Added calls to SHScriptEngine in SBApplication
2022-09-14 20:07:13 +08:00
08f3a52dab
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Application/premake5.lua
# SHADE_Engine/SHADE_Engine.vcxproj
# SHADE_Engine/SHADE_Engine.vcxproj.filters
# SHADE_Engine/premake5.lua
# premake5.lua
2022-09-14 19:57:59 +08:00
44e529f06f
Merge branch 'SP3-4-editor' into SP3-1-Rendering
2022-09-14 19:44:01 +08:00
b66e2cf3d1
Merge branch 'main' into UseSharedOutInterDirs
2022-09-14 19:40:33 +08:00
921680d472
Deleted editor folder
2022-09-14 19:19:54 +08:00
7459e19846
Changes
2022-09-14 19:19:24 +08:00
5a1abe6530
Auto stash before merge of "SP3-4-editor" and "origin/SP3-4-editor"
2022-09-14 19:18:54 +08:00
803b29146e
Fixed memory error with SHLogger & spdlog
...
The logger needs to be registered outside the library. As such, a macro SHLOG_REGISTER has been added, as well as a variable to the actual logger. The logger needs to be passed into the macro anywhere outside the library after it has been initialised to work on the dll. This has already been done right before the application runs.
2022-09-14 17:57:36 +08:00
fdc8a61c1d
Added SHWindow to SHImguiWindow
2022-09-14 16:01:40 +08:00
44ef3a500f
Added post build command to copy spdlog.dll to output
2022-09-14 13:29:23 +08:00
b7cd1bed48
Added System Routines
2022-09-14 10:32:50 +08:00
a3e4b0a845
update premakes for spdlog changes
2022-09-14 09:14:18 +08:00
2332e5401f
Merge branch 'main' into SP3-15-Tools
2022-09-13 23:29:44 +08:00
e45e589ba9
Added functions that wrap around logging macros for C++/CLI integration
2022-09-13 23:29:20 +08:00
cba3aa0663
Converted SHADE_Engine to a DLL project and exported common use classes
2022-09-13 21:08:13 +08:00
91709b16c3
Changed out and intermediatery directories for all projects to use shared directories
2022-09-13 20:35:30 +08:00
0c28199acf
Converted SHScriptEngine to static and replaced json references with yaml
2022-09-13 20:30:32 +08:00
4ccfd399af
Renderpass execution and descriptor set writes
2022-09-13 19:46:51 +08:00
60a51eb101
Converted projects to use MD instead of MT library
2022-09-13 18:24:39 +08:00
23a599abe8
SP3-107 SP3-108
...
Initial port from 200
Removed unused classes
Changing Event package for better ease of use
2022-09-13 16:34:05 +08:00
f342fdcb95
changed more stuff to pragma once
2022-09-13 15:36:34 +08:00
8842269c6d
Changed everything to use pragma once
2022-09-13 15:36:03 +08:00
e9241feb69
moved all managers to their own folder
2022-09-13 15:26:23 +08:00
0ed5cecbf3
Fixed ECS references in various files in SHADE_Managed
2022-09-13 15:18:56 +08:00
d483916cc5
Changed SystemManager to use SystemID map instead of using a string map
2022-09-13 14:28:32 +08:00
3b9d14944e
SP3-102 Changed all previous references to updated versions. Removed function call to obsolete functons
2022-09-13 14:23:33 +08:00
04cae0fad9
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Engine/SHADE_Engine.vcxproj
# SHADE_Engine/SHADE_Engine.vcxproj.filters
# SHADE_Engine/premake5.lua
2022-09-13 14:09:32 +08:00
51fc65b825
Added some typedefs
2022-09-13 14:07:40 +08:00
8b8f0a076d
Added const to some functions
2022-09-13 13:57:01 +08:00
9c5a705bef
Merge branch 'main' into SP3-5-ECS
2022-09-13 13:52:52 +08:00
b674805547
Added ECS and Component classes for SHADE_Managed
2022-09-13 13:51:11 +08:00
5f56344a74
Shifted ECS_Base out of Engine Folder
2022-09-13 13:49:24 +08:00
1cabcefe0f
SP3-102 Initial port of 200 resource manager into 300 Asset manager
2022-09-13 13:37:32 +08:00
88894d1c3c
Merge branch 'main' into SP3-5-ECS
2022-09-13 13:30:21 +08:00
4ed417cbea
Added EngineInterface
2022-09-13 11:43:49 +08:00
cc2adcb2ab
Merge pull request #11 from SHADE-DP/SP3-14-FileSystem
...
File system base Implementation
Basic tree structure for file system created
Directory traversal with tree building
2022-09-13 11:42:30 +08:00
615d247722
Merge branch 'main' into SP3-12-SceneGraph
2022-09-13 11:40:08 +08:00
7b55f7fe3b
Merge branch 'main' into SP3-14-FileSystem
2022-09-13 11:36:11 +08:00
4aedf9f65a
Added new shaderc lib link
...
WALAO BRANDON
2022-09-13 11:35:36 +08:00
b6a6e9b3e5
Updated some const
2022-09-13 11:28:16 +08:00
47f716f72b
SP3-105 SP3-106
...
Folder tree building done
Location bit shift done
2022-09-13 11:27:51 +08:00
8f7d8cd8bc
Added vertex attributes
2022-09-13 09:13:39 +08:00
ccdb1d0e19
Added shlwapi.lib linker input for SHADE_Engine
2022-09-13 00:18:54 +08:00
506d3a1c35
WIP
2022-09-12 20:08:01 +08:00
1400a25c4d
Added SHADE_Managed project and added patched premake5.exe
2022-09-12 17:46:01 +08:00
548b09df06
Added SHScriptEngine and SHDotNetRuntime for managed code execution
2022-09-12 16:04:22 +08:00
ba5bea9d53
Added dotnet dependencies acquisition
2022-09-12 16:04:08 +08:00
d4944ef920
Added a scene graph
2022-09-11 22:47:30 +08:00
47e9e3d3f2
WIP
2022-09-11 22:34:55 +08:00
bf447c1d1d
Auto stash before merge of "SP3-4-editor" and "origin/SP3-4-editor"
2022-09-11 20:03:11 +08:00
4b8c842615
[WIP] SHADE ImGui Vulkan Backend
2022-09-09 21:46:30 +08:00
a8d00a29ec
[WIP] Editor: ImGui-Vulkan integration
2022-09-09 16:04:49 +08:00
09c1d2654d
WIP
2022-09-09 16:02:34 +08:00
4eb7e1f5f4
Merge branch 'SP3-1-Rendering' into SP3-4-editor
2022-09-09 14:38:28 +08:00
361237ede1
GETTER FOR RENDER GRAPH
2022-09-09 14:38:09 +08:00
122dc2f531
Merge branch 'SP3-1-Rendering' into SP3-4-editor
2022-09-09 14:35:23 +08:00
ae372f2917
Getter for renderpass in render node
2022-09-09 14:34:09 +08:00
8208e14fed
Merge branch 'SP3-1-Rendering' into SP3-4-editor
2022-09-09 14:21:42 +08:00
d7954245d6
Created a descriptor pool for Graphics System
2022-09-09 14:21:13 +08:00
8ab95e9a6d
Merge branch 'SP3-1-Rendering' into SP3-4-editor
2022-09-09 14:04:11 +08:00
fe954271cb
Getter for queue
2022-09-09 14:02:48 +08:00
03075ce738
Merge branch 'SP3-1-Rendering' into SP3-4-editor
2022-09-09 13:55:14 +08:00
78f8a9e455
Getter for physical device
2022-09-09 13:55:00 +08:00
b164ecbd16
Merge branch 'SP3-1-Rendering' into SP3-4-editor
2022-09-09 13:37:10 +08:00
bed017e539
Fixed some warnings and premake files now include hpp files
2022-09-09 13:28:57 +08:00
cce1d24374
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-09 11:20:46 +08:00
fe6c5be8c6
Graphics System called in application
2022-09-09 11:20:38 +08:00
f0b916b275
Added missing inverse function for Quaternions
2022-09-08 23:21:02 +08:00
392b51898a
Added more implementations for Quaternions
2022-09-08 22:46:51 +08:00
cecbca26c5
Fixed some warnings in ResourceLibrary and SparseSet
2022-09-08 20:55:56 +08:00
28ab89cf91
set up backend functions
2022-09-08 20:34:44 +08:00
01ff98b24f
Merge branch 'main' into SP3-16-Math
...
# Conflicts:
# SHADE_Engine/SHADE_Engine.vcxproj
# SHADE_Engine/src/SHpch.h
2022-09-08 19:46:06 +08:00
407ac11753
Merge branch 'main' into SP3-4-editor
2022-09-08 19:38:09 +08:00
32dc894608
SHEditor Base
2022-09-08 19:37:49 +08:00
62c67909ee
Rendering Integration
2022-09-08 19:11:25 +08:00
8cdd8b4a25
Added Math helper functions & wrappers for Vectors, Matrix and Quaternion.
2022-09-08 14:18:26 +08:00
280ef33587
Added logging & exception handling tools into engine, modified premake5 on SHADE_Application to include spdlog
2022-09-08 12:51:23 +08:00
4c5c5f61e8
Merge branch 'main' into SP3-5-ECS
2022-09-08 12:17:10 +08:00
85a63cec1f
#comment removed two CreateEntity function overloads and added a default value to desired EID instead
2022-09-08 12:06:29 +08:00
8563ecb7e8
Imported Application, Engine, Scene Manager, Test Scene from 200
2022-09-08 11:48:32 +08:00
9a223098f6
Initial Commit
2022-09-08 11:17:25 +08:00
cfa7bb812a
#comment initial commit added use of SHpch
2022-09-08 11:15:43 +08:00
ead46d0ef1
Merge branch 'main' into SP3-5-ECS
2022-09-08 11:09:36 +08:00
04ee50bc6a
Generated solution
2022-09-08 11:08:46 +08:00
1105edb8c2
initial commit
2022-09-08 11:08:23 +08:00
060937344b
Update Dependencies and Premake
2022-09-06 10:39:12 +08:00
aee5e3b4d6
Properly changed entrypoint to winmain
2022-09-05 15:29:02 +08:00
d74ac7b8a4
Added dependencies to project
2022-09-05 14:37:29 +08:00
98bf020293
WinMain Entry point
2022-09-05 13:55:52 +08:00
0436ec45f6
Added dependencies into premake
2022-08-26 14:30:41 +08:00
3313127e8c
Basic Project set up with premake
2022-08-26 14:04:03 +08:00
maverickdgg