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
36b3872fb6
combo box for enumerations [WIP]
2022-09-27 21:05:49 +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
d6cff821dd
Merge branch 'main' into SP3-4-editor_fix
2022-09-27 19:48:08 +08:00
b7adf8815b
Fixed camera. Can see texture now
2022-09-27 19:18:45 +08:00
a57c4d0d73
WIP Script Inspector
2022-09-27 19:17:53 +08:00
cfd387e51c
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-09-27 19:07:27 +08:00
e58bb4f061
Changed predicate type for scene graph traverse to std::function
2022-09-27 17:15:43 +08:00
4effe016e4
Options to rebuild scripts at runtime are now present in the editor
2022-09-27 17:13:32 +08:00
14cd0b4be9
Fixed SHTextureLoader loading wrong mipmap offsets
2022-09-27 16:45:35 +08:00
337894ebc2
Merge branch 'main' into SP3-6-c-scripting
2022-09-27 16:39:02 +08:00
357b36a9b0
Added RigidBody Component
2022-09-27 16:24:08 +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
b3417c2011
Made SHGraphicsGlobalData static and modified SHBatch to generate and bind material descriptor set
2022-09-27 15:44:36 +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
76617ae571
Enabled Multi-Draw Indirect feature
2022-09-27 14:12:14 +08:00
5d022b7123
Fixed mipoffset
2022-09-27 14:12:05 +08:00
65c67c14b7
Fixed crash if no textures were loaded
2022-09-27 14:11:56 +08:00
3c3b6a285b
Merge branch 'main' into SP3-129-AudioSystem
2022-09-27 14:11:16 +08:00
ee7cb36896
added the banks for testing
2022-09-27 14:11:04 +08:00
60540b1adc
Temp function to retrieve all textures
2022-09-27 14:09:44 +08:00
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
e9496bead6
Fixed bug where different Renderables of different meshes are thrown into the same SubBatch
2022-09-27 13:43:59 +08:00
ce721b99e5
include SH_API.h
2022-09-27 13:37:52 +08:00
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
187329c384
Fixed texture issues
2022-09-27 12:02:06 +08:00
69041980f5
added the base for bank
2022-09-26 23:27:55 +08:00
eeaf86e968
Merge branch 'main' into SP3-129-AudioSystem
2022-09-26 23:21:01 +08:00
b375ab9a50
device wait idle
2022-09-26 23:14:10 +08:00
b5f7ff1106
Merge branch 'main' into SP3-6-c-scripting
2022-09-26 22:40:35 +08:00
3e2bcf28b6
Added texture loading that is almost working
2022-09-26 20:59:20 +08:00
1ea4689a89
SP3-237 Mesh write to binary file
2022-09-26 19:10:32 +08:00
caab2c37ab
Added GLTF extension recognisation
2022-09-26 19:10:12 +08:00
4dd2335fb8
Removed assimp post processing flag that was removing animations
2022-09-26 19:09:45 +08:00
240e5e9394
Merge branch 'main' into Editor_widgets
2022-09-26 18:55:31 +08:00
3d7876c987
added fix for closing editor windows
2022-09-26 18:33:37 +08:00
1f45b0ceca
added all the widgets helper
2022-09-26 18:09:21 +08:00
3b0ea251f3
mouse wheel delta poll
2022-09-26 18:08:59 +08:00
a06c30266e
Merge branch 'main' into SP3-1-Rendering
2022-09-26 17:56:30 +08:00
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
3800c01c4a
Added function in asset manager to retrieve all dds images
2022-09-26 17:48:27 +08:00
5ac90eebec
Fixed compilation errors
2022-09-26 17:26:33 +08:00
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
d938007d8a
Added TextureLibrary updating of descriptor sets
2022-09-26 17:18:51 +08:00
5e7ffd6028
Added SHVkSampler and SHVKSamplerCache
2022-09-26 16:41:57 +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
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
0a024e1b2d
Separated render graph contents into separate files
2022-09-26 14:49:48 +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
a6f7ffab43
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-26 09:48:48 +08:00
9fe5793dd7
Split the render graph into multiple files
...
doesn't compile
2022-09-26 09:37:59 +08:00
7cbb127937
Merge branch 'main' into SP3-6-c-scripting
2022-09-26 09:09:19 +08:00
8d32d76381
Merge pull request #52 from SHADE-DP/SP3-1-Rendering
...
Render graph fixes with attachment layouts
Render graph node was not moving batcher (this is now fixed)
2022-09-26 00:53:08 +08:00
6d68e6cb5e
FIXED MY SHIT WHEE
...
(render graph color present attachment now have correct layout)
2022-09-26 00:38:36 +08:00
a5c804ca8b
Fixed SHRenderGraph not moving the batcher
2022-09-26 00:08:32 +08:00
8649833604
subpass not null anymore
2022-09-25 23:45:05 +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
335c19cfc7
Editor
2022-09-25 22:33:07 +08:00
a197ae842c
Fixed crash on AMD GPUs resulting from Nvidia treating UniformBuffers and UniformBuffersDynamic as the same
2022-09-25 21:46:57 +08:00
4e60b3495a
Handles will now properly show up automatically dereferenced or NULL in Visual Studio's debug views
2022-09-25 20:28:01 +08:00
dd46881b67
Merge branch 'main' into SP3-1-Rendering
2022-09-25 18:57:14 +08:00
8ab5afd3c4
first version of IM ready for PR
2022-09-25 16:39:01 +08:00
ef36ae462e
Merge branch 'main' into SP3-10-input-management
2022-09-25 11:36:01 +08:00
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
d7b5ae9f02
audiosystem base level done along with its components
2022-09-24 19:13:23 +08:00
a39230ce42
More setting up for testing of gltf loading
2022-09-24 16:07:51 +08:00
78a20173e0
Changed AssetType underlying type
...
Added mesh name to mesh asset object
Added in static token for LoadGLTF function
Fixed warning in GetTypeFromExtension
2022-09-24 16:07:26 +08:00
a907c7c575
SP3-103 SP3-104 Testing set up for loading gltf and dds
2022-09-24 13:37:12 +08:00
a8a2e90c26
SP3-237 Added header data type into mesh asset in preparation for compilation of mesh
2022-09-24 13:36:43 +08:00
cb73a8c5d1
Added file list in filesystem
2022-09-24 13:36:09 +08:00
225c247a85
Added missing SDL line back into engine premake
2022-09-24 12:59:21 +08:00
cf4f905d91
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-24 12:40:31 +08:00
15f12a2608
Fixed warnings in SHBatch.cpp
2022-09-24 02:13:09 +08:00
759c87e2a1
Material data on the GPU is now updated when material data changes
2022-09-24 02:07:47 +08:00
c4105510b8
Merge branch 'main' into SP3-129-AudioSystem
2022-09-23 23:01:22 +08:00
187142d5c3
Added Transform Component C# interface
2022-09-23 19:57:29 +08:00
32278e1564
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-23 18:50:52 +08:00
bd54b16e01
Ctor for compute pipelines
2022-09-23 18:50:40 +08:00
bb38246111
Added stress test code for 20000 objects
2022-09-23 18:49:04 +08:00
3ed1034e62
Merge branch 'main' into SP3-10-input-management
2022-09-23 17:59:30 +08:00
800732706e
input pch move, init, exit, etc definitions
2022-09-23 17:42:31 +08:00
f8391d6c9e
Modified TestScene space bar input to not destroy the object, only remove scripts
2022-09-23 16:45:06 +08:00
77cccd63be
Renderables now use TransformComponent's matrix
2022-09-23 16:41:44 +08:00
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
23f0f9f77e
Triple buffered the batching buffers
2022-09-23 16:24:35 +08:00
c2e948a100
Fixed active state checks in transform system
...
Apparently entity and scene node active states do not sync....
2022-09-23 15:48:00 +08:00
ed56ad99df
Merge branch 'main' into SP3-10-input-management
2022-09-23 13:41:50 +08:00
a0c29c666f
progress on input manager, near ready for PR
2022-09-23 13:14:46 +08:00
f6bab2165c
Merge branch 'main' into SP3-129-AudioSystem
2022-09-23 09:59:52 +08:00
c77d9b2ff5
Changed editor pause for transform system to true
2022-09-22 22:58:14 +08:00
5c4384b589
Fixed SHVkBuffer initial copy data for mapped buffers and made the cube spin
2022-09-22 20:53:03 +08:00
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
6d646851e2
Added missing transpose to transform update and a test component to application
2022-09-22 20:39:46 +08:00
2c0fa3a6b2
Fixed warning from scene graph when adding new nodes to root.
2022-09-22 20:25:42 +08:00
0250687e06
Instantiated Transform System & Update Routine
2022-09-22 20:25:23 +08:00
495d2b4b66
Added per-frame update of gpu transforms buffer
2022-09-22 20:04:53 +08:00
cb31628e66
Dummy pipeline layout ctor created
...
Renderer now can update and bind descriptor set
2022-09-22 19:38:43 +08:00
3457759ed3
Merge pull request #44 from SHADE-DP/SP3-6-c-scripting
...
Script lifecycle functions now run and ScriptEngine has been made a ECS System
2022-09-22 17:39:40 +08:00
3a908b717b
Merge remote-tracking branch 'origin/SP3-6-c-scripting' into SP3-6-c-scripting
2022-09-22 17:08:11 +08:00
5bd35cec61
Fixed SHEventReceiver constructor callback return signature.
2022-09-22 17:07:59 +08:00
2051d485eb
Merge branch 'main' into SP3-6-c-scripting
2022-09-22 17:04:18 +08:00
3b533ac03d
Added faulty registration to entityDestroyed event
2022-09-22 16:40:49 +08:00
38dbd0c217
Removed static data member...again...
2022-09-22 15:49:00 +08:00
d648fc8645
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-09-22 15:42:09 +08:00
cda7330c5b
Removed static data member for transform update routine
2022-09-22 14:56:58 +08:00
2d93c9559d
Restructured Transform system to match intended system structure
2022-09-22 14:54:06 +08:00
ed143661b3
Scene node active states propagate down the hierarchy
...
Vulkan is throwing an exception...
2022-09-22 14:26:07 +08:00
8066c3cd6a
added audioSystem(the base not working yet)
...
added components to use the audioSystme
2022-09-22 14:05:53 +08:00
f28d966ebb
Merge branch 'SP3-1-Rendering' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-1-Rendering
2022-09-22 12:40:25 +08:00
e87c4c8dc8
Fixed SHTextureLibrary compiler errors
2022-09-22 12:39:05 +08:00
5bc24b09d4
Added generalisation of csproj file location
2022-09-22 12:32:15 +08:00
8cfe58a3ad
SP3-103 SP3-104 Implemented DDS loading and error reporting
...
Not tested
2022-09-22 12:29:30 +08:00
1290e99dda
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-22 12:12:47 +08:00
7ddf665460
Updated Descriptor sets
...
Descriptor set layouts now have set index stored in them
It should be noted that when passed into a pipeline layout as global descriptor sets, these don't matter since the pipeline layout will use these in the order that they are passed in.
2022-09-22 12:12:44 +08:00
a13e8f43fd
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-22 11:41:44 +08:00
6f1592e16f
SP3-103 SP3-102 Added call to mesh loader in asset manager. Removed old references to previous maps and vectors.
2022-09-22 11:40:24 +08:00
8ac6ef95d6
SP3-103 Implemented library to load GLTF with assimp and processmesh
2022-09-22 11:26:06 +08:00
b04789945f
Merge branch 'main' into SP3-6-c-scripting
2022-09-22 11:06:26 +08:00
af1d24d874
Fixed certain DLLs and includes missing when copying
2022-09-22 10:52:07 +08:00
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
ba181eb9c9
Shifted Command buffers outside of render graph
...
Command buffers now exist in renderer instead
Graphics system that calls the renderer, begins and ends the renderer recording in it's main loop as well
2022-09-22 09:23:40 +08:00
3d9abcf19c
Implemented image creation for textures in the texture bank
2022-09-22 09:19:18 +08:00
4446d0a60d
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-21 22:54:53 +08:00
d2e2e85726
Added build path ignore
...
Readded output dir and removed interdir from premake
Added DEBUG guards in SHVkPhysicalDeviceLibrary when using SHLOG_TRACE
2022-09-21 22:54:15 +08:00
ae3fb448d4
Merge branch 'main' into SP3-13-Assets-Manager
2022-09-21 22:28:31 +08:00
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
ba4d85a4e1
SP3-103 SP3-104 Implementing Mesh Loader for asset manager to use assimp to load gltf
...
Loading of dds from gltf file planned ahead
2022-09-21 22:20:52 +08:00
7acf25a770
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-21 20:09:48 +08:00
791c4cd0d0
Merge branch 'SP3-1-Rendering' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-1-Rendering
2022-09-21 20:03:03 +08:00
f52fa9463d
Merge pull request #39 from SHADE-DP/SP3-16-Math
2022-09-21 20:02:20 +08:00
67d673ff80
Merge pull request #38 from SHADE-DP/SP3-12-SceneGraph
2022-09-21 20:01:44 +08:00
14eed4c726
Added missing active check in transform system
2022-09-21 18:30:20 +08:00
ac379e3ef3
Added method to scene graph to easily traverse and execute a unary function
2022-09-21 18:23:01 +08:00
270c8240c1
Shifted Graphics system to SBTestScene
2022-09-21 16:29:54 +08:00
80dc8d0a71
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-21 15:41:36 +08:00
8d2b6aec46
Descriptor set fix and camera descriptor set
...
Fixed SHVkDescriptorSetGroup bug with vkLayouts inside the ctor
Added descriptor set to renderer for camera
Logical Device now stores a buffer alignment variable for UBOs
2022-09-21 15:41:30 +08:00
415e47780c
Completed Transform System
2022-09-21 14:54:57 +08:00
0db7392eed
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-09-21 14:06:36 +08:00
9c69d41a4e
Added 90% of transform component & transform system.
2022-09-21 00:49:52 +08:00
3cd538562c
More Scene Graph Fixes
2022-09-20 19:32:28 +08:00
Kah Wei