mushgunAX
857f88c4a8
Merge branch 'main' into SP3-10-input-management
2022-10-01 17:03:58 +08:00
Diren D Bharwani
374f1a961d
Integrated rigidbodies into physics system
2022-10-01 16:50:50 +08:00
Brandon Mak
b657ad8884
Handled resizing for the render graph resource (not tested)
2022-10-01 16:33:16 +08:00
Diren D Bharwani
4f56a32a9b
Added physics system (untested)
2022-10-01 15:26:08 +08:00
Glence
0c78eca1bc
added audiosystem back in
...
added a button for the audio
2022-10-01 15:09:26 +08:00
Kah Wei
b3b565454f
Merge branch 'main' into SP3-6-c-scripting
2022-10-01 14:50:46 +08:00
mushgunAX
0360a8bfa1
made the Input Manager NOT be a System anymore
2022-10-01 14:34:30 +08:00
mushgunAX
dc8d58d95c
fix GetMouseWindowPosition()
2022-10-01 13:49:11 +08:00
Kah Wei
af24ed78dc
Fixed MSIL warning when building scripts
2022-10-01 13:43:34 +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
Xiao Qi
8a3d3c8d4e
SP3-237 SP3-103 SP3-104 Implemented SHTexture and SHMesh binary file writing and loading. NOT TESTED
...
Added file level comments
2022-09-30 22:08:17 +08:00
maverickdgg
e4be5e0987
Added event manager include
2022-09-30 20:34:46 +08:00
maverickdgg
2d07fb0afc
Added component added and removed events
2022-09-30 20:25:26 +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
Xiao Qi
a51cbb7e70
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-29 10:55:49 +08:00
maverickdgg
b1a799cf05
Attempt using dllimport/dllexport
2022-09-29 07:59:04 +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
Diren D Bharwani
561f2b091f
Added PhysicsObject to handle interface between components and physics system
2022-09-28 21:09:27 +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
Sri Sham Haran
371f8e5e6f
Add simple profiler
2022-09-28 19:45:40 +08:00
Sri Sham Haran
10f5817c15
Merge branch 'main' into SP3-4-editor_fix
2022-09-28 19:01:18 +08:00
Glence
a96ef67ec4
change engine premake to copy fmod lib over
2022-09-28 18:53:53 +08:00
Sri Sham Haran
a1775db60b
Merge branch 'main' into SP3-4-editor_fix
2022-09-28 18:36:44 +08:00
Sri Sham Haran
02ec5d88e8
Add remaining controls to component view
2022-09-28 18:36:22 +08:00
Xiao Qi
219aaa1707
Split texture loader into 2 paths for dds and shtexture format.
...
SHTexture binary load half done
2022-09-28 18:35:59 +08:00
Xiao Qi
201b19e8a6
SP3-237
...
Renamed MeshWriter to MeshCompiler
Implemented texture compiler
2022-09-28 18:35:22 +08:00
Glence
e71941cccf
removing not needed buttons
2022-09-28 18:12:01 +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
Glence
bed6a144f8
banks curr working
2022-09-28 17:25:14 +08:00
Xiao Qi
6ef30bc415
post processing copy for publish build
2022-09-28 17:22:22 +08:00
XiaoQiDigipen
2ce927d471
Merge pull request #60 from SHADE-DP/SP3-16-Math
...
SP3-16 Fixed vector subscript operator return type
BUGFIX
SHVec2, 3 & 4 (non-const) subscript operators now return a reference to the element
2022-09-28 17:09:58 +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
170ae5ac6b
Fixed vector subscript operators return types
2022-09-28 17:06:37 +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
Kah Wei
3730c2125f
Modified script inspectors to use the vector widgets from SHEditorWidgets. SHEditorWidget is now a static class.
2022-09-28 15:28:59 +08:00
Diren D Bharwani
658054bc14
Merge branch 'SP3-12-SceneGraph' into SP3-2-Physics
2022-09-28 15:26:07 +08:00
Kah Wei
d9582cd0bd
Fixed first instance in MDI call being wrong
2022-09-28 14:47:50 +08:00
Brandon Mak
a23f4f5218
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-28 10:28:19 +08:00
Brandon Mak
d9cdf26098
Changed depth buffer format
2022-09-28 10:28:12 +08:00
Kah Wei
7010e1b688
Added initial implementation of script inspector
2022-09-28 00:06:47 +08:00
Glence
7fcac5e0eb
god knows whats diff but audio is sort of working ish
2022-09-27 23:57:11 +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
Sri Sham Haran
36b3872fb6
combo box for enumerations [WIP]
2022-09-27 21:05:49 +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
Sri Sham Haran
d6cff821dd
Merge branch 'main' into SP3-4-editor_fix
2022-09-27 19:48:08 +08:00
Brandon Mak
b7adf8815b
Fixed camera. Can see texture now
2022-09-27 19:18:45 +08:00
Kah Wei
a57c4d0d73
WIP Script Inspector
2022-09-27 19:17:53 +08:00
Diren D Bharwani
cfd387e51c
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-09-27 19:07:27 +08:00
Diren D Bharwani
e58bb4f061
Changed predicate type for scene graph traverse to std::function
2022-09-27 17:15:43 +08:00
Kah Wei
4effe016e4
Options to rebuild scripts at runtime are now present in the editor
2022-09-27 17:13:32 +08:00
Kah Wei
14cd0b4be9
Fixed SHTextureLoader loading wrong mipmap offsets
2022-09-27 16:45:35 +08:00
Kah Wei
337894ebc2
Merge branch 'main' into SP3-6-c-scripting
2022-09-27 16:39:02 +08:00
Diren D Bharwani
357b36a9b0
Added RigidBody Component
2022-09-27 16:24:08 +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
Kah Wei
b3417c2011
Made SHGraphicsGlobalData static and modified SHBatch to generate and bind material descriptor set
2022-09-27 15:44:36 +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
Kah Wei
76617ae571
Enabled Multi-Draw Indirect feature
2022-09-27 14:12:14 +08:00
Xiao Qi
5d022b7123
Fixed mipoffset
2022-09-27 14:12:05 +08:00
Kah Wei
65c67c14b7
Fixed crash if no textures were loaded
2022-09-27 14:11:56 +08:00
Glence
3c3b6a285b
Merge branch 'main' into SP3-129-AudioSystem
2022-09-27 14:11:16 +08:00
Glence
ee7cb36896
added the banks for testing
2022-09-27 14:11:04 +08:00
Xiao Qi
60540b1adc
Temp function to retrieve all textures
2022-09-27 14:09:44 +08:00
Xiao Qi
a7badba8b9
Copied over function from Texture Library to Texture loader to convert dds format to vk format
2022-09-27 13:58:19 +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
mushgunAX
ce721b99e5
include SH_API.h
2022-09-27 13:37:52 +08:00
Xiao Qi
7487602151
SP3-104
...
Renamed DDS to Texture in most places
Prepared SHTextureAsset for ease of load into buffer and compilation
Added Copy constructor for SHTextureAsset
2022-09-27 13:02:12 +08:00
Brandon Mak
187329c384
Fixed texture issues
2022-09-27 12:02:06 +08:00
Glence
69041980f5
added the base for bank
2022-09-26 23:27:55 +08:00
Glence
eeaf86e968
Merge branch 'main' into SP3-129-AudioSystem
2022-09-26 23:21:01 +08:00
Sri Sham Haran
b375ab9a50
device wait idle
2022-09-26 23:14:10 +08:00
Kah Wei
b5f7ff1106
Merge branch 'main' into SP3-6-c-scripting
2022-09-26 22:40:35 +08:00
Kah Wei
3e2bcf28b6
Added texture loading that is almost working
2022-09-26 20:59:20 +08:00
Xiao Qi
1ea4689a89
SP3-237 Mesh write to binary file
2022-09-26 19:10:32 +08:00
Xiao Qi
caab2c37ab
Added GLTF extension recognisation
2022-09-26 19:10:12 +08:00
Xiao Qi
4dd2335fb8
Removed assimp post processing flag that was removing animations
2022-09-26 19:09:45 +08:00
Glence
240e5e9394
Merge branch 'main' into Editor_widgets
2022-09-26 18:55:31 +08:00
Glence
3d7876c987
added fix for closing editor windows
2022-09-26 18:33:37 +08:00
Glence
1f45b0ceca
added all the widgets helper
2022-09-26 18:09:21 +08:00
mushgunAX
3b0ea251f3
mouse wheel delta poll
2022-09-26 18:08:59 +08:00
Kah Wei
a06c30266e
Merge branch 'main' into SP3-1-Rendering
2022-09-26 17:56:30 +08:00
XiaoQiDigipen
728d615425
Merge pull request #55 from SHADE-DP/SP3-13-Assets-Manager
...
SP3-13 Assets Management
Added function in asset manager to retrieve all dds images
2022-09-26 17:49:06 +08:00
Xiao Qi
3800c01c4a
Added function in asset manager to retrieve all dds images
2022-09-26 17:48:27 +08:00
Kah Wei
5ac90eebec
Fixed compilation errors
2022-09-26 17:26:33 +08:00
Kah Wei
927944d55a
Merge branch 'SP3-1-Rendering' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-1-Rendering
2022-09-26 17:18:55 +08:00
Kah Wei
d938007d8a
Added TextureLibrary updating of descriptor sets
2022-09-26 17:18:51 +08:00
Kah Wei
5e7ffd6028
Added SHVkSampler and SHVKSamplerCache
2022-09-26 16:41:57 +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