0281446538
Merge remote-tracking branch 'origin/main' into main
2023-02-03 23:50:40 +08:00
1bae1c97d6
Added demo animation objects
2023-02-03 23:50:35 +08:00
7ded7a0706
Merge branch 'SP3-20-UI-System' of https://github.com/SHADE-DP/SHADE_Y3 into SP3-20-UI-System
...
# Conflicts:
# Assets/Editor/Layouts/UserLayout.ini
2023-02-03 23:33:40 +08:00
940c55d665
Fixed Renderables not being removed from a batch if their modifiable material was retrieved
2023-02-03 23:33:23 +08:00
21695fd4f3
Merge branch 'main' into SP3-20-UI-System
2023-02-03 23:28:17 +08:00
fdacaf5036
Added reminaing buttons for win and lose screens
2023-02-03 23:28:08 +08:00
7a79cda729
Reworked Collision Tag Interface and Logic
2023-02-03 23:22:21 +08:00
136d86dce3
Fix Item Score SFX
2023-02-03 23:19:12 +08:00
d71790022f
Merge branch 'main' into AudioImplementation
2023-02-03 23:16:47 +08:00
b15b5eadbc
Merge branch 'main' into SP3-20-UI-System
2023-02-03 22:59:56 +08:00
ebf1ab39cf
Added some buttons to lose screen
2023-02-03 22:59:49 +08:00
c61be35da0
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-02-03 22:44:58 +08:00
382a2d0f6a
Added start game button. Texture changing for buttons now only change when necessary
2023-02-03 22:44:02 +08:00
e00b891bf7
added lights to level 2
2023-02-03 22:03:55 +08:00
5284066cee
Merge branch 'main' into PlayerController
2023-02-03 21:29:02 +08:00
2ee46f33df
update collision tag to have a save button and clamp raycast draw
2023-02-03 21:28:50 +08:00
6cde511b36
Shadows update
...
Made it less dark
2023-02-03 20:16:42 +08:00
a6290d9c8f
Added texture, modifiable material fix
2023-02-03 20:12:48 +08:00
a6bc9ed2b4
Updates on audio
2023-02-03 19:37:18 +08:00
36de32447d
Fixed some bugs with serialisation
2023-02-03 18:40:45 +08:00
929bfa8a54
Merge branch 'SP3-6-c-scripting' into SP3-6-CSharpStaticReset
2023-02-03 17:05:56 +08:00
60fa4335a0
Merge branch 'main' into AudioImplementation
2023-02-03 17:01:11 +08:00
6b5bd43110
Merge branch 'main' into PlayerController
2023-02-03 16:48:51 +08:00
c73275f2d3
Added temporary use of collision layers to C# and fixed raycast drawing
2023-02-03 16:11:30 +08:00
b81e71ed08
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2023-02-03 02:03:12 +08:00
b6d91d5492
Fixed bug with collision tags not behaving as intended
...
Why the damn hell must react's system be so confusing??
2023-02-03 01:37:45 +08:00
d1a3214d41
Change banks
2023-02-03 00:40:22 +08:00
5bf3af2ed2
corrected transition to diff scenes
2023-02-03 00:03:05 +08:00
4af3440db7
added gameplay for level1 and multiplier combo is done
2023-02-02 22:44:48 +08:00
931f6fe5e2
Fixed almost everything. Ray debug drawing has a small bug
2023-02-02 20:56:55 +08:00
d5c731dd20
Fixed collision shape debug drawing and more serialisation bugs
2023-02-02 20:48:32 +08:00
e28c6ce1a7
new banks
2023-02-02 20:16:12 +08:00
3593df3ada
Fixed collider shape serialisation
2023-02-02 20:15:59 +08:00
71f4cdd29e
Fixed rigidbody serialisation
2023-02-02 19:23:42 +08:00
6a57be2e60
Refactored old physics to match new interface
...
Compiles but still buggy, need a bit of time to clear up all the bugs
2023-02-02 19:06:56 +08:00
1d0522e334
Audio Implementation for AI
2023-02-02 16:58:40 +08:00
5b628baedf
changes breakable to only minus count on items
2023-02-02 11:16:56 +08:00
ec11f8cb8f
Merge branch 'main' into PlayerController
2023-02-02 10:45:21 +08:00
39fbfbd6fa
Added more reliable method of reloading static C# data
2023-02-01 00:34:09 +08:00
109f35f297
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-01-31 19:02:11 +08:00
883c3c8fc1
Added recognition for audio bank files
...
Added wrapper class to hold path for fmod system
2023-01-31 18:27:39 +08:00
8d43fca1cc
added models for level 1 and made gamemanager a singleton
2023-01-31 18:13:34 +08:00
8c9673cafd
Removed editor config from repo
2023-01-31 17:48:29 +08:00
e0f363f1ec
Changed line to only ignore editor config
2023-01-31 17:47:36 +08:00
e9452093f0
Fixed UI
2023-01-31 15:17:40 +08:00
0f8e1d6310
Merge branch 'main' into PlayerController
2023-01-31 13:47:55 +08:00
710bfe1dac
Merge branch 'main' into SP3-10-input-management
2023-01-31 12:51:50 +08:00
38f2ba69db
Force use of Dedicated GPU
2023-01-31 12:43:02 +08:00
d1d7d430b1
added breakable food into the scene
...
#issues to fix
egg collision too small so weight is really small
throwing heavy objects doesnt give enuff force compared to rolling and hitting it
2023-01-31 00:43:25 +08:00
3e015d924e
Merge branch 'main' into PlayerController
2023-01-30 23:30:55 +08:00
559cda92f1
Delete Editor.SHConfig
2023-01-30 18:27:29 +08:00
213ac9d275
Merge pull request #321 from SHADE-DP/SP3-17-animation-system
...
Animation WIP merge
2023-01-30 17:35:56 +08:00
59ef28baf1
Merge branch 'main' into AudioScripting
2023-01-30 16:47:46 +08:00
61fa2ae923
Merge branch 'main' into SP3-17-animation-system
2023-01-30 15:16:09 +08:00
53ef202e46
Merge branch 'main' into SP3-17-animation-system
...
# Conflicts:
# SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
# SHADE_Engine/src/Serialization/SHYAMLConverters.h
2023-01-30 15:15:46 +08:00
5240c837ec
Merge pull request #318 from SHADE-DP/SP3-10-input-management
...
Implemented Input Binding Panel via Editor
2023-01-30 15:00:58 +08:00
b3f79e31db
Forgot to commit shader binary
2023-01-30 14:58:52 +08:00
52c0cc2f84
Merge branch 'main' into SP3-17-animation-system
...
# Conflicts:
# Assets/Shaders/TestCube_VS.shshaderb
# SHADE_Engine/src/Editor/EditorWindow/Inspector/SHEditorComponentView.hpp
# SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.h
# SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsPredefinedData.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/GlobalData/SHGraphicsPredefinedData.h
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsConstants.h
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Meshes/SHPrimitiveGenerator.h
# SHADE_Engine/src/Graphics/MiddleEnd/Pipeline/SHPipelineLibrary.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Pipeline/SHPipelineLibrary.h
# SHADE_Engine/src/Serialization/SHYAMLConverters.h
2023-01-30 14:57:46 +08:00
3ff2e6bb92
Revert "Implemented a custom physics engine"
2023-01-30 14:40:55 +08:00
bde191aeca
Input Bindings Panel Done
2023-01-25 23:22:15 +08:00
7d9ab7a381
items changes
...
items now return back to their original position when owner collides with it
2023-01-25 18:20:26 +08:00
80a7fe701b
Added debug draw for animation system
2023-01-24 23:31:00 +08:00
4ed7aa3aed
Reverted an attempt to stabilise edge detection between polyhedrons
2023-01-23 03:03:40 +08:00
5730381302
Physics objects can be implicity static if only a collider was added.
...
Removed the need to create an extra body. Math is great.
2023-01-23 00:56:46 +08:00
a0f6cd3ae7
Cached SAT for improved stability
...
The effects of baumgarte stabilisation can be rather obvious especially when polyhedrons are thrown around at angles. Regardless, the system is relatively stable bar the added energy from the solving method, which may make for a more "bombastic" physics playground
2023-01-23 00:37:22 +08:00
0c3106f15b
Abstracted contact derivation as setup for cached SAT
2023-01-22 19:20:03 +08:00
1dc16fdcda
Fixed typos
2023-01-22 17:38:51 +08:00
80fb8f7c73
Saved and loaded bone offsets
2023-01-22 17:00:55 +08:00
6872bae151
Updated compiled shmodel file for racoon with fixed rig node order and build format
...
Fixed bug when building histogram for vertex weights
2023-01-18 04:00:48 +08:00
1b4397c76d
Updated all compiled models
...
Fixed UV mappings
2023-01-17 14:38:50 +08:00
19c11447c0
added base to return item back to original pos
2023-01-16 21:31:38 +08:00
affa6f0dd8
added implantation for audio scripting
2023-01-16 21:05:21 +08:00
bce7237e20
Modified shader to support instanced bone first index and system to support runtime updating of animations
2023-01-16 21:02:37 +08:00
36e01260ec
Merge changes from main missing from previous commit
2023-01-16 16:23:48 +08:00
dc55c31c36
Merge remote-tracking branch 'origin/main' into SHPhysics
2023-01-16 16:23:20 +08:00
8475bdccd7
Merge remote-tracking branch 'origin/main' into SHPhysics
2023-01-16 16:22:59 +08:00
09911cc50c
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2023-01-16 15:33:37 +08:00
e115d4b965
Reverted light properties back to main
2023-01-16 15:33:20 +08:00
1526176c58
Shadows WIP
2023-01-16 15:06:46 +08:00
c077575a73
Fixed convex-convex face detection
...
Minor bugs with contact point detection. Will test more before pushing into main
2023-01-16 15:01:14 +08:00
a41354f2ce
Added changing texture of buttons
2023-01-16 14:35:16 +08:00
7f9991038a
Working commit
2023-01-16 14:34:59 +08:00
02ba0c6dc9
merge
2023-01-16 11:44:34 +08:00
0c7224b8be
Merge branch 'main' into UI-Test
2023-01-16 11:37:38 +08:00
5190c490c9
added events
2023-01-16 11:36:12 +08:00
5aa7bfe03e
button fixed
2023-01-16 07:34:44 +08:00
19bffc9124
First half of re-implementing face-face contact derivation
2023-01-16 02:44:27 +08:00
7ecb8b11ad
Added support for rendering bone-less models using the animated shader
2023-01-13 21:26:05 +08:00
d1a41ea194
Fixed raccoon not rendering for animated material
2023-01-13 20:33:25 +08:00
ef5016351b
Reverted changes to inertia tensors
...
Created a new branch since I reverted to an older commit but kept some new updates. This will be the main branch moving forward.
2023-01-13 15:26:21 +08:00
f217562fef
Shadows are sort of working
2023-01-11 20:04:53 +08:00
4cd9a6cea0
shadows WIP
2023-01-11 10:35:29 +08:00
4a06032bea
Shadows WIP
2023-01-11 08:25:38 +08:00
356ec24cc2
Change default pathing for binding file I/O
2023-01-09 17:21:24 +08:00
19ba71e51c
Added animated raccoon material and deleted unused skinned vertex shader
2023-01-09 17:05:10 +08:00
cb9223db0b
Enabled partially bound bit for descriptor sets with variable size
...
- Shadow maps can be sampled from compute shaders
2023-01-09 11:06:10 +08:00
88491ffbd8
ToggleButton fix
2023-01-09 09:56:46 +08:00
e89b6f5c4c
Fixing button
2023-01-09 09:38:53 +08:00
5f11a931c7
Added Toggle Button, Fixed canvas Scalar
2023-01-09 09:24:20 +08:00
b293b28a56
Button fix
2023-01-09 07:14:40 +08:00
baaeb9ee10
Input Binding File I/O
2023-01-08 21:05:09 +08:00
67db3e636c
Updated racoon model and files
2023-01-08 12:37:48 +08:00
1a2a514f98
Updated all models
2023-01-07 22:00:46 +08:00
de0dc5db61
Recompiled models
2023-01-07 21:48:31 +08:00
77a5829fc9
Shadows WIP
2023-01-07 17:45:49 +08:00
d3cd36984d
Shadow map WIP
2023-01-07 07:42:42 +08:00
19f9b67550
Shadow map WIP
...
- Added companion subpass object to subpass
- Lighting sub system updates a light's renderer when it is a valid handle
- Light component's renderer will be created in the graphics system event when a light's shadow is enabled
2023-01-06 10:40:19 +08:00
8ca4045d55
R for retard
2023-01-05 17:53:48 +08:00
0c92e7ff6c
Added more comments and clarity for polyhedron edge contacts
2023-01-05 14:40:59 +08:00
68e11ba48e
Added edge vs edge contacts for convex polyhedron collisions
2023-01-05 13:42:17 +08:00
c484a088fd
Added first half of Gauss Map Optimised SAT
2023-01-05 01:12:25 +08:00
9d17328262
Added bone animation supported vertex shader
2023-01-04 18:20:04 +08:00
7da89def50
Refactored SHBatch to support animation data in the same descriptor set
2023-01-04 17:42:02 +08:00
3ca6859fcb
Merge branch 'main' into SP3-17-animation-system
...
# Conflicts:
# SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp
# SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.h
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
2023-01-04 15:52:08 +08:00
a49c674c2b
Generalised the Parallel Axis Theorem for computing inertia tensors
2023-01-04 15:03:58 +08:00
f7e867098d
Small changes to rigidbody tooltips
2023-01-03 20:30:20 +08:00
b2645fb584
Added support for composite colliders
2023-01-03 18:53:21 +08:00
0460d776b0
Fixed collision tag panel fallacies and saving of tag masks
2023-01-03 10:40:02 +08:00
1b5024793c
Added debug drawing for rays
2023-01-03 10:14:39 +08:00
1f2a9820d1
Readded collision tags and moved collision filtering to an earlier stage
2023-01-02 22:49:12 +08:00
58a44997b2
Reworked raycasting on engine side. Re-added raycasting to scripting
2023-01-02 22:31:48 +08:00
6f55f202b9
Added planes
2023-01-01 16:53:13 +08:00
37db6a2bf1
Merge remote-tracking branch 'origin/main' into PhySH
2023-01-01 14:11:47 +08:00
f3c0bdbcfd
Clean up
2023-01-01 03:24:34 +08:00
67907b1ca9
Replaced twin-edge dependency on sphere vs convex polyhedron
2023-01-01 02:48:02 +08:00
00f8726e46
Solved edge case for sphere vs convex polyhedron
2023-01-01 02:42:44 +08:00
3a7336fe15
Improved stability of sphere vs convex polyhedron except for one edge case
2022-12-31 18:43:46 +08:00
6451ca5e95
forgot to flip a normal
2022-12-31 01:40:28 +08:00
896b47c1a0
Fixed and optimised sphere vs convex polyhedron
...
Improved sphere vs convex polyhedron from O(n^2) to O(n). Math is amazing.
2022-12-31 01:11:25 +08:00
82d46fce99
Fixed voronoi region tests for sphere vs convex polyhedron
2022-12-30 23:53:45 +08:00
3586c7ffdc
Added mostly working sphere vs convex polyhedron collision detection
2022-12-30 21:43:22 +08:00
50e3ddf0dd
Fixed box inertia tensor calculation
2022-12-30 17:59:59 +08:00
400cbb35d9
Partial implementation of a generic convex polyhedron object
2022-12-30 00:45:37 +08:00
8e2c32d110
Graphics refactor more or less tested and working
...
- Descriptors sets are now independent from a set index. Camera matrices for example can be bound to set index 1 for the batching system but index 2 for compute shaders.
- Truly global descriptors sets (misc data, textures and light data) are now manually bound to a global static class that allows retrieval of these sets to be bound whenever in the middle end.
- Predefined descriptor set layouts (but not truly global such as camera data, materials and font) have their layouts predefined in a class and used for descriptor set initialization within the middle end. The sets themselves are allocated using these layouts (also accessible globally).
- Descriptor sets that are more flexible with their bindings such as render graph resources are introspected from shaders and not predefined at all (though their types are recorded in SHGraphicsPredefinedData to avoid magic numbers when binding descriptor sets in some systems).
- Systems now have fixed mappings for descriptors used in shaders and these are defined in SHGraphicsPredefinedData. Batching for example has 3 fixed descriptors: Static global bound at 0, camera data bound at 1, materials bound at 2.
- Viewports no longer contain renderers and renderers no longer contain render graphs. The graphics system only has 1 render graph and subpasses can have both viewports and renderers bound to them to have options for viewport/scissor and camera settings.
- Light data is now bound before every compute system.
- There is only 1 render graph in the entire system and contains only 6 nodes: G-Buffer pass (with lighting compute pass), debug draw with depth, debug draw, screen space pass, dummy pass for transition to input attachment for imGui and lastly the imGui pass for rendering editor to swapchain.
2022-12-29 14:29:25 +08:00
99e7dbfa01
WIP
2022-12-28 20:47:20 +08:00
3bfec1e54f
WIP will update later, afraid for BSOD again
...
- All Shaders now take in a single projection matrix. The type of projection matrix is dependent on the SHRenderer projection type.
- SHGraphicsSystem now only has a single render graph.
- SHGlobalDescriptorSets now store a descriptor set for static global data and a handle to the lighting system. Functions to bind their descriptor sets are also available.
- Font desc set layout is added back into SHPredefinedData because while its possible to introspect the layouts from the shaders, the layouts is required beforehand to generate the font objects
- SHRenderers and SHViewport are now 2 separate entities, both passable to SHSubpass to be contained and used to set viewport/scissor and send camera matrices to shaders.
- SHRenderer descriptor sets are now updated separately from the binding. They happen directly before the render graph executes.
2022-12-28 12:19:30 +08:00
0df6e09ed6
Added box collision shapes
2022-12-24 13:32:50 +08:00
89f1f60064
Added physics settings menu for easily toggling debug draw states
2022-12-24 02:19:53 +08:00
b667e4df87
Implemented axis locking constraints
2022-12-22 03:11:14 +08:00
f4f6cb7eae
Fixed sequential impulses
2022-12-22 01:10:25 +08:00
92ed8a29ff
Fixed bug with non-dynamic masses being overriden
2022-12-21 19:04:10 +08:00
d109d06764
Implemented sequential impulses using baumgarte stabilisation
...
There is a bug with masses of static bodies not being properly set
2022-12-21 18:57:10 +08:00
265a5bece8
Slight refactor to fix collision states for very fast moving objects
2022-12-21 00:40:01 +08:00
751a16dcc3
Tested collision detection with collision states
2022-12-20 02:13:06 +08:00
cf9d4ef04b
Implemented backbone for collision detection with broadphase
2022-12-19 16:56:34 +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
27760a95c9
Tested physics interactions with scripts
2022-12-15 23:00:15 +08:00
98ff16d00c
Added deebug drawing of cubes of any transform
2022-12-15 01:45:44 +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
c1d7702914
Moved debug draw state to colliders. Synced collider positions with rigid bodies
2022-12-11 20:12:26 +08:00
38b1c46d1f
Added physics world and tested applied gravity for linear movement
2022-12-05 00:20:29 +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
81978a90b6
added more audio and tidy up folder
...
tidy up scripts folder
added more audio (cause burden randall cant make up his mind)
adjusted main scene abit
2022-11-26 08:28:37 +08:00
cae8358341
updated scene changes
2022-11-25 23:10:17 +08:00
1302a7e58d
added jump var changes
...
change jump to be in update
added audio for AI
2022-11-25 22:53:38 +08:00
92ce7c96a8
Merge branch 'main' into PlayerController
2022-11-25 22:34:49 +08:00
fb512e7fc5
added the new banks in
...
removed unneeded bank
added new audio
2022-11-25 22:32:41 +08:00
609be908f9
Revert "Made player jumping more responsive"
...
This reverts commit d6fab4439f
2022-11-25 20:18:36 +08:00
a541565e55
Merge branch 'main' into AIFinalFixesGAM300M3
2022-11-25 20:17:11 +08:00
5b41e832c6
Enhanced AI with better chase logic
...
- AI now keeps track of last waypoint he has seen player at and heads there in an attempt to chase him down
- AI can be made to reverse his chase/patrol path by running around him
- The scene with the AI fix is called "MainGameWithAIFixed"
2022-11-25 20:16:31 +08:00
27aadf67d3
threw in AI to maingame.shade
2022-11-25 19:03:23 +08:00
181af5b3e5
fix throw food bug
...
added inverse camera controls
2022-11-25 16:23:26 +08:00
7499011ea2
Merge branch 'main' into ScriptingAI
2022-11-25 16:14:06 +08:00
7003262a5d
Fixed AI even after scene change
...
-More reliance on the blackboard for keeping variables among a tree's nodes
-Half extents of the AI fixed
2022-11-25 16:12:58 +08:00
413156dabb
Merge branch 'main' into PlayerController
2022-11-25 15:45:35 +08:00
6ac9bc4e94
added breakables to the main game and fix issues with it
2022-11-25 14:45:19 +08:00
afd2abf036
Fixed pre & post physics transforms update routines
2022-11-25 14:06:20 +08:00
9daaade56a
Merge branch 'main' into PlayerController
2022-11-25 13:22:51 +08:00
d72a532623
Added object checks in leaf scripts
2022-11-25 12:09:03 +08:00
c5d490b8b2
Added null checks for AI blackboard data
...
- Null checks added to prevent AI causing the engine to crash
2022-11-25 11:44:58 +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
4daaa8e897
Added SFX to AI
...
- Footsteps, alert yell and unalert humming
2022-11-25 00:56:40 +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
f71675ad0e
Merge branch 'main' into PlayerController
2022-11-24 22:41:00 +08:00
d6fab4439f
Made player jumping more responsive
...
- Changed the input check in the jump function from a GetKeyDown() / GetKeyUp() to a GetKey() / !GetKey()
- This makes jumping a lot more responsive
- This also means holding the jump button causes the raccoon to "bunny hop" until jump button is released
2022-11-24 21:56:06 +08:00
c0f3720fd2
AI expected to work with the scene. To Verify.
2022-11-24 21:26:05 +08:00
9473359076
added the base for raycast in pickandthrow
2022-11-24 14:05:02 +08:00
5ee8403e80
make starting scene mainmenu
...
change playercontroller to fixed dt
2022-11-24 01:08:08 +08:00
d8b2addd1f
added the fix for AI
2022-11-23 22:44:15 +08:00
ff318cee2e
added ai scripts and in the scene
2022-11-23 21:02:33 +08:00
caefae3aac
added the change scene into winscene
2022-11-23 20:51:22 +08:00
8469ebd960
setting the value into scripts
2022-11-23 20:48:40 +08:00
af93e59d0e
added text to maingame
2022-11-23 20:26:53 +08:00
ee4e31f45f
remove unwanted items in some scripts
2022-11-23 19:11:41 +08:00
22972d7455
updated the music banks
...
update a tem fix for physicsSystem
2022-11-23 17:37:06 +08:00
152007e810
adding audio for the rest of the level
...
setting player position so it doesnt fall through the floor
2022-11-23 16:57:32 +08:00
33bab64f12
Merge branch 'main' into PlayerController
2022-11-23 14:00:28 +08:00
6d2591331b
Merge pull request #257 from SHADE-DP/SP3-6-c-scripting
...
Fixed bug where rendering inspectors for scripts that contain uninitialized List<T>s causes crashes
2022-11-23 13:49:42 +08:00
5356cd0800
added item model and setting the main game scene
2022-11-23 13:44:03 +08:00
8ad46afc22
Removed spaces from UI Test scene to stop regenerating of asset meta
2022-11-23 13:06:50 +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
67db744856
Uninitialized List<> will no longer cause crashes with the script inspector
2022-11-23 10:08:48 +08:00
4cacbb3300
adding main/lose/win scene
2022-11-23 00:44:27 +08:00
332d0a846d
Merge branch 'main' into PlayerController
2022-11-22 22:13:52 +08:00
7c36886669
Fix for Canvas scaler
2022-11-22 21:03:53 +08:00
142f025692
Added check for editor camera.
2022-11-22 20:54:16 +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
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
c91897f46a
made changescene a public in sceneManager.hxx
...
added a main menu scene
added some new texture
2022-11-22 17:28:48 +08:00
f1c7f42e13
Merge branch 'main' into PlayerController
2022-11-22 16:21:28 +08:00
71e8ba6044
doing up the main menu
2022-11-22 16:18:16 +08:00
1ca216801f
Merge pull request #245 from SHADE-DP/SP3-1-Rendering
...
Updated SSAO shader
2022-11-22 16:01:11 +08:00
780c716199
Updated SSAO shader
2022-11-22 16:00:05 +08:00
81d44e6c59
small changes to the scene
2022-11-22 14:59:46 +08:00
219d5025f3
adding in the env and world
2022-11-22 14:14:55 +08:00
3b6d1c815d
Merge branch 'main' into SP3-17-animation-system
2022-11-22 13:55:17 +08:00
6c4ec7c807
Merge branch 'main' into PlayerController
2022-11-22 13:44:27 +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
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
56e7f73bbb
adding var audios into scripting
2022-11-21 21:01:44 +08:00
1ff8c9715d
Merge branch 'main' into SP3-17-animation-system
2022-11-21 12:15:57 +08:00
293cc586d1
aiming is done in player
2022-11-21 00:12:09 +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
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
5871f32547
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-20 17:23:38 +08:00
8107c92754
Merge branch 'main' into PlayerController
2022-11-20 16:53:12 +08:00
875657cfde
added playerstate scripts
...
added sub folders for player
remove unneeded scripts
2022-11-20 16:27:39 +08:00
a0f4f3b00a
Added collision tag names file
2022-11-20 15:32:33 +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
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
798803cf81
UI WIP
2022-11-18 22:03:21 +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
03ce142137
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-18 16:37:06 +08:00
7d2435131f
added game manager along with scoring zones for item to be thrown in
2022-11-17 12:54:08 +08:00
e4f23dc6c3
added a game manager along with some player controller changes
2022-11-17 00:23:38 +08:00
df9cb11446
add to vel instead of setting it
2022-11-16 22:28:08 +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
3affaf426d
WIP Runtime Material Editing support
2022-11-16 09:06:29 +08:00
3f3770f74f
now hard sets the vel instead of adding force
2022-11-15 18:52:46 +08:00
96cb832e81
Font meta file and line in application to manually trigger font load
2022-11-15 13:48:54 +08:00
4eb5fa64e0
Text Rendering WIP
2022-11-14 19:31:26 +08:00
37bbf22779
added changes
2022-11-14 19:05:48 +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
22da6e237d
Merge branch 'main' into PlayerController
2022-11-14 16:17:03 +08:00
ac17721363
Merge branch 'main' into SP3-1-Rendering
2022-11-14 15:38:33 +08:00
bba85c3d1f
removing the constructor for c#
2022-11-14 15:20:58 +08:00
04273620a6
Merge branch 'main' into PlayerController
2022-11-14 15:03:04 +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
d9beeda7e0
adding the base for fsm for player
2022-11-13 21:56:28 +08:00
e3d2515740
Modular house part asset test
2022-11-13 20:49:31 +08:00
d0bcd4869f
Removed unused raw asset files
2022-11-13 20:19:26 +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
c953931f4f
Merge branch 'main' into SP3-2-Physics
2022-11-13 17:57:30 +08:00
eed950f26f
Merge branch 'main' into SP3-4-Editor
2022-11-13 17:26:56 +08:00
b1c004771c
Gave the damn entities names cuz i was going crazy
2022-11-13 17:26:35 +08:00
4dc8527395
Reworked scripts to no longer need definition of constructors
2022-11-13 16:29:25 +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
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
24dcd77f32
Added tooltip and range attribute support for lists in scripts
2022-11-12 12:17:11 +08:00
4c01d68f95
Added list editor tests
2022-11-12 02:33:12 +08:00
fbec2bf866
Auto stash before merge of "main" and "origin/main"
2022-11-11 14:17:47 +08:00
4f9015995c
Merge branch 'main' into PlayerController
2022-11-11 09:21:36 +08:00
8670b419d0
Merge branch 'main' into SP3-6-c-scripting
2022-11-10 22:25:58 +08:00
9d367a359a
Text Rendering WIP
2022-11-10 16:59:26 +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
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
be6a11c629
Text Rendering WIP
2022-11-10 08:28:44 +08:00
eeab3494ba
Reworked SceneGraph Interface
2022-11-10 03:30:02 +08:00
f8417f6116
Merge remote-tracking branch 'origin/main' into SP3-2-Physics
2022-11-08 15:22:28 +08:00
ddd93a85f4
Added support for null GameObjects (loading is buggy)
2022-11-08 00:53:47 +08:00
8fbd32a144
Added Relative Sizes to Shapes
2022-11-08 00:46:09 +08:00
de38b29f25
small fixes for ms2 submission
2022-11-05 18:15:18 +08:00
ab17d57756
Asset browser now recurses down subassets
2022-11-04 23:32:29 +08:00
b30da7e495
Fixes
2022-11-04 19:16:32 +08:00
b86f092f52
Merge branch 'main' into SP3-305-configurationsMerge
2022-11-04 18:37:19 +08:00
1267442210
Deserialization flow is now as follows:
...
Create entities and components >> Fetch Assets needed >> Load assets needed >> Initialize entities
Some other bug fixes
2022-11-04 18:27:25 +08:00
6d0089ee12
Merge branch 'main' into SP3-13-Assets-Manager
2022-11-04 17:49:13 +08:00
04113a0480
Shifted assets and generated new assets
2022-11-04 17:17:24 +08:00
4eecc0c08d
Removed old mesh and meta files
2022-11-04 16:23:13 +08:00
4ee0294977
Scene loads correctly now
2022-11-04 14:44:18 +08:00
eea35600d3
Switched shaders to use multiply colour instead of additive
2022-11-04 14:04:59 +08:00
5fe10ce8d1
Changes to main for presentation
...
Change TestCube_FS.glsl
Change debugdraw Key input to F10
TestScene changes
AI waypoint changed
playercontroller camera axis change
2022-11-03 01:50:02 +08:00
86254a5bf3
Merge branch 'main' into SP3-4-Editor
2022-11-02 21:41:38 +08:00
e609b5634a
Material Inspector
...
Can set material
2022-11-02 21:31:27 +08:00
ebc94225e7
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-11-02 17:04:31 +08:00
73be299aae
new SHMETA
2022-11-02 15:05:34 +08:00
eb569a4263
Shader updates
2022-11-02 14:21:27 +08:00
b0d08d27fd
SSAO is fully implemented
2022-11-01 20:10:59 +08:00
78545889da
SHSHSHAO
2022-11-01 12:47:50 +08:00
53fc1fce95
WIP
2022-11-01 12:10:15 +08:00
5852c409e6
SSAO WIP
2022-11-01 11:57:08 +08:00
54a36e1476
SSAO WIP
2022-11-01 02:32:14 +08:00
53b9c8f746
SSAO WIP
2022-10-31 23:28:46 +08:00
441207260b
shmeta
2022-10-31 20:49:49 +08:00
2bd3b45ba0
SSAO sort of working
2022-10-31 20:49:28 +08:00
797f4bfd75
Fixed shader changes
2022-10-31 17:35:52 +08:00
94a57219da
Created CPU and GPU data for SSAO
...
Renderpass for SSAO not yet done (that's next)
2022-10-31 10:32:32 +08:00
647182241e
Fixed a buy with view space lighting calculations
2022-10-30 19:21:02 +08:00
b1a933a2c3
Merge branch 'main' into SP3-1-SerialisedRenderable
...
# Conflicts:
# Assets/Shaders/TestCube_FS.shshaderb
# Assets/Shaders/TestCube_VS.shshaderb
# SHADE_Engine/src/Graphics/MiddleEnd/Interface/SHGraphicsSystem.cpp
2022-10-30 17:14:28 +08:00
39b5ac0774
LIGHTING NOW DONE IN VIEW SPACE
2022-10-30 16:52:40 +08:00
4711a131eb
Shifted the lighting system run outside the viewport loop.
...
- Since lighting is only calculated in the world render graph for now, this will do just fine
- Renderer takes in a view and projection matrix and does the transpose of the multiplication in the renderer
2022-10-30 16:35:55 +08:00
b46b6b0b85
CompileAll uncommented and asset manager metadata writes commented
...
SHmeta files should now be identical to what's on main
Shaders themselves have some changes (binaries also updated)
2022-10-30 00:25:49 +08:00
5db9299699
Reverted back to old asset IDs
2022-10-30 00:07:02 +08:00
7c5a24b8e1
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-30 00:00:17 +08:00
e4394b6170
Generalised SHResourceManager
2022-10-28 21:32:05 +08:00
fa6e3cf1df
Light Component Serialization & Inspector
2022-10-28 17:58:16 +08:00
0cab0107b2
Fixed minimizing by resetting command pools and fences
2022-10-27 19:37:05 +08:00
b5a1d5ea88
SP3-282 Restructured loaders and compilers
...
Completed shader compiling and loading
2022-10-27 12:54:58 +08:00
5154b579d7
Re-restructured compilers to be more self contained
...
Loaders only load internal binary asset files
2022-10-26 23:07:01 +08:00
7c0bcd8a3e
Delete UserLayout.ini
...
@Xenosas1337 stop pushing this please
2022-10-26 16:09:54 +08:00
43ea33cabf
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-10-26 15:26:41 +08:00
5016600397
Lights WIP
2022-10-25 23:39:35 +08:00
534aeba06b
Latest Default Layout
2022-10-25 20:59:32 +08:00
8fb0eddcc1
Lights WIP
2022-10-25 00:00:22 +08:00
26eb4ad18c
Fix command registrations and mouse pick polling when using transform gizmo
2022-10-24 16:18:18 +08:00
4019b4914c
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-23 17:08:37 +08:00
982f2de286
Merge remote-tracking branch 'origin/main' into Rendering-Camera-Integration
2022-10-23 16:36:22 +08:00
d4fe63722a
WIP (TODO: remember to change commit message)
2022-10-23 15:05:31 +08:00
459d9dd9fd
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-22 00:08:43 +08:00
44833d22c6
Merge branch 'main' into SP3-13-Assets-Manager
2022-10-21 20:52:28 +08:00
99a69b0020
tweaks + add new ui font
2022-10-21 20:45:03 +08:00
9df517f3b3
SP3-170 SP3-238 Restructured asset and asset loading library types to be derived from common base class.
...
Storage of assets and loaders based on pointers.
Created general templated calls to get data from asset manager based on asset type passed in as template argument.
More concise internal interface when loading and storing assets with libraries
2022-10-21 20:28:54 +08:00
c252e4ce4b
Some restructuring with render graph storage.
...
Lesser parameters passed around.
2022-10-21 07:01:51 +08:00
736d7b652b
Added camera turning
2022-10-20 03:21:42 +08:00
6051b7ded5
Tfm gizmo wip
2022-10-19 20:42:38 +08:00
603470eeb6
Fixed some camera resizing issues
2022-10-19 17:06:37 +08:00
d9136de134
Integrated Daniel's camera
...
Still need to integrate camera directors
2022-10-19 16:53:45 +08:00
284ee12205
Broken Camera
2022-10-19 15:32:07 +08:00
82637b620d
Delete UserLayout.ini
2022-10-18 19:36:49 +08:00
da99a5559e
Merge branch 'main' into RenderingEditorVPIntegration
2022-10-18 19:09:08 +08:00
9ce5a4a47b
Mouse picking system now uses cursor returned from editor
...
- This new cursor position is relative to where the viewport is rendering
- Window resize callback in Graphics system now checks if editor is enabled before signaling for resize. This is because editor will handle the signaling for resizing when its enabled. When its disabled, the graphics system will signal itself to resize when the window resize callback is called.
2022-10-18 17:41:14 +08:00
033ba48304
Editor changes to support viewport integration
2022-10-18 15:04:25 +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
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
363e09bd55
Merge remote-tracking branch 'origin/main' into SP3-1-Rendering
2022-09-28 20:39:42 +08:00
658562bdc4
Merge branch 'main' into SP3-129-AudioSystem
2022-09-28 17:51:40 +08:00
bed6a144f8
banks curr working
2022-09-28 17:25:14 +08:00
7fcac5e0eb
god knows whats diff but audio is sort of working ish
2022-09-27 23:57:11 +08:00
70940534e1
Merge remote-tracking branch 'origin/SP3-1-Rendering' into SP3-1-Rendering
2022-09-27 20:07:29 +08:00
b7adf8815b
Fixed camera. Can see texture now
2022-09-27 19:18:45 +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
ee7cb36896
added the banks for testing
2022-09-27 14:11:04 +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
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
335c19cfc7
Editor
2022-09-25 22:33:07 +08:00
a0a57e7c29
Added test assets
...
Test line to call asset manager temporary load
2022-09-25 00:13:17 +08:00
Xiao Qi