Commit Graph

792 Commits

Author SHA1 Message Date
maverickdgg c23da81f68 Merge branch 'main' into SP3-141-Camera-System 2022-10-19 23:57:16 +08:00
Kah Wei 4f177bc455 Reworked script serialization and deserialization functions (WIP) 2022-10-19 20:43:22 +08:00
Sri Sham Haran 6051b7ded5 Tfm gizmo wip 2022-10-19 20:42:38 +08:00
Xiao Qi 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
Sri Sham Haran 125ce7b564 Merge branch 'main' into SP3-4-editor_fix 2022-10-19 17:43:22 +08:00
Brandon Mak 71502daac3 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-10-19 17:23:31 +08:00
Sri Sham Haran a7e8320008 Copy/Paste Entities 2022-10-19 17:23:25 +08:00
XiaoQiDigipen a21fc2ba11
Merge pull request #100 from SHADE-DP/SP3-1-Rendering
Resize fix
2022-10-19 17:08:42 +08:00
Brandon Mak 603470eeb6 Fixed some camera resizing issues 2022-10-19 17:06:37 +08:00
Brandon Mak b499d5fc55 Merge remote-tracking branch 'origin/main' into SP3-1-Rendering 2022-10-19 16:59:50 +08:00
XiaoQiDigipen 49b32d1992
Merge pull request #99 from SHADE-DP/CameraIntegration
Camera Integration, viewport resize and resize fix
2022-10-19 16:59:11 +08:00
Brandon Mak 212e1e7c1f Merge remote-tracking branch 'origin/main' into CameraIntegration 2022-10-19 16:54:24 +08:00
Brandon Mak d9136de134 Integrated Daniel's camera
Still need to integrate camera directors
2022-10-19 16:53:45 +08:00
XiaoQiDigipen 2dcf367bc5
Merge pull request #98 from SHADE-DP/SP3-6-c-scripting
Added Time class for C#
2022-10-19 16:08:38 +08:00
Kah Wei a3c4c347bb Added Time class for C# 2022-10-19 16:06:26 +08:00
Brandon Mak 284ee12205 Broken Camera 2022-10-19 15:32:07 +08:00
Brandon Mak 95310b99bd Merge branch 'RenderingEditorVPIntegration' into SP3-1-Rendering 2022-10-19 12:27:05 +08:00
maverickdgg efe8ba4f11 Added some editor camera controls 2022-10-19 10:32:52 +08:00
XiaoQiDigipen db78e2c973
Merge pull request #97 from SHADE-DP/SP3-6-RangeAttribute
Added Range attribute for constraining numerical script fields
2022-10-19 10:26:38 +08:00
Kah Wei 896d399a54 Merge branch 'main' into SP3-6-RangeAttribute 2022-10-19 10:13:15 +08:00
Kah Wei 7df24e7a66 Fixed RangeAttribute not working correctly 2022-10-19 10:12:56 +08:00
maverickdgg 33b173ab9e Merge branch 'main' into SP3-141-Camera-System 2022-10-19 09:57:52 +08:00
Sri Sham Haran 5bd5cec9d4 Merge branch 'main' into SP3-4-editor_fix 2022-10-19 09:49:10 +08:00
XiaoQiDigipen 7e3ca4c45f
Merge pull request #96 from SHADE-DP/SP3-8-serialization
Added Serialization/Deserialization
Added serialization and deserialization of scenes, entities and components with the exception of collider component and renderable component
2022-10-19 08:48:18 +08:00
Sri Sham Haran 3a3f7efb29 [WIP] Transform Gizmo 2022-10-19 01:31:48 +08:00
Sri Sham Haran 96f5b29418 Serialization/Deserialization 2022-10-19 01:03:32 +08:00
Sri Sham Haran 2f429f33f8 Merge branch 'main' into SP3-8-serialization 2022-10-19 00:26:14 +08:00
Sri Sham Haran 0e6893840b Merge remote-tracking branch 'origin/SP3-8-serialization' into SP3-8-serialization 2022-10-19 00:17:03 +08:00
Kah Wei ceb4c6c4ca Added Range Attribute 2022-10-18 22:34:46 +08:00
XiaoQiDigipen 2623952d47
Merge pull request #95 from SHADE-DP/SP3-6-c-scripting
Added script inspector tooltips support via Tooltip attribute
2022-10-18 20:13:30 +08:00
Kah Wei 5727bf3905 Merge branch 'main' into SP3-6-c-scripting 2022-10-18 20:10:06 +08:00
Kah Wei 87cf3ffa61 Added script inspector tooltips support via Tooltip attribute 2022-10-18 20:09:50 +08:00
Sri Sham Haran b18d1f66ae Merge branch 'main' into SP3-8-serialization 2022-10-18 19:50:20 +08:00
Sri Sham Haran 82637b620d
Delete UserLayout.ini 2022-10-18 19:36:49 +08:00
XiaoQiDigipen 0a6f777c07
Merge pull request #94 from SHADE-DP/RenderingEditorVPIntegration
Viewport
Added viewport thing to editor.
and mouse picking
2022-10-18 19:20:08 +08:00
Sri Sham Haran da99a5559e Merge branch 'main' into RenderingEditorVPIntegration 2022-10-18 19:09:08 +08:00
Sri Sham Haran 15a17deaf0 select picked entity in hierarchy panel 2022-10-18 19:08:31 +08:00
Brandon Mak 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
Kah Wei a221cfc1cd Modified SHScriptEngine's serialization functions to take in EntityID instead of SHEntity 2022-10-18 17:25:45 +08:00
Brandon Mak 033ba48304 Editor changes to support viewport integration 2022-10-18 15:04:25 +08:00
Brandon Mak 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
Brandon Mak 7b7533420e WIP 2022-10-18 01:12:03 +08:00
Sri Sham Haran ec6772657f Hierarchy QOL
Undo/Redo Parent Child
Shift select
Undo/Redo create entity
2022-10-17 21:25:59 +08:00
Brandon Mak 17b71393f3 Restructured abit 2022-10-17 16:50:53 +08:00
XiaoQiDigipen 86f4125100
Merge pull request #92 from SHADE-DP/SP3-13-Assets-Manager
SP3-13 Assets Management
Pushed functions to retrieve mesh and texture asset data
2022-10-17 15:05:14 +08:00
Xiao Qi 013bb71325 Functions to retrieve mesh and texture data 2022-10-17 15:04:38 +08:00
XiaoQiDigipen 161d33280a
Merge pull request #91 from SHADE-DP/SP3-13-Assets-Manager
SP3-13 Assets Management

Automatic loading of data with existing meta files
Asset meta file written into disk
Commented hardcoded asset loading lines
2022-10-16 23:16:55 +08:00
Xiao Qi 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
Brandon Mak 95ee4b7b55 Resize half working 2022-10-16 19:42:44 +08:00
Diren D Bharwani a481970e5f Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-10-16 19:16:02 +08:00