bf0c068cc7
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-10-23 18:23:06 +08:00
f9a28c81d4
Fixed vulkan breaking error
2022-10-23 17:18:46 +08:00
8559f7d27c
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-10-23 16:59:11 +08:00
33a6d3798c
Added orientation interface and fixed compatibility between physics and transform
2022-10-23 16:55:01 +08:00
982f2de286
Merge remote-tracking branch 'origin/main' into Rendering-Camera-Integration
2022-10-23 16:36:22 +08:00
64002c6f2b
Camera Director integrated
...
Still has bug
2022-10-23 16:04:58 +08:00
ebfcf1c6bb
Transform now stores orientation as Quaternions. Interface unchanged
2022-10-22 20:16:38 +08:00
db751bd141
Editor & Scripts can now override Physics-Based objects' Transforms
2022-10-22 18:22:26 +08:00
d6123c8ed7
Merge branch 'main' into SP3-4-editor_fix
2022-10-21 20:45:16 +08:00
b3ed320f9b
Transform Gizmo done. (Commands for it are wonky)
2022-10-21 18:39: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
bf0e7ab256
Merge branch 'main' into SP3-4-editor_fix
2022-10-21 08:57:25 +08:00
fda33f7461
Fixed multi-level transform updates
2022-10-20 22:55:59 +08:00
314d497b66
Reparenting objects maintain world transforms
2022-10-20 18:35:57 +08:00
323a95e5d5
Merge branch 'main' into SP3-6-c-scripting
2022-10-20 11:08:41 +08:00
4f177bc455
Reworked script serialization and deserialization functions (WIP)
2022-10-19 20:43:22 +08:00
125ce7b564
Merge branch 'main' into SP3-4-editor_fix
2022-10-19 17:43:22 +08:00
284ee12205
Broken Camera
2022-10-19 15:32:07 +08:00
5bd5cec9d4
Merge branch 'main' into SP3-4-editor_fix
2022-10-19 09:49:10 +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
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
228868604a
Editor fixes
...
Integration of mouse pick
Add editor state
Add editor layout
2022-10-16 14:20:35 +08:00
22cad78728
Clean up
2022-10-14 15:53:29 +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
682a5a6cbf
bug fix
2022-10-14 00:10:56 +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
acd3174c39
Merge branch 'SP3-16-Math' into SP3-2-Physics
2022-10-13 18:15:52 +08:00
ff9b504bc5
Moved collider interface into physics object. Added support for removing rigidbodies
2022-10-11 01:26:12 +08:00
d432822608
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-02 01:13:43 +08:00
201ce17a40
Fixed validation errors when closing the app
2022-10-02 00:56:34 +08:00
40bcea133d
Changed texture index to 0 for both racoons
2022-10-02 00:09:38 +08:00
e2b86545bb
Window resize working
2022-10-01 23:57:08 +08:00
4007120dbd
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-01 22:06:50 +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
aef3e4ef1a
Update SBApplication.cpp
2022-10-01 17:04:07 +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
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
0360a8bfa1
made the Input Manager NOT be a System anymore
2022-10-01 14:34:30 +08:00
0792979dff
Moved some comments
2022-10-01 13:31:08 +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
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
b1a799cf05
Attempt using dllimport/dllexport
2022-09-29 07:59:04 +08:00
70559204bf
Added spinning raccoons and fixed TRansform component bug
2022-09-28 23:55:44 +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
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
5f4c81aeed
comment out audiosystem from application to prevent accidents
2022-09-28 18:22:53 +08:00
43ad883bdb
removing unnecessary creation of cpmponent
2022-09-28 18:08:49 +08:00
4fcb5e313b
Added more objects + tested materials (still needs testing)
2022-09-28 18:03:46 +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
6ef30bc415
post processing copy for publish build
2022-09-28 17:22:22 +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
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
a08b123814
Added reactphysics to SHADE_Application premake file
2022-09-28 13:34:35 +08:00
a2311a473e
Auto stash before merge of "SP3-1-Rendering" and "origin/SP3-1-Rendering"
2022-09-28 10:29:42 +08:00
d5cc923413
Hard coded to always load racoon mesh instead of bag
2022-09-27 22:37:49 +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
61219f5136
Added tests for material binding and fixed some crashes
2022-09-27 21:06:14 +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
b7adf8815b
Fixed camera. Can see texture now
2022-09-27 19:18:45 +08:00
337894ebc2
Merge branch 'main' into SP3-6-c-scripting
2022-09-27 16:39:02 +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
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
60540b1adc
Temp function to retrieve all textures
2022-09-27 14:09:44 +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
085ab50ec7
Added a script to test Transform modifications
2022-09-27 01:57:23 +08:00
eeaf86e968
Merge branch 'main' into SP3-129-AudioSystem
2022-09-26 23:21:01 +08:00
3e2bcf28b6
Added texture loading that is almost working
2022-09-26 20:59:20 +08:00
caab2c37ab
Added GLTF extension recognisation
2022-09-26 19:10:12 +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
5a92b77a3a
added missing ,
2022-09-26 15:52:21 +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
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
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
Diren D Bharwani