449cd28bb3
Took test scene from main
2022-10-21 20:55:21 +08:00
44833d22c6
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-21 20:52:28 +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
52311d0ba6
Merge pull request #104 from SHADE-DP/SP3-13-ResourceManager
...
Added SHResourceManager and Generic Handle
2022-10-21 17:11:51 +08:00
e5628fbed8
Added functionality to retrieve AssetID from SHResourceManager using a Handle
2022-10-21 17:09:50 +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
2cf9c87509
Merge pull request #103 from SHADE-DP/Rename-ResourceManager
...
The Great SHRenaming
Renamed Handle, ResourceManager and ResourceLibrary to SHHandle, SHResourceHub and SHResourceLibrary
2022-10-20 19:02:49 +08:00
0fadbc8a9d
Renamed Handle, ResourceManager and ResourceLibrary to SHHandle, SHResourceHub and SHResourceLibrary
2022-10-20 19:00:36 +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
2db6644536
Merge pull request #101 from SHADE-DP/SP3-141-Camera-System
...
Sp3 141 camera system
Done with editor camera
2022-10-20 11:18:57 +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
4bc91283c8
Fixed primitive fields not being serialised
2022-10-20 10:10:43 +08:00
cfed342f9c
Modified script serialization to use a sequence of scripts instead of a map
2022-10-20 09:54:51 +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
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
a21fc2ba11
Merge pull request #100 from SHADE-DP/SP3-1-Rendering
...
Resize fix
2022-10-19 17:08:42 +08:00
603470eeb6
Fixed some camera resizing issues
2022-10-19 17:06:37 +08:00
b499d5fc55
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-19 16:59:50 +08:00
49b32d1992
Merge pull request #99 from SHADE-DP/CameraIntegration
...
Camera Integration, viewport resize and resize fix
2022-10-19 16:59:11 +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
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
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
95310b99bd
Merge branch 'RenderingEditorVPIntegration' into SP3-1-Rendering
2022-10-19 12:27:05 +08:00
efe8ba4f11
Added some editor camera controls
2022-10-19 10:32:52 +08:00
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
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
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
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
0e6893840b
Merge remote-tracking branch 'origin/SP3-8-serialization' into SP3-8-serialization
2022-10-19 00:17:03 +08:00
ceb4c6c4ca
Added Range Attribute
2022-10-18 22:34:46 +08:00
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
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
82637b620d
Delete UserLayout.ini
2022-10-18 19:36:49 +08:00
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
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
Xiao Qi