Commit Graph

1395 Commits

Author SHA1 Message Date
Kah Wei 17662abef1 Fixed bug where certain null objects in deserialization was not handled 2022-11-17 15:42:40 +08:00
XiaoQiDigipen 098c621316
Merge pull request #215 from SHADE-DP/SP3-1-MaterialEditSupport
Added full support for runtime editing of material properties
2022-11-17 09:22:52 +08:00
Kah Wei b129a68680 Disabled setting of shader for now as it is buggy 2022-11-16 23:19:25 +08:00
Kah Wei ae5f7801d4 Merge branch 'main' into SP3-1-MaterialEditSupport 2022-11-16 22:52:42 +08:00
Kah Wei 19bc90845f Added additional checks for SetProperty() of Material and MaterialInstance 2022-11-16 21:01:51 +08:00
Kah Wei 8869b42db2 Fixed memory corruption in SHSubpass 2022-11-16 21:00:27 +08:00
Kah Wei fe91f58d28 Fixed material inspector saving not saving the correct texture ID into the runtime material 2022-11-16 19:25:17 +08:00
Kah Wei c5bca4111b Fixed validation error caused by deleting empty batches 2022-11-16 19:23:26 +08:00
Kah Wei f0c09817ce EnsureBufferAndCopy utility functions now avoid resizes if new size is smaller or equal 2022-11-16 17:49:11 +08:00
Kah Wei 29b4465dfd Split pre-rendering tasks to a PrepareRenderRoutine 2022-11-16 17:48:15 +08:00
Kah Wei 506b8836fe Materials now keep track of their modified state and associated MaterialInstances keep track of changes to their base 2022-11-16 17:46:36 +08:00
XiaoQiDigipen 9c4c665fa8
Merge pull request #214 from SHADE-DP/SP3-1-MaterialUpdate
Fixed material property setting at runtime
2022-11-16 17:01:57 +08:00
Kah Wei 760c0386a9 Merge branch 'SP3-1-MaterialUpdate' into SP3-1-MaterialEditSupport
# Conflicts:
#	SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMaterial.h
2022-11-16 16:45:22 +08:00
Kah Wei db7c4a6d38 Merge branch 'main' into SP3-1-MaterialUpdate 2022-11-16 16:40:15 +08:00
Kah Wei acae84d12c Fixed bug where creation of custom material instance for Renderables are not updated on the GPU 2022-11-16 16:38:04 +08:00
Kah Wei 3e3a66f261 Fixed memory corruption issue caused by SHMaterialInstance::SetMaterial() 2022-11-16 16:32:12 +08:00
XiaoQiDigipen 690ebef77d
Merge pull request #213 from SHADE-DP/SP3-4-Editor
Added Custom RigidBody Component View in Editor
2022-11-16 15:33:38 +08:00
XiaoQiDigipen b887a303ef
Merge pull request #212 from SHADE-DP/SP3-6-c-scripting
Added Audio class for playing audio from C#
2022-11-16 15:31:17 +08:00
Kah Wei 3a6f1f852b SHMaterialInstance::GetProperty() will now retrieve a property from the base material if it was not overriden 2022-11-16 15:29:11 +08:00
Sri Sham Haran ba39c02f9f Changed formatting slightly for RigidBody component view 2022-11-16 15:28:42 +08:00
Kah Wei dc9291bc01 Added Audio class for playing audio from C# 2022-11-16 15:00:56 +08:00
Kah Wei 3affaf426d WIP Runtime Material Editing support 2022-11-16 09:06:29 +08:00
Sri Sham Haran 37aad49406 Added requested rigidbody component view with debug information
Changed DragVec controls to not push commands if ImGuiSliderFlags_ReadOnly is enabled
2022-11-15 21:09:24 +08:00
XiaoQiDigipen ec215b944e
Merge pull request #211 from SHADE-DP/SP3-16-Math
Fixed Vector3.GetNormalised!!!!!!!
2022-11-15 19:27:27 +08:00
Diren D Bharwani a752bdb985 someone donno how to normalise sia 2022-11-15 18:45:58 +08:00
Diren D Bharwani a3d2f95aa0 Merge remote-tracking branch 'origin/main' into SP3-16-Math 2022-11-15 18:41:16 +08:00
Kah Wei 958310a8ea Renderable now shows the name of the mesh and material assigned instead of asset IDs 2022-11-15 18:16:07 +08:00
Kah Wei c69ad04f1e Added functions to get name of a backing asset from SHResourceManager 2022-11-15 18:15:49 +08:00
XiaoQiDigipen 4b70fbf0d6
Merge pull request #210 from SHADE-DP/SP3-8-serialization
Added serialization of component isActive
2022-11-15 18:15:23 +08:00
Sri Sham Haran 93cded6ed9 Added serialization of component isActive 2022-11-15 17:04:52 +08:00
XiaoQiDigipen 0aaa493bcc
Merge pull request #209 from SHADE-DP/SP3-4-Editor
Editor fixes - Parenting of range selected entities, Component IsActive Checkbox, Scene Play/Pause behaviour, Gizmo controls
2022-11-15 16:37:09 +08:00
Sri Sham Haran 0e4d97da81 tooltip now reflects the correct keys 2022-11-15 16:28:46 +08:00
Sri Sham Haran b0404bd59a Merge branch 'main' into SP3-4-Editor 2022-11-15 16:22:56 +08:00
Sri Sham Haran d3be8127cd [FIXED] Parenting of entities selected using Shift+Select
[FIXED] Component Active Checkbox not working for non reflected components
2022-11-15 16:22:48 +08:00
Diren D Bharwani d3103598f3 Removed old SHLog trace methods 2022-11-15 16:22:16 +08:00
Kah Wei 75f103c372 Setting pipeline of a material now triggers a reset of all properties for material instances based on the material 2022-11-15 15:58:38 +08:00
Sri Sham Haran e7a66eed08 Merge branch 'main' into SP3-4-Editor 2022-11-15 15:12:16 +08:00
XiaoQiDigipen c8ba066929
Merge pull request #208 from SHADE-DP/SP3-15-Tools
Added debug-only logging macros
2022-11-15 13:19:37 +08:00
Diren D Bharwani e93eea6381 Cleaned up tools folder. Added debug only logging macros with _D suffix 2022-11-15 03:03:37 +08:00
Diren D Bharwani b164e95b12 Merge remote-tracking branch 'origin/main' into SP3-15-Tools 2022-11-15 02:30:05 +08:00
XiaoQiDigipen 94b4e3d169
Merge pull request #206 from SHADE-DP/SP3-6-c-scripting
Updated projects documentation auto generation
2022-11-15 01:52:53 +08:00
XiaoQiDigipen 638e95473c
Merge pull request #207 from SHADE-DP/SP3-13-Assets-Manager
Fixed and Updated internal asset creation pipeline for editor (Textures)

Accounted for texture compilation within editor
Fixed bug with rebuilding of asset collection and asset directory
Added checks for already registered assets and sub assets
2022-11-15 01:50:13 +08:00
Kah Wei 5cb87402b2 Hide .shmeta files from C# script project 2022-11-15 01:22:22 +08:00
Xiao Qi 16e357acb0 Accounted for texture compilation
Changed refresh, doesnt clear asset collection anymore
Checks for preexisting sub assets and asset meta in collection
2022-11-14 21:18:36 +08:00
Sri Sham Haran 7c636adbfc Merge branch 'main' into SP3-4-Editor 2022-11-14 20:41:50 +08:00
Sri Sham Haran 36ed195a69 [FIX] Scene saving when you press play from pause
[FIX] WER for transform gizmo can now be pressed regardless of whether editor viewport is focused
2022-11-14 20:40:52 +08:00
Kah Wei 47c50c3a31 Merge branch 'main' into SP3-6-c-scripting 2022-11-14 19:38:43 +08:00
XiaoQiDigipen 870e2dd36d
Merge pull request #205 from SHADE-DP/SP3-2-Physics
SP3-2 Collider Materials synchronisation with ReactPhysics & Clear Forces method
UPDATES

Collider Materials now sync with react physics. C# methods will be added later tonight.
Clear forces methods added to RigidBodyComponent.
2022-11-14 19:25:02 +08:00
Kah Wei 6673e6f266 Merge branch 'main' into SP3-6-c-scripting 2022-11-14 19:08:46 +08:00
Kah Wei 9df5b131ee Fixed build error with deletion of net5.0 2022-11-14 19:08:36 +08:00