mushgunAX
0360a8bfa1
made the Input Manager NOT be a System anymore
2022-10-01 14:34:30 +08:00
Xiao Qi
0792979dff
Moved some comments
2022-10-01 13:31:08 +08:00
Xiao Qi
adbb77932c
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-01 13:29:51 +08:00
Xiao Qi
c82d01631c
SP3-237 Texture load/compile successfully
2022-10-01 13:27:51 +08:00
Xiao Qi
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
Diren D Bharwani
e956797441
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-10-01 01:13:13 +08:00
maverickdgg
114ae86a9f
Fixed SHFamilyID for SHSystem and SHComponent but still have issues with SHScene
2022-09-30 20:13:18 +08:00
Xiao Qi
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
maverickdgg
b1a799cf05
Attempt using dllimport/dllexport
2022-09-29 07:59:04 +08:00
Kah Wei
70559204bf
Added spinning raccoons and fixed TRansform component bug
2022-09-28 23:55:44 +08:00
Kah Wei
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
Diren D Bharwani
0e07960938
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-09-28 21:30:57 +08:00
Brandon Mak
363e09bd55
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-28 20:39:42 +08:00
Brandon Mak
78f216e445
Rendered multiple racoons
2022-09-28 20:33:29 +08:00
Glence
5f4c81aeed
comment out audiosystem from application to prevent accidents
2022-09-28 18:22:53 +08:00
Glence
43ad883bdb
removing unnecessary creation of cpmponent
2022-09-28 18:08:49 +08:00
Brandon Mak
4fcb5e313b
Added more objects + tested materials (still needs testing)
2022-09-28 18:03:46 +08:00
Diren D Bharwani
c698bac731
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-09-28 17:52:02 +08:00
Glence
658562bdc4
Merge branch 'main' into SP3-129-AudioSystem
2022-09-28 17:51:40 +08:00
Xiao Qi
6ef30bc415
post processing copy for publish build
2022-09-28 17:22:22 +08:00
XiaoQiDigipen
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
Diren D Bharwani
097b1be3f7
Added Physics System
2022-09-28 16:15:36 +08:00
Brandon Mak
2df9252e17
Fixed material desc set binding
2022-09-28 15:31:37 +08:00
Diren D Bharwani
a08b123814
Added reactphysics to SHADE_Application premake file
2022-09-28 13:34:35 +08:00
Brandon Mak
a2311a473e
Auto stash before merge of "SP3-1-Rendering" and "origin/SP3-1-Rendering"
2022-09-28 10:29:42 +08:00
Xiao Qi
d5cc923413
Hard coded to always load racoon mesh instead of bag
2022-09-27 22:37:49 +08:00
mushgunAX
1813ad138c
FRC changed
2022-09-27 22:05:59 +08:00
Kah Wei
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
Kah Wei
61219f5136
Added tests for material binding and fixed some crashes
2022-09-27 21:06:14 +08:00
Brandon Mak
70940534e1
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-27 20:07:29 +08:00
Kah Wei
055a0a1711
Fixed textures not loading correctly
2022-09-27 19:52:36 +08:00
Brandon Mak
b7adf8815b
Fixed camera. Can see texture now
2022-09-27 19:18:45 +08:00
Kah Wei
337894ebc2
Merge branch 'main' into SP3-6-c-scripting
2022-09-27 16:39:02 +08:00
Kah Wei
04b452543c
Modified TextureLibrary to use SHTextureAsset instead of SHDDSAsset
2022-09-27 16:05:47 +08:00
Kah Wei
10b22374c0
Merge branch 'main' into SP3-1-Rendering
...
# Conflicts:
# SHADE_Application/src/Scenes/SBTestScene.cpp
2022-09-27 15:48:51 +08:00
XiaoQiDigipen
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
Xiao Qi
60540b1adc
Temp function to retrieve all textures
2022-09-27 14:09:44 +08:00
Kah Wei
e9496bead6
Fixed bug where different Renderables of different meshes are thrown into the same SubBatch
2022-09-27 13:43:59 +08:00
Kah Wei
085ab50ec7
Added a script to test Transform modifications
2022-09-27 01:57:23 +08:00
Glence
eeaf86e968
Merge branch 'main' into SP3-129-AudioSystem
2022-09-26 23:21:01 +08:00
Kah Wei
3e2bcf28b6
Added texture loading that is almost working
2022-09-26 20:59:20 +08:00
Xiao Qi
caab2c37ab
Added GLTF extension recognisation
2022-09-26 19:10:12 +08:00
Sri Sham Haran
de8c2ce630
Merge branch 'main' into SP3-4-editor_fix
2022-09-26 15:59:38 +08:00
Sri Sham Haran
2c16eb4393
Reflect transform component
2022-09-26 15:53:54 +08:00
Glence
5a92b77a3a
added missing ,
2022-09-26 15:52:21 +08:00
Glence
ac7ab83c16
Merge branch 'main' into SP3-129-AudioSystem
2022-09-26 15:51:59 +08:00
Glence
d0d796781b
remove audiosourcecomponent
2022-09-26 15:50:07 +08:00
Xiao Qi
1c45b49937
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-26 14:40:57 +08:00
Xiao Qi
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
Glence
65a6014b1c
Merge branch 'main' into SP3-129-AudioSystem
2022-09-26 14:08:43 +08:00
Sri Sham Haran
247930ea68
Merge branch 'main' into SP3-4-editor_fix
2022-09-26 14:04:02 +08:00
Brandon Mak
dc6289e8cf
WIP
2022-09-25 23:25:51 +08:00
Brandon Mak
8ac2c39e2b
Fixed some render graph ctors and added if checks for buffers
2022-09-25 23:13:37 +08:00
Kah Wei
fc5ff763f3
Added SHMaterialInstanceCache
2022-09-25 22:55:14 +08:00
Sri Sham Haran
335c19cfc7
Editor
2022-09-25 22:33:07 +08:00
mushgunAX
8ab5afd3c4
first version of IM ready for PR
2022-09-25 16:39:01 +08:00
Xiao Qi
a0a57e7c29
Added test assets
...
Test line to call asset manager temporary load
2022-09-25 00:13:17 +08:00
Xiao Qi
18eca1897e
Added in post build command to copy assimp dll
...
Added in SH_API to asset manager class
2022-09-24 22:52:42 +08:00
Glence
d7b5ae9f02
audiosystem base level done along with its components
2022-09-24 19:13:23 +08:00
Kah Wei
bb38246111
Added stress test code for 20000 objects
2022-09-23 18:49:04 +08:00
Kah Wei
f8391d6c9e
Modified TestScene space bar input to not destroy the object, only remove scripts
2022-09-23 16:45:06 +08:00
Kah Wei
77cccd63be
Renderables now use TransformComponent's matrix
2022-09-23 16:41:44 +08:00
Kah Wei
04cdb25ddd
Merge branch 'main' into SP3-1-Rendering
...
# Conflicts:
# SHADE_Application/src/Application/SBApplication.cpp
# SHADE_Application/src/Scenes/SBTestScene.cpp
2022-09-23 16:41:29 +08:00
Kah Wei
5c4384b589
Fixed SHVkBuffer initial copy data for mapped buffers and made the cube spin
2022-09-22 20:53:03 +08:00
Kah Wei
c4ab45ad34
Merge branch 'main' into SP3-1-Rendering
...
# Conflicts:
# SHADE_Application/src/Scenes/SBTestScene.cpp
# SHADE_Application/src/Scenes/SBTestScene.h
# SHADE_Engine/SHADE_Engine.vcxproj
# SHADE_Engine/SHADE_Engine.vcxproj.filters
2022-09-22 20:51:33 +08:00
Diren D Bharwani
6d646851e2
Added missing transpose to transform update and a test component to application
2022-09-22 20:39:46 +08:00
Diren D Bharwani
0250687e06
Instantiated Transform System & Update Routine
2022-09-22 20:25:23 +08:00
Brandon Mak
cb31628e66
Dummy pipeline layout ctor created
...
Renderer now can update and bind descriptor set
2022-09-22 19:38:43 +08:00
Kah Wei
1bede86ff6
Awake(), Start() and Update(), OnDestroy() for scripts now all run as intended
2022-09-22 17:25:43 +08:00
Kah Wei
21a3d6ecd7
Added test code for scripts
2022-09-22 11:22:51 +08:00
Kah Wei
c1b7c7ded8
Merge branch 'main' into SP3-6-c-scripting
...
# Conflicts:
# SHADE_Application/src/Application/SBApplication.cpp
# SHADE_Engine/src/Scene/SHSceneManager.h
2022-09-22 09:55:31 +08:00
Xiao Qi
124b367413
Fixed SHTransform compile error
...
Include header in math path wrong
Added proj and filter ignore into git (again)
2022-09-21 22:24:52 +08:00
XiaoQiDigipen
f52fa9463d
Merge pull request #39 from SHADE-DP/SP3-16-Math
2022-09-21 20:02:20 +08:00
Brandon Mak
270c8240c1
Shifted Graphics system to SBTestScene
2022-09-21 16:29:54 +08:00
Cocoa
34685e6726
Regenerated project files
2022-09-20 00:48:27 +08:00
Kah Wei
8ad0eee032
Fixed vertex data buffer being incorrect
2022-09-19 21:31:23 +08:00
Kah Wei
4023b9d136
Added tests for rendering and fixed bugs with Batching system
2022-09-19 18:37:57 +08:00
Cocoa
ec3470c443
Merge branch 'main' into SP3-16-Math
2022-09-19 17:08:16 +08:00
Kah Wei
a05ca41117
Fixed issue with SystemRoutines being created with the wrong version
2022-09-19 15:58:31 +08:00
Kah Wei
f408247007
Linked MeshLibrary to RenderGraph
2022-09-19 15:52:51 +08:00
Cocoa
f1e6031d2e
Added Transform, adjusted alignment in math files for better readability on smaller screens
2022-09-19 14:32:01 +08:00
Brandon Mak
643efbe1bb
WIP
2022-09-19 00:00:07 +08:00
Brandon Mak
28a5f8e4e5
Auto stash before merge of "SP3-1-Rendering" and "origin/SP3-1-Rendering"
2022-09-18 22:34:48 +08:00
Kah Wei
1c8a434b26
Added Batcher classes and fixed errors
2022-09-17 23:37:22 +08:00
Brandon Mak
bff27a7188
Added a bunch of KW's files for batching
...
Prepared Graphics system for merging with batcher
2022-09-17 22:29:22 +08:00
Brandon Mak
2f2567044a
Submitted command buffer :D
2022-09-16 17:28:27 +08:00
Kah Wei
c83a5a379e
Added Awake, Start, Update, LateUpdate, OnDestroy calls via SystemRoutines
2022-09-16 17:02:36 +08:00
Sri Sham Haran
eb8cbaeebb
init vulkan for imgui
2022-09-16 16:40:42 +08:00
Kah Wei
0f63ee10d0
Converted SHScriptEngine into a SHSystem
2022-09-16 16:37:50 +08:00
Sri Sham Haran
470e1f07f0
Merge branch 'main' into SP3-4-editor
2022-09-16 15:02:56 +08:00
Brandon Mak
c1c5e70676
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-16 14:46:48 +08:00
Brandon Mak
a42a8b0c46
SH_API EVERYWHERE
2022-09-16 14:20:21 +08:00
Brandon Mak
eb975d96c6
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-16 14:08:36 +08:00
Sri Sham Haran
6f67c1acc7
Base Editor (WIP, no vulkan)
2022-09-16 13:55:29 +08:00
Kah Wei
382d75528a
Removed and ignored VS project and solution files
2022-09-15 12:50:48 +08:00
Kah Wei
10c38a10a7
Merge branch 'DisableDllWarnings' into SP3-6-c-scripting
...
# Conflicts:
# Dependencies.bat
# SHADE_Application/SHADE_Application.vcxproj
# SHADE_Application/premake5.lua
# SHADE_Application/src/Application/SBApplication.cpp
# SHADE_Engine/SHADE_Engine.vcxproj
2022-09-15 11:43:03 +08:00
Kah Wei
67290c03e7
Updated vcxproj files
2022-09-15 11:34:04 +08:00
Kah Wei
c48a467e57
Disabled warnings for DLL export
2022-09-15 11:33:40 +08:00
Sri Sham Haran
20f4b59f41
Merge branch 'main' into SDLIntegration
2022-09-15 09:30:03 +08:00
Sri Sham Haran
bd69c6043a
SDL Updates
2022-09-15 09:26:43 +08:00