From e147d964f22257035da954e398f6b898b942c3ac Mon Sep 17 00:00:00 2001 From: Jaro Date: Sat, 26 Oct 2024 19:34:32 +0200 Subject: Notulen notes en collision diagram en research toegevoegd --- figs.drawio | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- notulen/wk8-1.txt | 57 +++++++++++++++++++++++++++++ research.tex | 67 ++++++++++++++++++++++++++++++++++ 3 files changed, 227 insertions(+), 2 deletions(-) create mode 100644 notulen/wk8-1.txt diff --git a/figs.drawio b/figs.drawio index 5082752..5e6fc7a 100644 --- a/figs.drawio +++ b/figs.drawio @@ -736,7 +736,7 @@ - + @@ -1486,7 +1486,7 @@ - + @@ -1495,6 +1495,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/notulen/wk8-1.txt b/notulen/wk8-1.txt new file mode 100644 index 0000000..7702dfd --- /dev/null +++ b/notulen/wk8-1.txt @@ -0,0 +1,57 @@ + Documents + Research Document + Continue adding research information + Project plan + - + Document standard + Add updates when needed + Requirement + physics sub-requirements -> Jaro write document + eventmanager sub-requirements -> Wouter write document + gameloop sub-requirements -> Wouter write document + ecs sub-requirements + particles sub-requirement -> Jaro write document + resourceManager sub-requirement -> Niels write document + rendering sub-requirement + script requirements added. + design document + [closed] Discussing top-down + API in design document + Game design + - + Git + Code standard -> LOEK update + Show updates + Code standard with examples not in main? -> niels + Environments + - + Research (POC) + research eventmanager -> Wouter POC (goede voortgang) knoppen uitlezen + [closed] resource manager -> POC check datatype for conversion (na meeting afgerond) alleen implementatie tiled + start research ui -> wouter + start research ai + start research playback -> Max + start research scenes -> Max + star research camera -> Niels + start research savedata -> loek + start research renderer -> niels (sprite & color & transform) POC simple (SDL_GPU voor efficiency verbetering) + [closed] start research scripting -> loek + start research physics Starting POC -> Jaro + More research about physics + start reasearch collision detection -> Jaro + [closed] research ecs -> Loek will add fix for derived class for scripts + start research particles Starting research -> Jaro (start lifetime. spawning area) + Design + Adding design asset class -> niels + Adding design resource holder -> niels + How does a game designer make a scene? + Product + - + Test + - + Question Bob + mag de API gewoon een interface worden voor wat onderliggend een ECS is. + Overig + Timers voor systems (profiler van systems) + + diff --git a/research.tex b/research.tex index 791e9f1..01f25a0 100644 --- a/research.tex +++ b/research.tex @@ -670,6 +670,73 @@ The benefit of ECS is that all physics and collsions are handled by one system. What EC can not provide compared to ECS is a physics world. A physics world would be the physics that apply to all dynamic physics components. If you want to create gravity you can add the force to the world. The physics system would read all the Physics forces in the world and apply them to all dynamic entities. This would create an easier to use interface for the user and improve the efficiency of the physics because the total forces can be calcualted ones and then applied to all dynamic entities. +\subsubsection{Components physics} +This is a list that could be needed for additonal phisics components + +\begin{itemize} + \item Gravity + \begin{itemize} + \item Rigidbody (for mass, gravity scale, etc.) + \item Transform (to modify position based on gravity) + \end{itemize} + + \item Directional Force (e.g., wind or gravity in a specific direction) + \begin{itemize} + \item ForceComponent (for direction and magnitude of the force) + \item Rigidbody (for mass and velocity affected by force) + \item Transform (to update position based on force) + \end{itemize} + + \item Collision (detection + handling) + \begin{itemize} + \item Rigidbody (for collision detection mode and velocity handling) + \item ColliderComponent (defines the shape and behavior of the collider, like bounce) + \item Transform (for object position, rotation updates) + \end{itemize} + + \item Player Movement + \begin{itemize} + \item MovementComponent (for handling player input and movement speed) + \item Rigidbody (to handle physics-based movement, like velocity changes) + \item Transform (to apply movement to the object's position) + \end{itemize} + + \item Bounce (elastic collisions) + \begin{itemize} + \item Rigidbody (for bounce coefficient and velocity adjustments) + \item ColliderComponent (to detect collisions and calculate bounce) + \item Transform (to adjust position after bouncing) + \end{itemize} + + \item Rotation (torque or angular forces) + \begin{itemize} + \item Rigidbody (for rotational inertia and angular velocity) + \item Transform (to apply rotation to the object) + \end{itemize} + + \item Directional Force (e.g., explosions, pushing) + \begin{itemize} + \item ForceComponent (to apply the force in a direction with a magnitude) + \item Rigidbody (for velocity changes due to the force) + \item Transform (to update position based on the force) + \end{itemize} + + \item Particles (e.g., smoke, explosions) + \begin{itemize} + \item ParticleComponent (to define particle effects like lifetime, velocity) + \item Transform (to emit particles from the object’s position) + \end{itemize} +\end{itemize} + + +1. Input Processing +2. Run Scripts (custom logic, AI, player input, etc.) +3. Apply Forces (gravity, directional forces, user-applied forces) +4. Calculate Movement (update positions based on velocity) +5. Collision Detection and Resolution +6. Post-Collision Adjustments (e.g., friction, constraints) + + \subsection{Conclusion} More components need te be created for both EC and ECS with the diagram provided by the customer. With ECS having the benefit of creating a world where all dynamic object can have a force they interact with. A physics system has the benefit that all physics functionalities are located within one system instead in each component. The flow of Physics updates can be change within the physics system instead of in the gameloop itself. -- cgit v1.2.3 From dda9f9b9eb5d46e240cd801643a5a73567749073 Mon Sep 17 00:00:00 2001 From: Jaro Date: Sat, 26 Oct 2024 19:45:22 +0200 Subject: time-update --- time.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/time.txt b/time.txt index 7fde818..b4c34e6 100644 --- a/time.txt +++ b/time.txt @@ -292,5 +292,11 @@ jaro: 2024-10-11 30m weekly update jaro: 2024-10-14 2h knowledge sharing jaro: 2024-10-14 1h30m project meeting jaro: 2024-10-17 1h project discussion - +jaro: 2024-10-19 15m weeklyupdate +jaro: 2024-10-20 3h components, physics,collision systems (design en onderzoek) +jaro: 2024-10-23 1h30m samenvoegen collision,physics en rendering. +jaro: 2024-10-24 1h20 project meeting +jaro: 2024-10-24 3h30m physics / collision (physics en collision detection) +jaro: 2024-10-24 1h static collision handeling +jaro: 2024-10-25 2h collision handeling + onderzoek collision event unity # vim:ft=cfg -- cgit v1.2.3 From 9a8842f38e63e7562eb5cb6e411451fa16ca8101 Mon Sep 17 00:00:00 2001 From: Jaro Date: Sat, 26 Oct 2024 19:54:23 +0200 Subject: update-time --- time.txt | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/time.txt b/time.txt index b4c34e6..58206e0 100644 --- a/time.txt +++ b/time.txt @@ -293,10 +293,15 @@ jaro: 2024-10-14 2h knowledge sharing jaro: 2024-10-14 1h30m project meeting jaro: 2024-10-17 1h project discussion jaro: 2024-10-19 15m weeklyupdate -jaro: 2024-10-20 3h components, physics,collision systems (design en onderzoek) -jaro: 2024-10-23 1h30m samenvoegen collision,physics en rendering. -jaro: 2024-10-24 1h20 project meeting -jaro: 2024-10-24 3h30m physics / collision (physics en collision detection) +jaro: 2024-10-20 3h components + physics + collision systems +jaro: 2024-10-23 1h30m samenvoegen collision + physics en rendering +jaro: 2024-10-24 1h20m project meeting +jaro: 2024-10-24 3h30m physics and collision jaro: 2024-10-24 1h static collision handeling -jaro: 2024-10-25 2h collision handeling + onderzoek collision event unity +jaro: 2024-10-25 2h collision handeling and onderzoek collision event unity + + + + + # vim:ft=cfg -- cgit v1.2.3 From 0f1e2c876fe550862cb1201bf5cba9dc95707324 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Sun, 27 Oct 2024 19:34:53 +0100 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index d7e00b1..ef11729 100644 --- a/time.txt +++ b/time.txt @@ -86,6 +86,7 @@ loek: 2024-10-24 30m review :: PR review (merge only, #8 and #11) loek: 2024-10-25 30m implementation :: scripting interface loek: 2024-10-25 20m review :: PR review (+errands, merge only, #12 and #13) loek: 2024-10-26 3h20m implementation :: save manager +loek: 2024-10-27 4h implementation :: save manager max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From a819194e10c8afd9108fa102f4c105b0556829f2 Mon Sep 17 00:00:00 2001 From: Max-001 <80035972+Max-001@users.noreply.github.com> Date: Tue, 29 Oct 2024 17:26:10 +0100 Subject: Added tasks --- time.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/time.txt b/time.txt index fdae334..685cc37 100644 --- a/time.txt +++ b/time.txt @@ -126,6 +126,10 @@ max: 2024-10-16 30m investigated whether or not EnTT can handle multiple inherit max: 2024-10-16 3h rethinked scripting (to avoid mutliple inheritance) max: 2024-10-16 20m added new scripting idea to ecs-homemade max: 2024-10-17 1h thirteenth project meeting +max: 2024-10-24 2h10m fourteenth project meeting +max: 2024-10-25 3h started researching Scenes and Replay +max: 2024-10-29 2h worked on UIObjects and Camera +max: 2024-10-29 3h15m worked on Metadata Component, Camera and Scenes wouter: 2024-09-02 1h project meeting :: project kickoff wouter: 2024-09-02 45m project meeting -- cgit v1.2.3 From 9c9c7a9658655976e761ee8f97697ad7de10ec8f Mon Sep 17 00:00:00 2001 From: Jaro Date: Tue, 29 Oct 2024 21:11:58 +0100 Subject: removed force --- figs.drawio | 44 +++----------------------------------------- 1 file changed, 3 insertions(+), 41 deletions(-) diff --git a/figs.drawio b/figs.drawio index 5e6fc7a..7d04108 100644 --- a/figs.drawio +++ b/figs.drawio @@ -736,7 +736,7 @@ - + @@ -1523,20 +1523,6 @@ - - - - - - - - - - - - - - @@ -1547,23 +1533,13 @@ - - - - - - - - - - - + @@ -1577,21 +1553,7 @@ - - - - - - - - - - - - - - - + -- cgit v1.2.3 From 04237758d57884e3dea44720bcda373ede89b1d0 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Tue, 29 Oct 2024 21:51:22 +0100 Subject: remove dependency on plantuml bundled files --- img/facade-audio.puml | 2 +- img/theme.ipuml | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/img/facade-audio.puml b/img/facade-audio.puml index d3e732b..60af60f 100644 --- a/img/facade-audio.puml +++ b/img/facade-audio.puml @@ -1,5 +1,5 @@ @startuml -!include ../img/theme.ipuml +!include theme.ipuml skinparam Linetype ortho package crepe { diff --git a/img/theme.ipuml b/img/theme.ipuml index ae3b1c7..81391e2 100644 --- a/img/theme.ipuml +++ b/img/theme.ipuml @@ -1,6 +1,14 @@ ' vim:ft=plantuml -!theme plain + + skinparam ClassAttributeIconSize 0 skinparam ClassFontStyle bold skinparam DefaultFontName Inter -- cgit v1.2.3 From 7c34b826719a9c89cebd126164bc98b99579d49e Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Tue, 29 Oct 2024 22:06:54 +0100 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index ef11729..511cfd4 100644 --- a/time.txt +++ b/time.txt @@ -87,6 +87,7 @@ loek: 2024-10-25 30m implementation :: scripting interface loek: 2024-10-25 20m review :: PR review (+errands, merge only, #12 and #13) loek: 2024-10-26 3h20m implementation :: save manager loek: 2024-10-27 4h implementation :: save manager +loek: 2024-10-29 10m tooling :: documentation (fix plantuml theme errors) max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From f1f70d5ae70c5cbcef9c19edc28af634a3289acb Mon Sep 17 00:00:00 2001 From: max-001 Date: Wed, 30 Oct 2024 09:22:03 +0100 Subject: Added figs.drawio from jaro/design --- figs.drawio | 412 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 371 insertions(+), 41 deletions(-) diff --git a/figs.drawio b/figs.drawio index 5082752..2a2cb54 100644 --- a/figs.drawio +++ b/figs.drawio @@ -1,4 +1,4 @@ - + @@ -736,7 +736,7 @@ - + @@ -1068,7 +1068,7 @@ - + @@ -1094,7 +1094,7 @@ - + @@ -1108,21 +1108,24 @@ - + + + + - + - + - + @@ -1132,14 +1135,17 @@ + + + - + - + - + @@ -1156,7 +1162,7 @@ - + @@ -1169,11 +1175,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -1243,7 +1285,7 @@ - + @@ -1257,7 +1299,7 @@ - + @@ -1266,10 +1308,13 @@ - + - + + + + @@ -1282,8 +1327,8 @@ - - + + @@ -1354,12 +1399,12 @@ - + - - + + - + @@ -1368,27 +1413,27 @@ - + - - + + - - + + - - + + - - + + @@ -1397,8 +1442,7 @@ - - + @@ -1407,7 +1451,8 @@ - + + @@ -1416,7 +1461,7 @@ - + @@ -1453,7 +1498,7 @@ - + @@ -1486,20 +1531,305 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + -- cgit v1.2.3 From 8be364d25a0d90ee264cc39b3bf9ef61d4c1c339 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Wed, 30 Oct 2024 10:43:08 +0100 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index c23e53a..03e83d3 100644 --- a/time.txt +++ b/time.txt @@ -88,6 +88,7 @@ loek: 2024-10-25 20m review :: PR review (+errands, merge only, #12 and #13) loek: 2024-10-26 3h20m implementation :: save manager loek: 2024-10-27 4h implementation :: save manager loek: 2024-10-29 10m tooling :: documentation (fix plantuml theme errors) +loek: 2024-10-30 30m project meeting (min/max component count constraints) max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From 32709ea7a80a0c9499d1ff7aecc817a256bfcb0e Mon Sep 17 00:00:00 2001 From: max-001 Date: Wed, 30 Oct 2024 11:25:53 +0100 Subject: Modified class diagram --- figs.drawio | 727 ++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 408 insertions(+), 319 deletions(-) diff --git a/figs.drawio b/figs.drawio index 2a2cb54..79be325 100644 --- a/figs.drawio +++ b/figs.drawio @@ -736,41 +736,12 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -783,23 +754,24 @@ - + - - + + - + + - + - + @@ -807,164 +779,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - - - - + + - - + - - - - - - - - - - - - - - - - - - @@ -975,19 +810,19 @@ - + - + - + - + @@ -1031,7 +866,7 @@ - + @@ -1045,40 +880,43 @@ - + - + + + + - + - + - + - + - + - + - + - + @@ -1087,10 +925,10 @@ - + - + @@ -1115,7 +953,7 @@ - + @@ -1135,7 +973,7 @@ - + @@ -1145,24 +983,24 @@ - + - - + + - - + + - + - - + + - + @@ -1175,50 +1013,50 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1228,18 +1066,18 @@ - + - + - + - + @@ -1260,52 +1098,55 @@ - + + + + - + - + - + - - + + - - + + - + - + - + - + - + - + @@ -1322,13 +1163,13 @@ - + - - + + @@ -1337,41 +1178,41 @@ - + - - + + - + - + - + - + - + - + @@ -1380,12 +1221,12 @@ - + - + @@ -1404,7 +1245,7 @@ - + @@ -1413,7 +1254,8 @@ - + + @@ -1442,7 +1284,8 @@ - + + @@ -1451,8 +1294,8 @@ - - + + @@ -1461,7 +1304,8 @@ - + + @@ -1479,31 +1323,22 @@ - - - - - - - - - - - - - - - + - - + + + + + + + @@ -1525,8 +1360,13 @@ - - + + + + + + + @@ -1536,106 +1376,355 @@ - + - + - + - + - + - + - + - + - + - + - + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 29543b416e98b2842661609251db0048d5c74e03 Mon Sep 17 00:00:00 2001 From: max-001 Date: Wed, 30 Oct 2024 11:58:26 +0100 Subject: Modified class diagram --- figs.drawio | 327 +++++++++++++++++++++++++++++++----------------------------- 1 file changed, 170 insertions(+), 157 deletions(-) diff --git a/figs.drawio b/figs.drawio index 79be325..19cdb80 100644 --- a/figs.drawio +++ b/figs.drawio @@ -736,12 +736,12 @@ - + - + @@ -756,11 +756,11 @@ - - + + - - + + @@ -796,7 +796,7 @@ - + @@ -806,7 +806,7 @@ - + @@ -826,7 +826,7 @@ - + @@ -849,7 +849,7 @@ - + @@ -866,7 +866,7 @@ - + @@ -880,7 +880,7 @@ - + @@ -897,16 +897,16 @@ - + - + - + - + @@ -932,7 +932,7 @@ - + @@ -946,7 +946,7 @@ - + @@ -963,7 +963,7 @@ - + @@ -983,7 +983,7 @@ - + @@ -1000,7 +1000,7 @@ - + @@ -1056,7 +1056,7 @@ - + @@ -1073,7 +1073,7 @@ - + @@ -1105,7 +1105,7 @@ - + @@ -1123,53 +1123,54 @@ - - + + - + - + - - + + - + - + - - + + - + + - + - - + + - - + + @@ -1180,53 +1181,53 @@ - - + + - - + + - + - - + + - + - + - - + + - + - + - - + + - + @@ -1242,75 +1243,75 @@ - - + + - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + @@ -1325,63 +1326,75 @@ - - + + - + - - + + - - + + - - + + - + + + + + + + + + + + + + - - + + - - + + - - + + - - + + - + - - + + - + - + @@ -1416,7 +1429,7 @@ - + @@ -1446,17 +1459,17 @@ - - + + - + - - + + @@ -1466,10 +1479,10 @@ - - + + - + @@ -1479,7 +1492,7 @@ - + @@ -1500,29 +1513,29 @@ - - + + - + - - + + - + - + - + @@ -1539,7 +1552,7 @@ - + @@ -1556,7 +1569,7 @@ - + @@ -1583,39 +1596,39 @@ - - + + - - + + - - + + - - + + - - + + - + - - + + - + @@ -1626,20 +1639,20 @@ - - + + - + - + - + @@ -1665,7 +1678,7 @@ - + @@ -1686,19 +1699,19 @@ - - + + - + - - + + - + @@ -1709,11 +1722,11 @@ - - + + - - + + -- cgit v1.2.3 From 020bc3f18bdf75cbbee2dfe0f36958c2970910d5 Mon Sep 17 00:00:00 2001 From: Max-001 <80035972+Max-001@users.noreply.github.com> Date: Wed, 30 Oct 2024 11:59:41 +0100 Subject: Added tasks --- time.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/time.txt b/time.txt index d1b525f..6862e38 100644 --- a/time.txt +++ b/time.txt @@ -144,6 +144,9 @@ max: 2024-10-24 2h10m fourteenth project meeting max: 2024-10-25 3h started researching Scenes and Replay max: 2024-10-29 2h worked on UIObjects and Camera max: 2024-10-29 3h15m worked on Metadata Component, Camera and Scenes +max: 2024-10-29 30m installing LaTeX on Linux +max: 2024-10-29 30m discussing paricles/physics/colliders with Jaro +max: 2024-10-30 4h refacting class diagram wouter: 2024-09-02 1h project meeting :: project kickoff wouter: 2024-09-02 45m project meeting -- cgit v1.2.3 From 186d6dd8c66052977d1c5e8d9e73cc43ceed313b Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Wed, 30 Oct 2024 12:13:18 +0100 Subject: cleanup research.tex --- research.tex | 119 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 60 insertions(+), 59 deletions(-) diff --git a/research.tex b/research.tex index 7502329..6853d5f 100644 --- a/research.tex +++ b/research.tex @@ -664,71 +664,72 @@ because the total forces can be calcualted ones and then applied to all dynamic entities. \subsubsection{Components physics} + This is a list that could be needed for additonal phisics components \begin{itemize} - \item Gravity - \begin{itemize} - \item Rigidbody (for mass, gravity scale, etc.) - \item Transform (to modify position based on gravity) - \end{itemize} - - \item Directional Force (e.g., wind or gravity in a specific direction) - \begin{itemize} - \item ForceComponent (for direction and magnitude of the force) - \item Rigidbody (for mass and velocity affected by force) - \item Transform (to update position based on force) - \end{itemize} - - \item Collision (detection + handling) - \begin{itemize} - \item Rigidbody (for collision detection mode and velocity handling) - \item ColliderComponent (defines the shape and behavior of the collider, like bounce) - \item Transform (for object position, rotation updates) - \end{itemize} - - \item Player Movement - \begin{itemize} - \item MovementComponent (for handling player input and movement speed) - \item Rigidbody (to handle physics-based movement, like velocity changes) - \item Transform (to apply movement to the object's position) - \end{itemize} - - \item Bounce (elastic collisions) - \begin{itemize} - \item Rigidbody (for bounce coefficient and velocity adjustments) - \item ColliderComponent (to detect collisions and calculate bounce) - \item Transform (to adjust position after bouncing) - \end{itemize} - - \item Rotation (torque or angular forces) - \begin{itemize} - \item Rigidbody (for rotational inertia and angular velocity) - \item Transform (to apply rotation to the object) - \end{itemize} - - \item Directional Force (e.g., explosions, pushing) - \begin{itemize} - \item ForceComponent (to apply the force in a direction with a magnitude) - \item Rigidbody (for velocity changes due to the force) - \item Transform (to update position based on the force) - \end{itemize} - - \item Particles (e.g., smoke, explosions) - \begin{itemize} - \item ParticleComponent (to define particle effects like lifetime, velocity) - \item Transform (to emit particles from the object’s position) - \end{itemize} -\end{itemize} + \item Gravity + \begin{itemize} + \item Rigidbody (for mass, gravity scale, etc.) + \item Transform (to modify position based on gravity) + \end{itemize} + + \item Directional Force (e.g.~wind or gravity in a specific direction) + \begin{itemize} + \item ForceComponent (for direction and magnitude of the force) + \item Rigidbody (for mass and velocity affected by force) + \item Transform (to update position based on force) + \end{itemize} + + \item Collision (detection + handling) + \begin{itemize} + \item Rigidbody (for collision detection mode and velocity handling) + \item ColliderComponent (defines the shape and behavior of the collider, like bounce) + \item Transform (for object position, rotation updates) + \end{itemize} + + \item Player Movement + \begin{itemize} + \item MovementComponent (for handling player input and movement speed) + \item Rigidbody (to handle physics-based movement, like velocity changes) + \item Transform (to apply movement to the object's position) + \end{itemize} + \item Bounce (elastic collisions) + \begin{itemize} + \item Rigidbody (for bounce coefficient and velocity adjustments) + \item ColliderComponent (to detect collisions and calculate bounce) + \item Transform (to adjust position after bouncing) + \end{itemize} -1. Input Processing -2. Run Scripts (custom logic, AI, player input, etc.) -3. Apply Forces (gravity, directional forces, user-applied forces) -4. Calculate Movement (update positions based on velocity) -5. Collision Detection and Resolution -6. Post-Collision Adjustments (e.g., friction, constraints) + \item Rotation (torque or angular forces) + \begin{itemize} + \item Rigidbody (for rotational inertia and angular velocity) + \item Transform (to apply rotation to the object) + \end{itemize} + \item Directional Force (e.g.~explosions, pushing) + \begin{itemize} + \item ForceComponent (to apply the force in a direction with a magnitude) + \item Rigidbody (for velocity changes due to the force) + \item Transform (to update position based on the force) + \end{itemize} + + \item Particles (e.g.~smoke, explosions) + \begin{itemize} + \item ParticleComponent (to define particle effects like lifetime, velocity) + \item Transform (to emit particles from the object’s position) + \end{itemize} +\end{itemize} + +\begin{enumerate} + \item Input Processing + \item Run Scripts (custom logic, AI, player input, etc.) + \item Apply Forces (gravity, directional forces, user-applied forces) + \item Calculate Movement (update positions based on velocity) + \item Collision Detection and Resolution + \item Post-Collision Adjustments (e.g.~friction, constraints) +\end{enumerate} \subsection{Conclusion} -- cgit v1.2.3 From d508cb6687b7178d7e78fe4776544ae653728196 Mon Sep 17 00:00:00 2001 From: max-001 Date: Wed, 30 Oct 2024 13:25:02 +0100 Subject: Fix --- figs.drawio | 136 +++++++++++++++++++++++++++--------------------------------- 1 file changed, 61 insertions(+), 75 deletions(-) diff --git a/figs.drawio b/figs.drawio index 19cdb80..c18d13d 100644 --- a/figs.drawio +++ b/figs.drawio @@ -736,7 +736,7 @@ - + @@ -779,20 +779,6 @@ - - - - - - - - - - - - - - @@ -887,7 +873,7 @@ - + @@ -1101,7 +1087,7 @@ - + @@ -1358,19 +1344,19 @@ - + - + - + - + @@ -1491,27 +1477,27 @@ - + - + - + - + - + - + - + @@ -1520,7 +1506,7 @@ - + @@ -1529,72 +1515,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1604,7 +1590,7 @@ - + @@ -1614,7 +1600,7 @@ - + @@ -1623,7 +1609,7 @@ - + @@ -1632,12 +1618,12 @@ - + - + @@ -1646,58 +1632,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1706,7 +1692,7 @@ - + @@ -1715,12 +1701,12 @@ - + - + @@ -1730,12 +1716,12 @@ - + - + -- cgit v1.2.3 From 4a3d3ac37e506a8c29653d57d6514c625491583c Mon Sep 17 00:00:00 2001 From: max-001 Date: Wed, 30 Oct 2024 14:36:58 +0100 Subject: Added SceneManager to the diagram --- figs.drawio | 184 +++++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 151 insertions(+), 33 deletions(-) diff --git a/figs.drawio b/figs.drawio index c18d13d..68ad6c9 100644 --- a/figs.drawio +++ b/figs.drawio @@ -736,23 +736,29 @@ - + - - + + - - + + - + - - + + + + + + + + @@ -766,12 +772,12 @@ - + - + @@ -852,7 +858,7 @@ - + @@ -866,7 +872,7 @@ - + @@ -883,13 +889,13 @@ - + - + - + @@ -928,7 +934,7 @@ - + @@ -969,7 +975,7 @@ - + @@ -982,9 +988,12 @@ - + + + + @@ -1246,13 +1255,13 @@ - + - - + + @@ -1297,7 +1306,7 @@ - + @@ -1534,7 +1543,7 @@ - + @@ -1664,24 +1673,24 @@ - + - - + + - + - - + + - - + + - - + + @@ -1726,6 +1735,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 80519fdfcf2ddb89e647704f7778c3c91a453eb4 Mon Sep 17 00:00:00 2001 From: max-001 Date: Wed, 30 Oct 2024 16:04:09 +0100 Subject: Modified class diagram --- figs.drawio | 2841 +++++++++++++++++++++++++++++++---------------------------- 1 file changed, 1493 insertions(+), 1348 deletions(-) diff --git a/figs.drawio b/figs.drawio index 68ad6c9..d4d5d3c 100644 --- a/figs.drawio +++ b/figs.drawio @@ -1,2083 +1,2228 @@ - - - + + + - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - + + - - - - + + - - + + - - + + - - + + - + - - + + - + + - + - + - + - + - + - - + + + + + + + + + + + + + + - + - + - + - + - + - - - - - + + + - - - - + + - - - - + + - - - - + + - - - - - - + + - - + + + + + + + + - + - - + + - - + + - + - - + + - + - + + + + + + + + + + + + + + + - + - + - - + + + + + + + + + + + - + - + - + - + - - + + - - + + - + - - - - - + + + - - - - - - + + - - - - - - + + - - - - - - - - - + + - - - + + + - - - - + + - - - - + + - - + + + + + + + + - + - + - + - + - + - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - + - - - - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + - - - - - - - - - - - - - + + - - + + - + - + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + - - - - - + + - - + + - - + + - - + + - - - + + + + + + + - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + - - + - + - + - + - - + + - - + + - + - + - + - - + + - - + + - + - + - + - - + + - - + + - + - + - + - - + + - - + - + - + - + - - + + - - + - + - + - + - - + + - + - + - + - + - - + + - - + - + - - - + + + + + + - + - - - + + + + + + - + - - - + + + + + + - + - - - + + + + + + - + - - + + - - + + - + - - + + - + + - - + + - + - + - + - - - + + + + + + + - - - - - - - - + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + - + + + + - - + + - - - + - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + - - - - - - - - + + + + - + - + - + + + - + - + - + - - + + - + - + - + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + - - + + - + - - - - - - - - + + - + - - + + - - + + - + - - + + - + - - + + - - + + - - - - + + - - + + - - + + - - + + - - + + + + + + + + + - - + + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - - + + - - + + - + - - + + - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - - + + + + + + + - - + + + + + + + + - - + + + + - - + + + + + + + + + - - + + + + - - + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + + + + + + + + + - - + + + + - - + + + + - - + + - - + + - - + + - - + + + + + + + + + - - + + + + + + + - - + + - - + + + + + + + + + - - + + - - + + - - + + + + + + + + + - - + + + + + + + + + - - + + - - + + + + + + + + + - - + + - - + + + + + + + + + - - + + + + + + + + + + - - + + - - + + - - + + - - + + - - + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - + + - - + + - - + + - - - - - + + - - + + - - + + - - - - + + + + - + + - - - + + + - - - - + + + + - + + - - - - - - - - - - - - - + + + - - - - + + - - - - + + + + - - + + - - - - - - - - - + + + + - - + - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - + + - - - - + + - - - - - - - - + + - - - - + + - - - - + + - + - - - - + + - - - - + + - - - - - - - - + + - - - - - - - - - + + - - - - - - - - + + + - - - - - - - - - + + - - - - - - - - - + + - - - - - - - - - + + - - - - - - - - - + + - - - - + + - - + + - - + + - - + + - - - - - - - - + + - + - - + + - - - - - - - - - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + - + - - + - - + + - - - - + + + + + + + + + + + - + - - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - + + + + + + + + + - - + + + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + - - + + - - + + - + + + + - - - - - + + + - + - - + + + - - - + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + - - + + + + + + + + + + + + - + - + - + - + - + - + - - - - - + + + - - - - - - - + + + - - - + + + - - + + + + + + + + + + + + + + - + - + - + - + - - + + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - - - - - - + + + - + - - - - - - + + + - + - - - - - + + + - + - - + + - + + - - - + + + - - - - - - - + + + - - - + + + - - - + + + - + - + - + - - - - - + + - - + + - - + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - - - - - + + - - - - - - - + + + - - - - + + - - - - - - - - - + + - - - - + + - - - - + + - - + + - - + + - - + + - - + + - - + + + + - - + + - - + + - - - - - - - - - + + - - - - + + - - + + + + + + + + - - + + - - + + - - + + - - - - - - - - - + + - - - - - - - + + - - + + - - - - - - - - + + + + + + - - + + - - + + - - - - - - - - - + + - - - - - - - - + + + - - - - - - - - - - + + - - + + - - + + - - + + + + - - + + - - - - - + + + + + + + + + + + + - - + + - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + + + - - + + - - + + - - + + - - - - - - + + + + + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - - - - - + + + + - - + + + + + + + + + - - + + + + - - + + + + - + + - - + + + + - - + + + + + + + + + - - + + + + - - + + + + + + + + + - - + + + + - - + + + + + + + + + - - + + + + - - + + + + + + + + + - - + + + + - - + + + + + + + + - - + + + + - - + + + + - - + + + + - - + + - - - + + + + + - - + + + + + + - - + + + + + + - - + + + + + + - - + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - + - + - + - - - - - + + + - - - - - - + + - + + + + + + + - - - + + + + + + + + - + - - + + + + + + + -- cgit v1.2.3 From 7a1ba353e49017eba4da6b65be6e9f88740edb9d Mon Sep 17 00:00:00 2001 From: Max-001 <80035972+Max-001@users.noreply.github.com> Date: Wed, 30 Oct 2024 16:27:59 +0100 Subject: Added tasks --- time.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/time.txt b/time.txt index 6862e38..a8c2ae3 100644 --- a/time.txt +++ b/time.txt @@ -147,6 +147,8 @@ max: 2024-10-29 3h15m worked on Metadata Component, Camera and Scenes max: 2024-10-29 30m installing LaTeX on Linux max: 2024-10-29 30m discussing paricles/physics/colliders with Jaro max: 2024-10-30 4h refacting class diagram +max: 2024-10-30 1h50m added SceneManager design to class diagram +max: 2024-10-30 2h added ReplaySystem design to class diagram wouter: 2024-09-02 1h project meeting :: project kickoff wouter: 2024-09-02 45m project meeting -- cgit v1.2.3 From 020c56ce35551fea91101b9e0888ac66f62c0353 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Wed, 30 Oct 2024 16:55:54 +0100 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index 630555d..5237362 100644 --- a/time.txt +++ b/time.txt @@ -89,6 +89,7 @@ loek: 2024-10-26 3h20m implementation :: save manager loek: 2024-10-27 4h implementation :: save manager loek: 2024-10-29 10m tooling :: documentation (fix plantuml theme errors) loek: 2024-10-30 30m project meeting (min/max component count constraints) +loek: 2024-10-24 10m review :: PR review (#40, #41 and #42) max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From 6f15c07552793c247b925a09792b04fa77f55237 Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Wed, 30 Oct 2024 19:33:10 +0100 Subject: design --- .$figs.drawio.bkp | 2650 +++++++++++++++++++++++++++++++++++++++++++++++++++++ figs.drawio | 515 +++++++++-- 2 files changed, 3110 insertions(+), 55 deletions(-) create mode 100644 .$figs.drawio.bkp diff --git a/.$figs.drawio.bkp b/.$figs.drawio.bkp new file mode 100644 index 0000000..32b089c --- /dev/null +++ b/.$figs.drawio.bkp @@ -0,0 +1,2650 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/figs.drawio b/figs.drawio index d4d5d3c..e385c5e 100644 --- a/figs.drawio +++ b/figs.drawio @@ -1,6 +1,6 @@ - + - + @@ -18,10 +18,10 @@ - + - + @@ -69,10 +69,10 @@ - + - + @@ -198,7 +198,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -336,34 +336,28 @@ - + - + - + - + - + - - - - - - - + - + - + @@ -519,7 +513,7 @@ - + @@ -751,24 +745,30 @@ - + - + - + - + + + + + + + - + - + @@ -807,7 +807,7 @@ - + @@ -999,30 +999,30 @@ - + - + - + - + - + - + - + - + @@ -1032,26 +1032,26 @@ - + - + - + - + - + - + @@ -1061,7 +1061,7 @@ - + @@ -1069,10 +1069,10 @@ - + - + @@ -1082,13 +1082,13 @@ - + - + - + @@ -1098,7 +1098,7 @@ - + @@ -1108,10 +1108,10 @@ - + - + @@ -1121,10 +1121,10 @@ - + - + @@ -2228,4 +2228,409 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3 From 3c51c9e866a53a734567fb781b62cbc3da59d199 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Wed, 30 Oct 2024 19:45:32 +0100 Subject: remove trash and update gitignore --- .$figs.drawio.bkp | 2650 ----------------------------------------------------- .gitignore | 1 + 2 files changed, 1 insertion(+), 2650 deletions(-) delete mode 100644 .$figs.drawio.bkp diff --git a/.$figs.drawio.bkp b/.$figs.drawio.bkp deleted file mode 100644 index 32b089c..0000000 --- a/.$figs.drawio.bkp +++ /dev/null @@ -1,2650 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.gitignore b/.gitignore index 74caed0..7b7818a 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ *.nav *.snm *-SAVE-ERROR +*.bkp # output files *.pdf -- cgit v1.2.3 From 969b5d9b25be2b8840b4b6c33e9e4a13c2d7f898 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Thu, 31 Oct 2024 13:00:23 +0100 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index 1b463fa..10bef7e 100644 --- a/time.txt +++ b/time.txt @@ -90,6 +90,7 @@ loek: 2024-10-27 4h implementation :: save manager loek: 2024-10-29 10m tooling :: documentation (fix plantuml theme errors) loek: 2024-10-30 30m project meeting (min/max component count constraints) loek: 2024-10-24 10m review :: PR review (#40, #41 and #42) +loek: 2024-10-31 3h45m project meeting max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From c914e226cf9b21bcb307059ef44ab3ff4b3cb8de Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Thu, 31 Oct 2024 15:39:20 +0100 Subject: add manual plantuml upgrade instructions to readme --- readme.md | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/readme.md b/readme.md index ece6512..6b578fa 100644 --- a/readme.md +++ b/readme.md @@ -11,7 +11,7 @@ snippets for specific formatting. Prerequisites: - A LaTeX distribution that includes XeLaTeX and latexmk -- PlantUML +- PlantUML ([1.2024.7 or later](#plantuml)!) - Python 3 - Fonts (see see [style.md](./style.md) for download links) @@ -33,7 +33,29 @@ additional configuration files for the following editors: - `sources.bib` contains all bibliography entries / references - `glossary.bib` contains all glossary entries +## PlantUML + +To check if your PlantUML version is recent enough, run: +``` +$ plantuml -version +``` + +To upgrade PlantUML manually, download the latest (GPL) \.jar from +[here][plantuml], and overwrite the \.jar file installed by your package +manager: + +``` +$ curl -sLo- https://github.com/plantuml/plantuml/releases/download/v1.2024.7/plantuml-1.2024.7.jar > plantuml.jar +# mv plantuml.jar /usr/share/plantuml/plantuml.jar +``` + +> NOTE: Ubuntu, Debian and Mint all place PlantUML's \.jar file under +> `/usr/share/plantuml/plantuml.jar`, while it's under +> `/usr/share/java/plantuml/plantuml.jar` on Arch. Check the contents of the +> file returned by `command -v plantuml` to confirm this. + [vscode]: https://code.visualstudio.com [latexworkshop]: https://marketplace.visualstudio.com/items?itemName=James-Yu.latex-workshop [vimtex]: https://github.com/lervag/vimtex +[plantuml]: https://plantuml.com/en/download -- cgit v1.2.3 From 4b12d1f1e6dbded47637ef8e2550741882d59329 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Thu, 31 Oct 2024 15:40:27 +0100 Subject: fix admonition format --- readme.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 6b578fa..858d319 100644 --- a/readme.md +++ b/readme.md @@ -49,7 +49,8 @@ $ curl -sLo- https://github.com/plantuml/plantuml/releases/download/v1.2024.7/pl # mv plantuml.jar /usr/share/plantuml/plantuml.jar ``` -> NOTE: Ubuntu, Debian and Mint all place PlantUML's \.jar file under +> [!NOTE] +> Ubuntu, Debian and Mint all place PlantUML's \.jar file under > `/usr/share/plantuml/plantuml.jar`, while it's under > `/usr/share/java/plantuml/plantuml.jar` on Arch. Check the contents of the > file returned by `command -v plantuml` to confirm this. -- cgit v1.2.3