Commit Graph

1451 Commits

Author SHA1 Message Date
Kah Wei e0481ad8af Removed debug log 2022-11-08 13:47:39 +08:00
Kah Wei ddd93a85f4 Added support for null GameObjects (loading is buggy) 2022-11-08 00:53:47 +08:00
Diren D Bharwani 8fbd32a144 Added Relative Sizes to Shapes 2022-11-08 00:46:09 +08:00
Kah Wei ed3131143d Added debug labels for samplers and fixed issue with compute pipeline names not being labelled correctly 2022-11-07 23:51:48 +08:00
Kah Wei 0b813d769a Added WIP Compute Pipelines labeling 2022-11-07 19:41:19 +08:00
Kah Wei d302d7e07d Added labels for more buffers, images, imageviews, frames, semaphores and more 2022-11-07 19:32:12 +08:00
Diren D Bharwani 70dcad1313 Changed Collider to CollisionShape for improved clarity 2022-11-07 18:19:39 +08:00
Diren D Bharwani 4e02f64133 Fixed bug where duplicate triggers were caught due to swapped entity IDs 2022-11-07 18:06:43 +08:00
Kah Wei 44ae6d0a8f Removed unused descriptor sets in SHGraphicsGlobalData 2022-11-07 17:28:03 +08:00
Kah Wei 0bda3d5151 Added labels for resources of Mesh and Texture libraries 2022-11-07 14:08:19 +08:00
Diren D Bharwani 10ba68b284 Merge remote-tracking branch 'origin/main' into SP3-2-Physics 2022-11-07 13:29:17 +08:00
Kah Wei fb37742ee0 Staging Buffers are now labeled 2022-11-07 13:28:49 +08:00
Kah Wei 782db1e2a4 Added debug labels for Renderpasses 2022-11-07 13:22:16 +08:00
Kah Wei 4bd9f0817a Buffers are now tagged as buffers for debug labels 2022-11-07 13:21:17 +08:00
Kah Wei 37c765d5cd Merge branch 'main' into SP3-1-DebugLabels 2022-11-07 11:24:18 +08:00
XiaoQiDigipen 7e1a909709
Merge pull request #179 from SHADE-DP/FixesForMs2Submission
small fixes for ms2 submission - delete this branch
2022-11-05 18:18:40 +08:00
Sri Sham Haran de38b29f25 small fixes for ms2 submission 2022-11-05 18:15:18 +08:00
XiaoQiDigipen 5506d14f84
Merge pull request #178 from SHADE-DP/PlayerController
made rb a properties
2022-11-05 17:46:16 +08:00
Glence b9996c7b51 made rb a properties 2022-11-05 17:44:34 +08:00
XiaoQiDigipen a5c0456eb7
Merge pull request #177 from SHADE-DP/SP3-6-c-scripting
Scenes are now reloaded and scripts are no longer lost when building scripts
2022-11-05 15:36:05 +08:00
Kah Wei 04e2c255b0 Build script options are now disabled when in play or pause mode 2022-11-05 15:34:56 +08:00
Kah Wei 06afd384af Scenes are now reloaded and scripts are no longer lost when building scripts 2022-11-05 14:56:52 +08:00
XiaoQiDigipen 29c25c2d6d
Merge pull request #176 from SHADE-DP/SP3-1-BuiltInMesh
Pregenerates default meshes and provides a function to retrieve them
2022-11-05 00:13:45 +08:00
Xiao Qi 81d94c0a29 Merge remote-tracking branch 'origin/main' into main 2022-11-05 00:13:29 +08:00
Xiao Qi 7bfe459c02 Called assimp git pull from root bat directly instead of calling bat inside dependency 2022-11-05 00:13:24 +08:00
Kah Wei 40422a6d23 Added built-in primitives 2022-11-05 00:10:54 +08:00
XiaoQiDigipen 841a73b712
Merge pull request #175 from SHADE-DP/SP3-4-Editor
Asset browser now recurses down subassets
2022-11-04 23:35:41 +08:00
Sri Sham Haran ab17d57756 Asset browser now recurses down subassets 2022-11-04 23:32:29 +08:00
XiaoQiDigipen 740c144565
Merge pull request #174 from SHADE-DP/SP3-305-configurationsMerge
Scenes now load from file based on application config starting scene id
Added application config
Load starting scene from application config
Pressing play saves the scene
Pressing stop reloads the scene
2022-11-04 19:21:42 +08:00
Kah Wei b5bc64456c Added debug names for some SHVkBuffers 2022-11-04 19:16:57 +08:00
Sri Sham Haran b30da7e495 Fixes 2022-11-04 19:16:32 +08:00
Kah Wei d8ee991213 Steps in the rendering process are now highlighted and named for debugging tools 2022-11-04 18:39:45 +08:00
Sri Sham Haran b86f092f52 Merge branch 'main' into SP3-305-configurationsMerge 2022-11-04 18:37:19 +08:00
Sri Sham Haran 1267442210 Deserialization flow is now as follows:
Create entities and components >> Fetch Assets needed >> Load assets needed >> Initialize entities
Some other bug fixes
2022-11-04 18:27:25 +08:00
XiaoQiDigipen 378e4a67ce
Merge pull request #173 from SHADE-DP/SP3-13-Assets-Manager
Support for External Model Compiler and Model/Mesh sub assets
Compiling of external files (.gltf, .fbx) done by externally built exe
Models recognised as whole assets, contained meshes recognises and individual assets as well but saved into one file
Structured control paths for assets with and without sub assets for loading
2022-11-04 17:53:04 +08:00
Xiao Qi f2b589071c Merge branch 'main' into SP3-13-Assets-Manager 2022-11-04 17:49:43 +08:00
XiaoQiDigipen 6ad6db7997
Merge pull request #172 from SHADE-DP/PlayerController
additional changes for player controller
added itemweight to affect player jump
small bug fix to player throw
player caught will now reset its location
2022-11-04 17:49:25 +08:00
Xiao Qi 6d0089ee12 Merge branch 'main' into SP3-13-Assets-Manager 2022-11-04 17:49:13 +08:00
Glence be16fbed19 added item script in the scene 2022-11-04 17:35:09 +08:00
Glence d6804c09f4 fixed player throwing
added item script 
player jump is now affected by item weight
2022-11-04 17:31:53 +08:00
Xiao Qi 9ef956029e Changed name check for hardcoded racoon mesh 2022-11-04 17:20:52 +08:00
Xiao Qi 1f0d54486d Added sub asset data members
Changed some control flow in asset manager to accommodate for subassets
Read/Write meta files for assets with sub assets
2022-11-04 17:20:42 +08:00
Xiao Qi 6984653b64 Renamed and restructured model asset members
Added mesh asset vector for model asset to contain
2022-11-04 17:18:40 +08:00
Xiao Qi 608b204f88 Changed premake to copy model compiler exe 2022-11-04 17:17:48 +08:00
Xiao Qi 04113a0480 Shifted assets and generated new assets 2022-11-04 17:17:24 +08:00
Xiao Qi 4eecc0c08d Removed old mesh and meta files 2022-11-04 16:23:13 +08:00
XiaoQiDigipen 3b90c84a85
Merge pull request #171 from SHADE-DP/SP3-4-Editor
Fix drag-drop parenting issue
Users can now drop onto empty space in hierarchy panel to unparent
2022-11-04 16:11:38 +08:00
XiaoQiDigipen c7f6ded5ae
Merge pull request #170 from SHADE-DP/Fix-MultiplyShader
Switched shaders to use multiply colour instead of additive
2022-11-04 16:11:12 +08:00
Sri Sham Haran 2b34e8c13b Fix drag-drop parenting issue
Users can now drop onto empty space in hierarchy panel to unparent
2022-11-04 16:09:15 +08:00
Sri Sham Haran 4ee0294977 Scene loads correctly now 2022-11-04 14:44:18 +08:00