3b55888fa1
Added conversions to and from wxyz quaternion representations
2022-12-16 23:19:44 +08:00
51479d2bd0
Fixed bug where meshes added to the mesh library will not have correct corresponding "null" vertex bone weights and indices
2022-12-16 21:43:33 +08:00
24b13ed6e4
Refactored colliders to use parent-child transform logic
2022-12-16 18:34:53 +08:00
a6e1064e64
Fixed bug where collider offsets were not recomputed
2022-12-16 15:03:55 +08:00
2bd90e7c14
Adjusted physics debug draw to fit new debug draw interface
2022-12-16 14:38:46 +08:00
1b91f60c4a
Fixed warning with wrongly declared friends
2022-12-16 14:38:22 +08:00
ddf2d8bde9
Fixed warnings for subscript operator in vectors and removed react conversions
2022-12-16 14:38:01 +08:00
af39662748
Merge remote-tracking branch 'origin/main' into PhySH
2022-12-16 14:04:58 +08:00
12a46c4266
Merge branch 'main' into SP3-17-animation-system
...
# Conflicts:
# SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHDebugDrawSystem.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.h
2022-12-16 12:59:11 +08:00
6b8232ae91
Fixed bug where intertia tensors were not reset when unlocking axes
2022-12-16 02:02:20 +08:00
0a3ff527d9
SHDebugDraw drawing functions now have the colour parameter defaulted to white
2022-12-16 00:05:03 +08:00
8978515cb9
Reworked SHDebugDraw to fit new interface of SHDebugDrawSystem
2022-12-15 23:25:49 +08:00
27c7a17397
Fixed computation of global inverse inertia tensor
2022-12-15 22:59:55 +08:00
eb06eebc32
Added ability to debug draw circles
2022-12-15 20:30:20 +08:00
78575b11e4
Added debug draw of wire spheres, filled cube and filled sphere
2022-12-15 18:08:12 +08:00
b6ab7b44d9
Renamed DrawWireBox to DrawWireCube
2022-12-15 02:19:30 +08:00
53edffebac
Added (untested) rotational motion to rigidbodies
...
Also added a temporary solution for debug drawing rotated spheres
2022-12-15 02:08:25 +08:00
9ef005346b
Merge branch 'main' into SP3-1-DebugDraw
2022-12-15 01:46:26 +08:00
98ff16d00c
Added deebug drawing of cubes of any transform
2022-12-15 01:45:44 +08:00
3041761e96
Merge branch 'main' into SP3-10-input-management
2022-12-14 16:13:27 +08:00
06cc969658
Reworked DebugDraw system (only lines now)
2022-12-14 01:20:12 +08:00
af3a5e7dc9
Re-implemented Collider Debug Drawing
2022-12-13 03:54:37 +08:00
775dcd5337
Merge branch 'main' into SP3-10-input-management
2022-12-12 20:11:51 +08:00
7820d332b1
Changed managed code's GameObject to synce with the node's active state
2022-12-12 17:58:15 +08:00
9b17c62b1d
Added active in hierarchy property to scene nodes
2022-12-12 17:07:18 +08:00
82765648c4
fix colliderpanel
2022-12-12 11:49:52 +08:00
a820d19670
Merge branch 'main' into SP3-4-Editor
2022-12-12 10:39:07 +08:00
0cebedeee0
Fixed compile errors with merged scene init and exit events
2022-12-11 20:44:40 +08:00
60409b47cb
Merge remote-tracking branch 'origin/main' into PhySH
2022-12-11 20:44:25 +08:00
bf8a410fa2
Fixed bug where colliders were not properly deserialised
2022-12-11 20:33:30 +08:00
c1d7702914
Moved debug draw state to colliders. Synced collider positions with rigid bodies
2022-12-11 20:12:26 +08:00
74e50e10bd
Refactored the colliders?
...
This took me 4 days omg
2022-12-09 01:15:43 +08:00
4f1007e6be
Added scene init exit events
2022-12-06 13:09:47 +08:00
9eddcc8460
Merge branch 'main' into SP3-12-SceneGraph
2022-12-06 12:54:43 +08:00
9a5dc52d77
Minor fixes to input manager
...
- Pass binding names into functions by const reference instead of by value
- Fixed oversight of not being able to modify or read mouse Y positive multiplier for a binding
2022-12-05 23:25:43 +08:00
38b1c46d1f
Added physics world and tested applied gravity for linear movement
2022-12-05 00:20:29 +08:00
36ceec5855
Added SceneInit & SceneExit events
2022-12-05 00:19:48 +08:00
ca45a12186
Restructured Physics Systems & Interfaces
2022-12-04 17:31:22 +08:00
6cd203179a
Added Rigid Body
2022-12-02 19:01:08 +08:00
52dc993941
goodbye react
2022-12-02 17:44:44 +08:00
c84e33731b
Fixed crash which occurs when changing the material of an object twice in a row
2022-11-25 22:24:30 +08:00
413156dabb
Merge branch 'main' into PlayerController
2022-11-25 15:45:35 +08:00
1cfd3cfd3a
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-25 14:06:28 +08:00
afd2abf036
Fixed pre & post physics transforms update routines
2022-11-25 14:06:20 +08:00
43a5cb4deb
Reverted world extents computation
2022-11-25 14:05:43 +08:00
9daaade56a
Merge branch 'main' into PlayerController
2022-11-25 13:22:51 +08:00
300647afa6
Stopped camera from running when editor is in pause
2022-11-25 12:24:13 +08:00
f3e7f1747a
Merge branch 'main' into SP3-141-Camera-System
2022-11-25 10:06:11 +08:00
428f8f29c6
Camera collision. WIP
2022-11-25 10:06:02 +08:00
c07fa3c5ae
remove the clamp from the phsysicSystem routines
...
added cheats for maingame
added raycast for pick throw
2022-11-25 00:54:45 +08:00
7c58c9a23d
Fixed crash caused when building scripts in debug mode when a debugger is attached
2022-11-24 23:20:37 +08:00
6525a39df2
Added collision tags for raycasting. Does not apply to collider raycasting
2022-11-24 15:11:07 +08:00
3775df23a4
Debug draw is disabled on publish builds.
2022-11-24 14:43:41 +08:00
a9bacc9e48
Fixed incorrect storing of world extents
2022-11-24 14:42:34 +08:00
f6c74ad3d2
Fixed recurring bug with collision listener
2022-11-24 14:41:52 +08:00
74a85180ac
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-24 12:02:34 +08:00
7d7d40ba8e
Debug draw is always enabled.
2022-11-24 12:02:08 +08:00
d09fefe9b4
Merge pull request #271 from SHADE-DP/SP3-2-Physics
...
Fixed Physics Bugs
2022-11-24 02:10:54 +08:00
b7b3301158
Added isDirty copy in move ctor for SHBatch
2022-11-24 02:01:41 +08:00
33ac1a868a
Fixed wrongly returning fixed DT in managed code & collision listener bug
2022-11-24 01:46:29 +08:00
ca60b64a89
Merge branch 'main' into PlayerController
2022-11-23 20:39:47 +08:00
57df4e2905
Fixed awake() and start() getting called before all objects are loaded when changing scenes
2022-11-23 20:36:28 +08:00
af93e59d0e
added text to maingame
2022-11-23 20:26:53 +08:00
6261661ef6
Added potential fix for Vulkan buffer creation crashes from SHBatch
2022-11-23 19:30:51 +08:00
49b475442f
Added a targetOffset for camera arm
2022-11-23 18:27:54 +08:00
22972d7455
updated the music banks
...
update a tem fix for physicsSystem
2022-11-23 17:37:06 +08:00
20a1fdc16e
Fixed Application::Close() not closing but instead minimizing the window
2022-11-23 17:03:57 +08:00
9bdaea10f5
Fixed...another..bug...:(
2022-11-23 16:56:25 +08:00
4865a49bfa
Fixed bug where rigidbody setters in the first frame causes a crash
2022-11-23 15:32:14 +08:00
5af5d4ef96
Merge pull request #260 from SHADE-DP/SP3-16-Math
...
Added Forward & LookAt to C# Transforms
2022-11-23 15:07:23 +08:00
7202551838
Added Vector rotation with Quaternions
2022-11-23 14:56:20 +08:00
87936f1e31
Merge pull request #259 from SHADE-DP/SP3-2-Physics
...
Fixed fatal bug where rigidbody masses was incorrectly computed when editor is enabled
2022-11-23 13:50:22 +08:00
6161d81c4a
Merge pull request #256 from SHADE-DP/Fix-NoGPUClarity
...
Added explicit error check for when no supported GPUs are available to use
2022-11-23 13:48:37 +08:00
db69cfb567
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-23 13:30:40 +08:00
1402139369
Fixed bug where colliders were not properly added with editor enabled
2022-11-23 13:30:28 +08:00
0edd2f24e3
Added VS and FS shaders to tile singular textures
...
Added shader stage flag bit for vertex shaders
2022-11-23 13:02:33 +08:00
1a26b0ac70
When no GPU is detected, a proper exception describing it is now thrown instead of failing silently
2022-11-23 09:57:55 +08:00
2523613732
Fixed fatal bug that prevent scene changing while the editor is enabled
2022-11-23 01:01:29 +08:00
fa83e2bc4c
Modified Shape.Raycast functions to return RaycastResult
2022-11-23 01:01:12 +08:00
4277ba10d7
Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph
2022-11-22 22:11:42 +08:00
cc2587a7bd
Added recognition for material and prefab types when generating meta files
2022-11-22 21:54:51 +08:00
bcd8b37fd7
Merge branch 'main' into SP3-13-Assets-Manager
2022-11-22 21:53:46 +08:00
82b92d45cf
Merge remote-tracking branch 'origin/main' into SP3-12-SceneGraph
2022-11-22 21:31:45 +08:00
807ad54d7d
Fixed Scene Node SetActive & SceneGraph CheckActiveInHierarchy
2022-11-22 21:31:37 +08:00
f119acdb65
collider tag panel
2022-11-22 21:15:18 +08:00
44733308f1
Merge branch 'main' into SP3-20-UI-System
2022-11-22 21:04:03 +08:00
7c36886669
Fix for Canvas scaler
2022-11-22 21:03:53 +08:00
cecd8ab717
Merge pull request #251 from SHADE-DP/SP3-2-Physics
...
Fixed Rigidbodies not sleeping
2022-11-22 20:58:11 +08:00
142f025692
Added check for editor camera.
2022-11-22 20:54:16 +08:00
72d70e4747
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-22 20:46:37 +08:00
62c4b3837d
Fixed bug where transform dirty flags were not being properly cleared.
...
This was preventing bodies from going to sleep and transforms always updating.
2022-11-22 20:46:31 +08:00
a57145b510
Merge branch 'main' into SP3-20-UI-System
2022-11-22 20:39:39 +08:00
a612e71f0c
Added Buttons, Added Canvas Scaling matrix, Added Serialization of buttons and camera arm
2022-11-22 20:39:15 +08:00
720ccb6eab
Merge pull request #249 from SHADE-DP/SP3-2-Physics
...
Fixed various physics bugs and added Physics Material to Inspector
2022-11-22 20:14:31 +08:00
57a0bbdb8c
Added entity count at the bottom bar of editor
...
Changed colour of bottom bar
2022-11-22 20:14:21 +08:00
dab51ee4cf
Readded testing function in physics routines for future use
2022-11-22 20:00:58 +08:00
053c3e04fd
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-22 19:26:47 +08:00
c18d58cba3
Fixed various physics bugs
...
Fixed bug where world was prebuilt and entity IDs were wrongly synced
Fixed collider properties not being synced in the first frame during mass property computations
Fixed static objects being wrongly updated post world update
2022-11-22 19:26:17 +08:00
9964d5dfce
Fixed missing comments for SHEditorUI
2022-11-22 18:17:24 +08:00
1bd19b90a8
Merge branch 'main' into SP3-6-c-scripting
2022-11-22 18:11:17 +08:00
4478b6db62
Added editor support for FontAsset, MeshAsset and MaterialAsset.
2022-11-22 17:48:01 +08:00
7d692061fb
Reworked how Materials are handled on C#
2022-11-22 17:23:50 +08:00
719d29dec3
Renamed Mesh and Font structs in Managed to MeshAsset and FontAsset and reworked them to be a abstraction for asset IDs
2022-11-22 16:51:07 +08:00
71e8ba6044
doing up the main menu
2022-11-22 16:18:16 +08:00
a78b3c0123
Reworked NativeAsset system
2022-11-22 15:52:55 +08:00
681e7f3506
Added invalid Asset ID Macro
2022-11-22 14:26:10 +08:00
5d04149797
buttons WIP
2022-11-22 14:02:45 +08:00
3b6d1c815d
Merge branch 'main' into SP3-17-animation-system
2022-11-22 13:55:17 +08:00
5024956c04
Merge branch 'main' into SP3-13-Assets-Manager
2022-11-22 13:54:40 +08:00
cf10724f3a
Update SHSerialization.cpp
2022-11-22 13:17:45 +08:00
3e4ebaab7b
Merge branch 'main' into SP3-20-UI-System
2022-11-22 13:16:04 +08:00
080c2c70d5
Added canvas to serialization
2022-11-22 13:09:40 +08:00
437cb075d3
Merge pull request #242 from SHADE-DP/SP3-141-Camera-System
...
FIxed major crashes caused by main camera retrieval and entity destroy
2022-11-22 12:55:17 +08:00
858e200fb3
Bug fixes
2022-11-22 11:32:19 +08:00
cf0b94e97d
Merge branch 'main' into SP3-1-Rendering
2022-11-22 10:50:04 +08:00
dfe86ce7db
Fixed resizing bug
2022-11-22 10:43:59 +08:00
4377972315
Added functionality for graphics system to render to swapchain image
...
- Added functionality for graphics system to render to swapchain image when SHEDITOR is disabled. This is done via rendering a simple quad on screen and using an input attachment as a texture to the shader.
2022-11-22 10:10:26 +08:00
964b375ccd
Write to swapchain image without SHEDITOR defined WIP
2022-11-22 09:05:56 +08:00
23bae3d515
Fixed bug with Bounciness failing to serialise
2022-11-22 00:46:32 +08:00
f1ac689bb0
Added Physics Materials to Inspector
2022-11-22 00:37:09 +08:00
af2ad6cc80
Merge branch 'main' into SP3-6-c-scripting
2022-11-21 20:59:08 +08:00
4172362790
Renamed SHTextRenderer to SHTextRenderable
2022-11-21 20:35:31 +08:00
cd6edeeee4
Merge branch 'main' into SP3-1-Rendering
2022-11-21 20:29:10 +08:00
6d8fba8e05
Merge pull request #238 from SHADE-DP/Fix-BatchPersistence
...
Fixed ghosts of a renderable being rendered when a material is changed
2022-11-21 20:27:48 +08:00
1ed0181c9e
Reverted premake changes
2022-11-21 20:27:38 +08:00
81043a5927
Merge pull request #237 from SHADE-DP/SP3-2-Physics
...
Added more debug drawing & Fixed Physics running without SHEDITOR
2022-11-21 20:24:05 +08:00
9cc008eaf4
Fixed ghosts of a renderable being rendered when a material is changed
2022-11-21 20:21:08 +08:00
3baedd8ffa
Merge branch 'main' into SP3-2-Physics
2022-11-21 20:15:58 +08:00
1d692d3301
Physics works without SHEDITOR defines. Mass is temporarily auto computed.
2022-11-21 19:59:32 +08:00
1a20eeed96
Added system routine stub for the SHAnimationSystem
2022-11-21 19:46:53 +08:00
e3c573baa7
Added support for enabling and disabling scripts
...
OnEnable and OnDisable are not called on GameObject active toggling for now but will be added in future
2022-11-21 17:16:16 +08:00
611744f5d4
Fleshed out SHAnimationComponent more and added preliminary implementation of SHBatch for bone data
2022-11-21 15:09:15 +08:00
1ff8c9715d
Merge branch 'main' into SP3-17-animation-system
2022-11-21 12:15:57 +08:00
0a9dea1c83
Disabled xmldoc generation warnings for SHADE projects
2022-11-21 12:14:07 +08:00
485b60c6d8
Added debug check in SHGraphicsSystem to compile assets only in debug
2022-11-21 00:39:13 +08:00
1666a0113b
Removed test lines for shader compile in graphics system
2022-11-21 00:29:46 +08:00
2a6db58cd9
Added SHRig and stubs for SHAnimatorComponent and SHAnimationSystem
2022-11-21 00:22:46 +08:00
e10c1f518f
Merge pull request #234 from SHADE-DP/SP3-1-Rendering
...
Implemented serialization and editor inspector display for text renderer component
2022-11-20 22:41:06 +08:00
5d3603ac7d
Text Renderer Component serialization
2022-11-20 22:24:24 +08:00
d4ad60ea79
Fix compile error with collision tags
2022-11-20 20:12:20 +08:00
c686954c77
Implemented Text Rendering
...
- The Text Renderer Component serialization and reflection onto inspector is not in yet, but there is basic functionality.
- Updated shaders
- Topology for text rendering is changed to triangle fan. Front facing for primitives is clockwise. Vertex state has both the positionOffset and glyphIndex attribute set as instanced.
- Freetype instance is now initialized in InitBoilerplate
- SHCamera no longer calling SetPerspective/Ortho inside HandleResize
- Font Geometry is now loaded in SHFontLoader into SHFontAsset fontGeometry variable.
2022-11-20 19:03:12 +08:00
cada3acb8a
Collision tags should be referenced by pointers
2022-11-20 18:30:18 +08:00
5871f32547
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-20 17:23:38 +08:00
4ebc16564a
Added collision matrix for configurating individual collision tags
2022-11-20 17:23:28 +08:00
788ba22e0a
Merge pull request #232 from SHADE-DP/UI_Integration
...
Added UI functionality to the Graphics System
2022-11-20 15:43:34 +08:00
a355d9911a
Merge pull request #231 from SHADE-DP/SP3-4-Editor
...
Fix not being able to disable/enable Rigidbody freeze rotation through editor inspector panel
2022-11-20 15:36:02 +08:00
4198310b7a
Missing implementation for updating all tag names through the physics system
2022-11-20 15:34:34 +08:00
a0f4f3b00a
Added collision tag names file
2022-11-20 15:32:33 +08:00
2b41394a74
Fix not being able to disable/enable Rigidbody freeze rotation through editor inspector panel
2022-11-20 15:30:14 +08:00
7226ccf279
Tested Collision Tags
2022-11-20 03:16:49 +08:00
b8530dfc89
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-20 02:35:12 +08:00
62433d1a53
Added Collision Tags
2022-11-20 02:35:02 +08:00
575132c4bb
Added UI Component check in SHBatch
...
- UI Component shader changes
- Fixed picking issue
2022-11-20 01:45:14 +08:00
841948b82c
Added support for Bone Weights and Bone Indices vertex attributes for meshes
2022-11-20 01:33:55 +08:00
b323735ba8
Merge remote-tracking branch 'origin/SP3-1-VertexSwitch' into UI_Integration
2022-11-19 23:27:06 +08:00
a988c45d52
Vertex shader can now be modified in the material inspector
2022-11-19 23:22:54 +08:00
d55adcdfe4
Merge remote-tracking branch 'origin/main' into UI_Integration
2022-11-19 22:08:16 +08:00
6d1f30e05b
Merge branch 'SP3-1-Rendering' into UI_Integration
2022-11-19 21:45:21 +08:00
223276dd87
Created partial functionality to render a texture to swapchain image
2022-11-19 21:44:41 +08:00
6fa14aff85
Fixed sizeof bug when reading old model header
2022-11-19 21:27:30 +08:00
c4be9b1cba
Initial commit, change of data structs containing data for model and animation assets.
...
Changed all other references to previous mode and mesh asset names
2022-11-19 21:16:24 +08:00
5fb51511f6
Merge branch 'main' into SP3-13-Assets-Manager
2022-11-19 19:59:24 +08:00
92b1c6676b
Merge branch 'main' into Fix-BatchCrash
2022-11-19 18:26:37 +08:00
b2dc440d03
Fixed bug where moving objects stopped moving after chanigng their material's shader
2022-11-19 18:26:11 +08:00
58e6a3c4c2
Re-aded ability to change shaders
...
Bugged, replacing shaders results in object being rendered in the old position
2022-11-19 17:30:48 +08:00
bd3b643c19
Merge pull request #228 from SHADE-DP/Fix-BatchCrash
...
Fixed crash caused when loading more than one graphics pipeline
2022-11-19 16:26:37 +08:00
51d663ab14
Merge pull request #226 from SHADE-DP/SP3-2-Physics
...
Added in Raycasting through Physics
2022-11-19 16:24:50 +08:00
f3a44d2ead
Fixed crash caused when loading more than one graphics pipeline
2022-11-19 16:11:07 +08:00
6ad05d306f
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-19 04:21:58 +08:00
411c4a4e56
Added C# Interface for Raycasting
...
Untested with Scripts, tested engine side.
2022-11-19 04:21:46 +08:00
798803cf81
UI WIP
2022-11-18 22:03:21 +08:00
27413c380e
Renderables now no longer render if disabled
2022-11-18 21:59:18 +08:00
5ec8475842
Merge branch 'main' into SP3-1-RenderOnlyActive
2022-11-18 21:34:28 +08:00
a4e5a1c269
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-18 18:31:38 +08:00
6b5b0387a9
Fixed bug where pausing then playing crashes physics
2022-11-18 18:31:07 +08:00
b328d1df82
Added Physics Raycasts with Debug Drawing
...
Press F11 while the scene is playing to toggle debug drawing of rays.
2022-11-18 18:15:19 +08:00
a77740db51
Merge branch 'main' into PlayerController
2022-11-18 17:16:04 +08:00
0551b1fb8a
added the new banks
...
added onplay/onpause/onstop for audiosytem
2022-11-18 17:04:06 +08:00
09249cf9e8
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-18 16:48:09 +08:00
a181d7b896
Added Canvas and UI to editor
2022-11-18 16:37:33 +08:00
03ce142137
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-18 16:37:06 +08:00
66f33554a3
Tested adding text component to entities
2022-11-18 16:35:49 +08:00
36a1a1c696
Merge branch 'main' into SP3-20-UI-System
2022-11-18 12:24:24 +08:00
0b5ec34b00
Merge branch 'main' into SP3-141-Camera-System
2022-11-18 09:38:52 +08:00
9ac1c01008
Merge branch 'main' into SP3-20-UI-System
2022-11-18 09:38:42 +08:00
d997cd4da6
Added canvas ID to UI Component
2022-11-18 09:38:31 +08:00
c493432f3f
Merge pull request #219 from SHADE-DP/SP3-6-c-scripting
...
Scripts are now always built on engine launch
2022-11-17 17:38:17 +08:00
e8bd33ec9e
Scripts are now always built on engine launch
2022-11-17 17:36:35 +08:00
379c44086d
Merge pull request #218 from SHADE-DP/SP3-6-c-scripting
...
Fixed edge cases for serialization and deserialization of scripts
2022-11-17 17:17:12 +08:00
e31f868257
Merge pull request #217 from SHADE-DP/SP3-2-Physics
...
Fixed various Physics bugs
2022-11-17 17:13:01 +08:00
6efbea54e1
Fixed issue where scripts of Entities destroyed during scene unloading are not properly disposed
2022-11-17 15:43:35 +08:00
920e977232
Merge branch 'main' into SP3-4-Editor
2022-11-17 13:34:34 +08:00
e170a5fca8
Added controls to editor viewport menu bar to adjust movement speed and turn speed for editor camera
2022-11-17 13:33:22 +08:00
b3fbfce56f
FIxed debug draw for offset colliders
2022-11-17 12:58:01 +08:00
360c55fa2b
Disabled automass on rigid bodies
2022-11-17 12:27:00 +08:00
18218443ec
Fixed a bug
2022-11-17 12:20:28 +08:00
c967f9355f
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-17 10:42:53 +08:00
7288894507
Fixed bug where adding colliders would fail to maintain previous collider sizes
2022-11-17 10:42:45 +08:00
ad30f150d1
UI component and UI System prep
2022-11-17 07:12:38 +08:00
0bb97413ef
Added Canvas and UI Components
2022-11-17 05:39:55 +08:00
7d71390d43
separated ortho and proj matrix in camera comp
2022-11-17 05:29:11 +08:00
6b80a4baa9
Merge branch 'main' into SP3-141-Camera-System
2022-11-17 04:56:04 +08:00
c80a819b6e
Guard Find entity by name function
2022-11-17 04:55:46 +08:00
8f9fedff41
Added sleeping debug info to Rigidbody Inspector
2022-11-17 01:39:05 +08:00
503f32c3a6
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-17 00:21:18 +08:00
39a8ca131f
Fixed Collision & Trigger Messages not being cleared on deactivating objects
2022-11-17 00:11:55 +08:00
b129a68680
Disabled setting of shader for now as it is buggy
2022-11-16 23:19:25 +08:00
19bc90845f
Added additional checks for SetProperty() of Material and MaterialInstance
2022-11-16 21:01:51 +08:00
8869b42db2
Fixed memory corruption in SHSubpass
2022-11-16 21:00:27 +08:00
fe91f58d28
Fixed material inspector saving not saving the correct texture ID into the runtime material
2022-11-16 19:25:17 +08:00
c5bca4111b
Fixed validation error caused by deleting empty batches
2022-11-16 19:23:26 +08:00
f0c09817ce
EnsureBufferAndCopy utility functions now avoid resizes if new size is smaller or equal
2022-11-16 17:49:11 +08:00
29b4465dfd
Split pre-rendering tasks to a PrepareRenderRoutine
2022-11-16 17:48:15 +08:00
edd44604f1
Merge branch 'main' into SP3-4-Editor
2022-11-16 17:47:36 +08:00
37e845336b
Fix line draws for asset browser
2022-11-16 17:46:48 +08:00
506b8836fe
Materials now keep track of their modified state and associated MaterialInstances keep track of changes to their base
2022-11-16 17:46:36 +08:00
1bd7183231
Added validation for Renderable drag drop fields
2022-11-16 17:30:19 +08:00
f991e7b227
Fixed some text shaders and changed some image parameters
...
- SHApplication has a font compiler exe call to test compiling a sample font
- SHVkImage now takes in a vector instead of a span for mip offsets (fuck it, copy the mip offset. The RAM can cry about it).
- Removed font data descriptor set layouts from graphics global data
- FONT_DATA set index is changed to 4 instead. This clashes with Render graph resource set index but it won't matter.
- Added entity ID render graph resource to scene render graph
- SHFont format for images is now R8G8B8A8UNorm
2022-11-16 16:57:08 +08:00
760c0386a9
Merge branch 'SP3-1-MaterialUpdate' into SP3-1-MaterialEditSupport
...
# Conflicts:
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHMaterial.h
2022-11-16 16:45:22 +08:00
db7c4a6d38
Merge branch 'main' into SP3-1-MaterialUpdate
2022-11-16 16:40:15 +08:00
acae84d12c
Fixed bug where creation of custom material instance for Renderables are not updated on the GPU
2022-11-16 16:38:04 +08:00
3e3a66f261
Fixed memory corruption issue caused by SHMaterialInstance::SetMaterial()
2022-11-16 16:32:12 +08:00
690ebef77d
Merge pull request #213 from SHADE-DP/SP3-4-Editor
...
Added Custom RigidBody Component View in Editor
2022-11-16 15:33:38 +08:00
3a6f1f852b
SHMaterialInstance::GetProperty() will now retrieve a property from the base material if it was not overriden
2022-11-16 15:29:11 +08:00
ba39c02f9f
Changed formatting slightly for RigidBody component view
2022-11-16 15:28:42 +08:00
dc9291bc01
Added Audio class for playing audio from C#
2022-11-16 15:00:56 +08:00
3affaf426d
WIP Runtime Material Editing support
2022-11-16 09:06:29 +08:00
a9f77d666c
Fixed compile error
2022-11-16 00:04:56 +08:00
f172ccb744
Added Automass and Sleep check for Rigidbodies
2022-11-15 23:58:08 +08:00
37aad49406
Added requested rigidbody component view with debug information
...
Changed DragVec controls to not push commands if ImGuiSliderFlags_ReadOnly is enabled
2022-11-15 21:09:24 +08:00
292fdf4ee2
Fixed some bugs but SHFont constructor still breaks
...
the vkImage is not loading correctly
2022-11-15 20:40:43 +08:00
a3d2f95aa0
Merge remote-tracking branch 'origin/main' into SP3-16-Math
2022-11-15 18:41:16 +08:00
b6bae850bf
Merge remote-tracking branch 'origin/main' into FontIntegration
2022-11-15 18:25:40 +08:00
958310a8ea
Renderable now shows the name of the mesh and material assigned instead of asset IDs
2022-11-15 18:16:07 +08:00
c69ad04f1e
Added functions to get name of a backing asset from SHResourceManager
2022-11-15 18:15:49 +08:00
93cded6ed9
Added serialization of component isActive
2022-11-15 17:04:52 +08:00
0e4d97da81
tooltip now reflects the correct keys
2022-11-15 16:28:46 +08:00
b0404bd59a
Merge branch 'main' into SP3-4-Editor
2022-11-15 16:22:56 +08:00
d3be8127cd
[FIXED] Parenting of entities selected using Shift+Select
...
[FIXED] Component Active Checkbox not working for non reflected components
2022-11-15 16:22:48 +08:00
d3103598f3
Removed old SHLog trace methods
2022-11-15 16:22:16 +08:00
75f103c372
Setting pipeline of a material now triggers a reset of all properties for material instances based on the material
2022-11-15 15:58:38 +08:00
e7a66eed08
Merge branch 'main' into SP3-4-Editor
2022-11-15 15:12:16 +08:00
f7cca42e59
Added shlog information source
2022-11-15 13:53:15 +08:00
786e15771c
Addedo control paths for font compilation and loading
2022-11-15 13:44:39 +08:00
92ddc3f1eb
Fixed wrong include path to SHUtilities
2022-11-15 13:30:25 +08:00
3dcb6f26c2
Merge branch 'main' into SP3-1-Rendering
2022-11-15 13:21:28 +08:00
e93eea6381
Cleaned up tools folder. Added debug only logging macros with _D suffix
2022-11-15 03:03:37 +08:00
94b4e3d169
Merge pull request #206 from SHADE-DP/SP3-6-c-scripting
...
Updated projects documentation auto generation
2022-11-15 01:52:53 +08:00
5cb87402b2
Hide .shmeta files from C# script project
2022-11-15 01:22:22 +08:00
16e357acb0
Accounted for texture compilation
...
Changed refresh, doesnt clear asset collection anymore
Checks for preexisting sub assets and asset meta in collection
2022-11-14 21:18:36 +08:00
7c636adbfc
Merge branch 'main' into SP3-4-Editor
2022-11-14 20:41:50 +08:00
36ed195a69
[FIX] Scene saving when you press play from pause
...
[FIX] WER for transform gizmo can now be pressed regardless of whether editor viewport is focused
2022-11-14 20:40:52 +08:00
47c50c3a31
Merge branch 'main' into SP3-6-c-scripting
2022-11-14 19:38:43 +08:00
4eb5fa64e0
Text Rendering WIP
2022-11-14 19:31:26 +08:00
6673e6f266
Merge branch 'main' into SP3-6-c-scripting
2022-11-14 19:08:46 +08:00
d897ac01e6
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-14 18:39:06 +08:00
10335f3033
Added syncing of physics materials & clear forces methods
2022-11-14 18:38:32 +08:00
2a05d821d5
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-14 18:36:33 +08:00
d95ed3f067
Text Rendering WIP
2022-11-14 18:36:26 +08:00
5ccd2263c7
Documentation files are now generated for projects
2022-11-14 18:35:52 +08:00
3cc5ed0dec
Added meta generation recognisation for scene and font extension types on load up
...
Check for std::optional value exist
2022-11-14 18:31:56 +08:00
45ec617c3a
Merge pull request #203 from SHADE-DP/SP3-6-c-scripting
...
Script QoL Improvements
Added
GetComponentsInChildren() for GameObject
GetScriptsInChildren() for GameObject
GetComponentsInChildren() for Scripts
GetScriptsInChildren() for Scripts
Fixed
Bug causing crash if a Renderable is added without any mesh or materials
Serialization failure caused by null objects in Scripts
2022-11-14 17:57:54 +08:00
77cab3e4c5
Merge branch 'main' into SP3-6-c-scripting
2022-11-14 17:08:50 +08:00
9e8674859c
Fixed script serialization for objects with no default values set
2022-11-14 17:05:54 +08:00
101dbb7a6f
Merge pull request #202 from SHADE-DP/SP3-2-Physics
...
SP3-2 Bugfixes
UPDATES
SHBoundingBox & SHBoundingSphere are renamed to SHBox & SHSphere
BUGFIXES
Colliders & Rigidbodies active states affect behaviour
Forces are cleared after every physics update
2022-11-14 16:07:51 +08:00
ac17721363
Merge branch 'main' into SP3-1-Rendering
2022-11-14 15:38:33 +08:00
9515fcca4f
Renames & Bugfixes
...
Renamed BoundingBox & BoundingSphere to Box & Sphere
Forces are forcefully cleared
2022-11-14 15:35:02 +08:00
eb32e87387
Camera Orthographic projection
2022-11-14 15:10:23 +08:00
7209785f9b
Text Rendering WIP
...
- Added font library to store font resources (not yet synced with resource manager)
2022-11-14 14:14:11 +08:00
898b7fbf2c
Text Rendering WIP
2022-11-14 10:11:47 +08:00
9e0bc0bbc9
Added checks for path exist and bin and obj folders when building directory for asset browser
2022-11-14 02:52:13 +08:00
ab869348f1
Added code that only renders objects which are active
2022-11-14 00:59:21 +08:00
3c61b7519b
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-14 00:25:52 +08:00
fe1b9d14f5
Partial implementation of syncing SHADE and ReactPhysics active states
2022-11-14 00:25:24 +08:00
d36d70e3eb
Added a forced update to the physics system
2022-11-14 00:20:54 +08:00
73a5d5e4b9
References path for csproj generated file is now dynamically generated
2022-11-13 22:29:04 +08:00
a8d4f9c756
On building of asset file directory, check for recognised assets without meta file and generate
2022-11-13 19:51:19 +08:00
c98693c6bc
missing change from last commit
2022-11-13 17:57:46 +08:00
c953931f4f
Merge branch 'main' into SP3-2-Physics
2022-11-13 17:57:30 +08:00
277a3ca011
Fixed deletion bugs
2022-11-13 17:42:48 +08:00
eed950f26f
Merge branch 'main' into SP3-4-Editor
2022-11-13 17:26:56 +08:00
895eb56cc0
Integrate cam arm
2022-11-13 17:26:21 +08:00
3512ed3397
AHHHHHH
...
i want to pull my hair out
2022-11-13 15:50:03 +08:00
86ca047c88
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-13 14:49:44 +08:00
66dbd7df93
Merge branch 'main' into SP3-4-Editor
2022-11-13 13:55:57 +08:00
276e0806fa
Can now undo/redo entity deletion (working afaik)
2022-11-13 13:55:30 +08:00
a83a38eba8
Fixed bin and obj folders respawning and causing engine crashes
2022-11-13 13:07:49 +08:00
897294426f
Merge pull request #194 from SHADE-DP/SP3-141-Camera-System
...
Sp3 141 camera system
Added EditorCameraArm functionality
Added helper functions in SceneManager to help check scene node and component actives
2022-11-13 11:58:50 +08:00
19f0c0ea70
Copy/Paste of entities can now be undone
...
Fixed bug where Shift Select would reset in a duplicate entity selection
Moved editor window manager to its own file.
2022-11-13 11:43:08 +08:00
efed33ce94
Added code to test EditorCameraArm.
2022-11-13 05:45:43 +08:00
922d5b0996
Merge branch 'main' into SP3-141-Camera-System
2022-11-13 05:31:34 +08:00
258c07e857
Added helper functions to check if Scene nodes are active
2022-11-13 05:31:18 +08:00
4d0598a7f5
Added Editor Camera Arm function
2022-11-13 05:19:46 +08:00
cf60210b4a
Merge branch 'main' into SP3-6-ArraySerialization
2022-11-13 02:43:12 +08:00
e2bcb0bbbb
play pause stop bound to F5 F6 F7
2022-11-12 23:57:12 +08:00
69ac074926
change entity active to scene node active
2022-11-12 18:38:57 +08:00
78ca464c65
Editor now uses separate stacks; 1 set of stacks when in play and another set of stacks otherwise.
...
CommandStack now uses SHDeque
2022-11-12 18:22:45 +08:00
3402992189
dont draw gizmos on play
2022-11-12 18:09:55 +08:00
f8bbcdd909
Small fixes
2022-11-12 17:28:49 +08:00
4ad23a605f
Fixed compilation issues from merge
2022-11-12 17:04:09 +08:00
3faf3804aa
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-12 16:57:45 +08:00
45e549f9f1
.....small restructure....
2022-11-12 16:56:58 +08:00
24dcd77f32
Added tooltip and range attribute support for lists in scripts
2022-11-12 12:17:11 +08:00
6dbda12f30
Adjusted design of list on scripts and all numbers now use sliders
2022-11-12 03:53:30 +08:00
7c7589ce8e
idk why creation of new material is not working here send help. Change to popup for asset creation
2022-11-11 21:12:08 +08:00
e96db99ee3
Merge branch 'main' into SP3-4-Editor
2022-11-11 20:41:14 +08:00
153f040c40
Refresh
2022-11-11 20:41:05 +08:00
c9db3b283d
asset browser
2022-11-11 14:00:51 +08:00
3b22f95e29
Added font identifiers
2022-11-11 13:21:22 +08:00
ed3694bde1
Merge branch 'main' into SP3-6-ArraySerialization
2022-11-11 12:07:40 +08:00
34dcc98a41
Merge pull request #191 from SHADE-DP/SP3-13-Assets-Manager
...
Filesystem directory features and bugfix
Fixed type from extension bug that results in null meta
Added compiled check for SHFiles
2022-11-11 10:56:44 +08:00
94b64e92dd
Initialise files to not compiled
2022-11-11 10:55:19 +08:00
9fe5dc385b
Implemented check for raw asset if compiled
2022-11-11 10:52:57 +08:00
6df3f3d417
Fixed get type from extension bug in asset handler
2022-11-11 10:47:03 +08:00
6e98776165
Merge pull request #190 from SHADE-DP/SP3-13-Assets-Manager
...
Assets bugfix
Fixed asset type conversion bug when loading from meta files
Removed compile all function
Set parent id to 0 for non sub assets
2022-11-11 10:07:19 +08:00
e824c17405
Fixed asset type conversion bug when loading from meta files
...
Removed compile all function
Set parent id to 0 for non sub assets
2022-11-11 10:06:26 +08:00
95d2836c94
God I felt so much pain writing this
...
- Thank god this botchy/hacky resource linking feature between graphs will only be used for a couple of resources.
- Setup environment for UI rendering
- "Scene" resource is now used in BOTH world render graph and screen render graph. Layouts are setup accordingly.
- A very horrible result of this is that linked resources have to be resized in their original graph and it has to be resized BEFORE the graphs linked to it since the framebuffers use their image views.
- sigh.
2022-11-11 02:40:02 +08:00
d17a83ab77
From last commit. Whoops.
2022-11-11 00:02:18 +08:00
c78aade245
Resource manager for render graph is the one in Graphics System
...
- Renamed SH_ATT_DESC_TYPE_FLAGS to SH_RENDER_GRAPH_RESOURCE_FLAGS and added SHARED flag to represent that a resource is shared between graphs
- Allowed linking of resources between graphs (unideal implementation)
- Added info tracker for the render graph resources. Right now only layouts are being tracked.
2022-11-11 00:02:07 +08:00
5875107ce2
Merge branch 'main' into SP3-6-ArraySerialization
2022-11-10 23:44:07 +08:00
d93ea8e49b
Child caches are now updated when scene hierarchy changes
2022-11-10 23:34:53 +08:00
aad83d9e32
Revert "Asset browser is wonky now"
...
This reverts commit 2fdff77420
2022-11-10 23:02:29 +08:00
2fdff77420
Asset browser is wonky now
...
Refresh asset browser
Compile asset
2022-11-10 23:01:09 +08:00
c95a6a2492
Added open modes for ofstream when building csharp project
2022-11-10 17:37:59 +08:00
ed1bc7c62d
Changed scripting project relative path to managed and csharp dlls
2022-11-10 17:34:33 +08:00
03f9c593b6
Function to call to refresh asset directory
2022-11-10 17:09:55 +08:00
9d367a359a
Text Rendering WIP
2022-11-10 16:59:26 +08:00
0e5609995f
Added data member to signal whether asset file can be compiled
...
Properly linked meta file to file in directory
Fixed extension to type conversion bug
2022-11-10 16:44:16 +08:00
bdc7297937
Converted macros for script field inspectors to use templates
2022-11-10 16:20:04 +08:00
901c007cb2
Added Transform Matrix method to SHMatrix
2022-11-10 14:55:28 +08:00
c40992b48c
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-10 14:44:18 +08:00
3efecd64e7
Added box & sphere debug draw for physics
2022-11-10 14:30:30 +08:00
e4e4894610
Canvas Component
...
Added a canvas component. No functionality added yet
2022-11-10 13:01:31 +08:00
35bcdc5239
Missed out path for config
2022-11-10 11:14:40 +08:00
fa0787d349
Changed hardcoded paths to use defined asset root folder
...
Shifted scripts and project into folder in assets
2022-11-10 10:33:21 +08:00
578f384808
Removed redundant overloads to restrict potential bad function calls
2022-11-10 10:24:09 +08:00
08b3cbafcd
Added IsChildOf method to SceneGraph
2022-11-10 10:20:54 +08:00
ac217ffe97
Added Add and Remove Child Events to SceneGraph
2022-11-10 09:06:38 +08:00
be6a11c629
Text Rendering WIP
2022-11-10 08:28:44 +08:00
eeab3494ba
Reworked SceneGraph Interface
2022-11-10 03:30:02 +08:00
99f41e947f
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-10 02:16:42 +08:00
4731df28f0
Skeleton for Reworked Physics Debug Draw
2022-11-10 02:16:33 +08:00
67f7d0ea2e
Text Rendering WIP
2022-11-10 00:19:38 +08:00
da12db6726
Merge branch 'main' into S3-6-Gizmos
2022-11-09 14:45:31 +08:00
7ac910149e
Merge pull request #185 from SHADE-DP/SP3-6-CSharpLights
...
Add interface for C# light class and modified Color to match Unity's interface
2022-11-08 21:51:04 +08:00
fe018fc95d
Merge pull request #184 from SHADE-DP/SP3-2-Physics
...
SP3-2 Fixed physics bugs and collider improvements
BUGFIXES
Added a relative collider size for ease of use. This variable does not affect any calculations or intersection tests.
Fixed bug where duplicate triggers are caught.
2022-11-08 21:50:07 +08:00
41b7cb842c
Added C# Gizmos class interface
2022-11-08 21:31:53 +08:00
e89f5b4b9e
Added OnDrawGizmos for debug draw for scripts
2022-11-08 20:49:07 +08:00
f8417f6116
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-08 15:22:28 +08:00
639cf4448d
Merge pull request #182 from SHADE-DP/SP3-1-DebugLabels
...
Fixed compile error in Release caused by Debug Labels implementation
2022-11-08 15:18:05 +08:00
Diren D Bharwani