From 59b2541ea882e360b6ba9c724f238e545a9aa4fe Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Thu, 26 Sep 2024 16:16:31 +0200 Subject: add WIP audio facade --- design.tex | 10 ++++++++++ img/facade-audio.puml | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 design.tex create mode 100644 img/facade-audio.puml diff --git a/design.tex b/design.tex new file mode 100644 index 0000000..bfc49ad --- /dev/null +++ b/design.tex @@ -0,0 +1,10 @@ +\documentclass{projdoc} + +\title{Software Design} + +\begin{document} + +\includepumldiag{img/facade-audio.puml} + +\end{document} + diff --git a/img/facade-audio.puml b/img/facade-audio.puml new file mode 100644 index 0000000..0b0e6ea --- /dev/null +++ b/img/facade-audio.puml @@ -0,0 +1,39 @@ +@startuml +!include theme.ipuml +skinparam Linetype ortho + + +package crepe { + class Sound { + +Sound(crepe::api::Resource) + + +pause() + +play() + +rewind() + +set_volume(float) + +set_looping(bool) + + -_handle : SoLoud::handle + -_paused : bool + } + + class SoundSystem { + + } +} + +package SoLoud { + class Soloud + class WavStream + class Wav +} + +' layout +crepe -[hidden]down- SoLoud +SoLoud.Wav -[hidden]right- SoLoud.WavStream +SoLoud.WavStream -[hidden]right- SoLoud.Soloud + +crepe.Sound ..> (SoLoud.WavStream, SoLoud.Wav) : either +crepe.SoundSystem ..> SoLoud.Soloud + +@enduml -- cgit v1.2.3 From 900805f3d6ddcf31fc3141a460e888c3f90a8099 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Sat, 28 Sep 2024 17:09:52 +0200 Subject: update audio facade class diagram --- img/facade-audio.puml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/img/facade-audio.puml b/img/facade-audio.puml index 0b0e6ea..f760652 100644 --- a/img/facade-audio.puml +++ b/img/facade-audio.puml @@ -24,16 +24,13 @@ package crepe { package SoLoud { class Soloud - class WavStream class Wav } ' layout crepe -[hidden]down- SoLoud -SoLoud.Wav -[hidden]right- SoLoud.WavStream -SoLoud.WavStream -[hidden]right- SoLoud.Soloud -crepe.Sound ..> (SoLoud.WavStream, SoLoud.Wav) : either +crepe.Sound ..> SoLoud.Wav crepe.SoundSystem ..> SoLoud.Soloud @enduml -- cgit v1.2.3 From 44da8d4f03be549ddb8b56941e6ab7c3eaca5eca Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Sun, 29 Sep 2024 17:21:36 +0200 Subject: more facade class diagram --- design.tex | 22 +++++++++++++++++++++- img/facade-audio.puml | 38 +++++++++++++++++++++++++++----------- img/theme.ipuml | 3 +++ 3 files changed, 51 insertions(+), 12 deletions(-) diff --git a/design.tex b/design.tex index dcde483..9d5f999 100644 --- a/design.tex +++ b/design.tex @@ -38,9 +38,29 @@ workflows. \subsection{Audio} +\subsubsection{Library} + \subsubsection{Fa\c{c}ade} -\includepumldiag{img/facade-audio.puml} +\Cref{fig:class-audio-facade} shows a class diagram of the audio fa\c{c}ade. It +contains the following classes: +\begin{description} + \item[SoundSystem] This is a wrapper around the \codeinline{SoLoud::soloud} + `engine' class, and is therefore implemented as a singleton. This ensures the + audio engine is initialized before \codeinline{Sound} is able to use it. + + This class is friends with \codeinline{Sound}, so only \codeinline{Sound} is able + to get the \codeinline{SoundSystem} instance. + \item[Sound] This is a wrapper around the \codeinline{SoLoud::Wav} class, and uses + cr\^epe's \codeinline{api::Resource} class to load an audio sample instead. +\end{description} + +\begin{figure} + \centering + \includepumldiag{img/facade-audio.puml} + \caption{Audio fa\c{c}ade class diagram} + \label{fig:class-audio-facade} +\end{figure} \subsection{Input} diff --git a/img/facade-audio.puml b/img/facade-audio.puml index f760652..b256f47 100644 --- a/img/facade-audio.puml +++ b/img/facade-audio.puml @@ -4,33 +4,49 @@ skinparam Linetype ortho package crepe { - class Sound { - +Sound(crepe::api::Resource) + package api { + class Resource <> + } + class Sound { + +Sound(resource) + -- +pause() +play() +rewind() +set_volume(float) +set_looping(bool) - - -_handle : SoLoud::handle - -_paused : bool + -- + -sample : SoLoud::Wav + -handle : SoLoud::handle + -- + -load(resource) } - class SoundSystem { - + class SoundSystem <> { + -instance() : SoundSystem& <> + -- + -SoundSystem() + -~SoundSystem() + -- + -engine : SoLoud::Soloud } } package SoLoud { - class Soloud - class Wav + class Soloud <> + class Wav <> } ' layout crepe -[hidden]down- SoLoud -crepe.Sound ..> SoLoud.Wav -crepe.SoundSystem ..> SoLoud.Soloud +crepe.Sound --> SoLoud.Wav +crepe.SoundSystem --> SoLoud.Soloud + +crepe.Sound .> crepe.SoundSystem +crepe.SoundSystem .> crepe.Sound + +crepe.Sound .> crepe.api.Resource @enduml diff --git a/img/theme.ipuml b/img/theme.ipuml index 4e3613e..f716ddf 100644 --- a/img/theme.ipuml +++ b/img/theme.ipuml @@ -8,3 +8,6 @@ skinparam Nodesep 25 skinparam Padding 2 skinparam Ranksep 50 skinparam RoundCorner 0 + +hide <> stereotype +hide <> members -- cgit v1.2.3 From 1c6ce7dc4c624b5956a87814d5a7eb37e68d323b Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Tue, 1 Oct 2024 15:29:05 +0200 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index 07c04c6..2583f1a 100644 --- a/time.txt +++ b/time.txt @@ -52,6 +52,7 @@ loek: 2024-09-29 1h55m implementation :: debug logging facilities loek: 2024-09-29 20m implementation :: audio facade loek: 2024-09-29 45m docs :: audio facade design loek: 2024-09-30 1h40m project meeting +loek: 2024-10-01 2h20m review :: feedback & discussing software design max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From f91594111d9af7082444cbd434d2d52e6bd40700 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Tue, 1 Oct 2024 17:57:47 +0200 Subject: rename SoundSystem to SoundContext --- design.tex | 4 ++-- img/facade-audio.puml | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/design.tex b/design.tex index 9d5f999..1e42c03 100644 --- a/design.tex +++ b/design.tex @@ -45,12 +45,12 @@ workflows. \Cref{fig:class-audio-facade} shows a class diagram of the audio fa\c{c}ade. It contains the following classes: \begin{description} - \item[SoundSystem] This is a wrapper around the \codeinline{SoLoud::soloud} + \item[SoundContext] This is a wrapper around the \codeinline{SoLoud::soloud} `engine' class, and is therefore implemented as a singleton. This ensures the audio engine is initialized before \codeinline{Sound} is able to use it. This class is friends with \codeinline{Sound}, so only \codeinline{Sound} is able - to get the \codeinline{SoundSystem} instance. + to get the \codeinline{SoundContext} instance. \item[Sound] This is a wrapper around the \codeinline{SoLoud::Wav} class, and uses cr\^epe's \codeinline{api::Resource} class to load an audio sample instead. \end{description} diff --git a/img/facade-audio.puml b/img/facade-audio.puml index b256f47..6749915 100644 --- a/img/facade-audio.puml +++ b/img/facade-audio.puml @@ -14,8 +14,8 @@ package crepe { +pause() +play() +rewind() - +set_volume(float) - +set_looping(bool) + -volume : float <<+set>> <<+get>> + -looping : bool <<+set>> <<+get>> -- -sample : SoLoud::Wav -handle : SoLoud::handle @@ -23,11 +23,11 @@ package crepe { -load(resource) } - class SoundSystem <> { - -instance() : SoundSystem& <> + class SoundContext <> { + -instance() : SoundContext& <> -- - -SoundSystem() - -~SoundSystem() + -SoundContext() + -~SoundContext() -- -engine : SoLoud::Soloud } @@ -42,10 +42,10 @@ package SoLoud { crepe -[hidden]down- SoLoud crepe.Sound --> SoLoud.Wav -crepe.SoundSystem --> SoLoud.Soloud +crepe.SoundContext --> SoLoud.Soloud -crepe.Sound .> crepe.SoundSystem -crepe.SoundSystem .> crepe.Sound +crepe.Sound .> crepe.SoundContext +crepe.SoundContext .> crepe.Sound crepe.Sound .> crepe.api.Resource -- cgit v1.2.3 From 5b7524a8ef4599f254a1cb980be4dd86ebc0c8bf Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Tue, 1 Oct 2024 17:58:57 +0200 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index 2583f1a..73b2272 100644 --- a/time.txt +++ b/time.txt @@ -53,6 +53,7 @@ loek: 2024-09-29 20m implementation :: audio facade loek: 2024-09-29 45m docs :: audio facade design loek: 2024-09-30 1h40m project meeting loek: 2024-10-01 2h20m review :: feedback & discussing software design +loek: 2024-10-01 30m implementation :: audio facade and API max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From 0aa19d88f9c90c888ec1decdf32a37414b8b300d Mon Sep 17 00:00:00 2001 From: Max-001 <80035972+Max-001@users.noreply.github.com> Date: Wed, 2 Oct 2024 17:14:19 +0200 Subject: Added tasks --- time.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/time.txt b/time.txt index 73b2272..ea20769 100644 --- a/time.txt +++ b/time.txt @@ -88,6 +88,8 @@ max: 2024-09-25 1h wrote email to Bob max: 2024-09-25 2h40m make my own ECS (homemade ECS) max: 2024-09-26 2h eight project meeting max: 2024-09-26 1h wrote email to Bob (after project meeting) +max: 2024-09-30 1h30m nineth project meeting +max: 2024-10-02 6h15m improved own ECS (POC) wouter: 2024-09-02 1h project meeting :: project kickoff wouter: 2024-09-02 45m project meeting @@ -144,7 +146,7 @@ niels: 2024-09-23 2h researching and POC tiled library tmxlite niels: 2024-09-24 2h project Meeting niels: 2024-09-24 45m meeting with Bob niels: 2024-09-25 6h integrate the resource manager spritesheet, tmxlite, texture. -niels: 2024-09-26 2h project meeting +niels: 2024-09-26 2h project meeting jaro: 2024-09-02 1h project meeting :: project kickoff jaro: 2024-09-02 45m project meeting -- cgit v1.2.3 From cf7889e151c05cf6f7f40a470ec113947c11980a Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Thu, 3 Oct 2024 13:43:10 +0200 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index 73b2272..06f4e63 100644 --- a/time.txt +++ b/time.txt @@ -54,6 +54,7 @@ loek: 2024-09-29 45m docs :: audio facade design loek: 2024-09-30 1h40m project meeting loek: 2024-10-01 2h20m review :: feedback & discussing software design loek: 2024-10-01 30m implementation :: audio facade and API +loek: 2024-10-03 1h30m project meeting max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From a8031602cd8a78f5b0d4dfddae3d2ff347ac7a3d Mon Sep 17 00:00:00 2001 From: Max-001 <80035972+Max-001@users.noreply.github.com> Date: Fri, 4 Oct 2024 09:04:36 +0200 Subject: Added tasks --- time.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/time.txt b/time.txt index ea20769..d054786 100644 --- a/time.txt +++ b/time.txt @@ -90,6 +90,8 @@ max: 2024-09-26 2h eight project meeting max: 2024-09-26 1h wrote email to Bob (after project meeting) max: 2024-09-30 1h30m nineth project meeting max: 2024-10-02 6h15m improved own ECS (POC) +max: 2024-10-03 30m tenth project meeting +max: 2024-10-03 1h30m fifth project lesson wouter: 2024-09-02 1h project meeting :: project kickoff wouter: 2024-09-02 45m project meeting -- cgit v1.2.3 From cc81fa71edf1ab7d6d60222c4c9d0c5733cfaac4 Mon Sep 17 00:00:00 2001 From: WBoerenkamps Date: Fri, 4 Oct 2024 10:39:59 +0200 Subject: updated time --- time.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/time.txt b/time.txt index 06f4e63..91a8e30 100644 --- a/time.txt +++ b/time.txt @@ -111,9 +111,16 @@ wouter: 2024-09-18 3h finishing gameloop poc and starting event manager wouter: 2024-09-19 15m project meeting wouter: 2024-09-19 1h30m project meeting wouter: 2024-09-19 45m project meeting -wouter: 2024-09-19 15m docs :: remove versioning wouter: 2024-09-26 2h eight project meeting wouter: 2024-09-26 3h researching event manager +wouter: 2024-09-28 6h researching and developing event poc +wouter: 2024-09-29 3h researching and developing event poc +wouter: 2024-09-30 1h40m project meeting +wouter: 2024-10-03 1h30m discussing event with seger +wouter: 2024-10-03 4h developing event poc +wouter: 2024-10-03 1h30m creating gameloop design +wouter: 2024-10-04 2h developing event poc +wouter: 2024-10-03 1h30m project meeting niels: 2024-09-02 1h project meeting :: project kickoff @@ -145,7 +152,7 @@ niels: 2024-09-23 2h researching and POC tiled library tmxlite niels: 2024-09-24 2h project Meeting niels: 2024-09-24 45m meeting with Bob niels: 2024-09-25 6h integrate the resource manager spritesheet, tmxlite, texture. -niels: 2024-09-26 2h project meeting +niels: 2024-09-26 2h project meeting jaro: 2024-09-02 1h project meeting :: project kickoff jaro: 2024-09-02 45m project meeting -- cgit v1.2.3 From b86248424047b66e4b005b525ca6019754a01c06 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Fri, 4 Oct 2024 12:02:58 +0200 Subject: time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index 06f4e63..d229822 100644 --- a/time.txt +++ b/time.txt @@ -55,6 +55,7 @@ loek: 2024-09-30 1h40m project meeting loek: 2024-10-01 2h20m review :: feedback & discussing software design loek: 2024-10-01 30m implementation :: audio facade and API loek: 2024-10-03 1h30m project meeting +loek: 2024-10-04 15m research :: read others' research max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From a600634464e39095870b1a27ed107941d45f034a Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Fri, 4 Oct 2024 13:10:23 +0200 Subject: uren deze week --- time.txt | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/time.txt b/time.txt index 26156d1..69bf0a0 100644 --- a/time.txt +++ b/time.txt @@ -158,6 +158,19 @@ niels: 2024-09-24 2h project Meeting niels: 2024-09-24 45m meeting with Bob niels: 2024-09-25 6h integrate the resource manager spritesheet, tmxlite, texture. niels: 2024-09-26 2h project meeting +niels: 2024-09-30 1h40m project meeting +niels: 2024-10-01 2h design resource manager and making resource manager singleton +niels: 2024-10-01 1h meeting loek refactoring resource manager +niels: 2024-10-01 1h20m meeting jaro & loek about questions regarding design and ownership pointers +niels: 2024-10-01 45m starting refactoring code after feedback +niels: 2024-10-01 1h30m try implementating library in git submodule. And refactoring code further +niels: 2024-10-02 1h finishing adding git submodule and bugs related to compiling external library +niels: 2024-10-02 4h refacting code further so that textures and spritesheet work and fixing bugs. +niels: 2024-10-04 1h10m project meeting + + + + jaro: 2024-09-02 1h project meeting :: project kickoff jaro: 2024-09-02 45m project meeting -- cgit v1.2.3 From f12f8366f83e8c4adb7d3a681a9298511b6c0a85 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Fri, 4 Oct 2024 13:14:42 +0200 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index 26156d1..ba91190 100644 --- a/time.txt +++ b/time.txt @@ -56,6 +56,7 @@ loek: 2024-10-01 2h20m review :: feedback & discussing software design loek: 2024-10-01 30m implementation :: audio facade and API loek: 2024-10-03 1h30m project meeting loek: 2024-10-04 15m research :: read others' research +loek: 2024-10-04 1h15m project meeting max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From 52273c078f0341c02f5b3a35896b031728f36dda Mon Sep 17 00:00:00 2001 From: Jaro Date: Fri, 4 Oct 2024 16:48:09 +0200 Subject: updated time --- time.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/time.txt b/time.txt index 4494d0a..ca39cc5 100644 --- a/time.txt +++ b/time.txt @@ -210,4 +210,12 @@ jaro: 2024-09-26 2h30m physics research and poc jaro: 2024-09-26 30m preparing meeting jaro: 2024-09-26 2h team meeting jaro: 2024-09-27 45m converting notes +jaro: 2024-09-27 2h30m weeklyupdate + Physics +jaro: 2024-09-30 1h30m project meeting +jaro: 2024-10-01 3h research physics + collisions +jaro: 2024-10-01 1h meeting facade +jaro: 2024-10-01 3h15m research physics + collisions +jaro: 2024-10-01 1h30m Particels poc +jaro: 2024-10-03 2h project meeting + project lesson +jaro: 2024-10-04 1h15m project meeting # vim:ft=cfg -- cgit v1.2.3 From 5fc8183fa4645421819502adda09c4587290965c Mon Sep 17 00:00:00 2001 From: Max-001 <80035972+Max-001@users.noreply.github.com> Date: Fri, 4 Oct 2024 17:43:43 +0200 Subject: Added task --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index 4d4a934..5798f5b 100644 --- a/time.txt +++ b/time.txt @@ -93,6 +93,7 @@ max: 2024-09-30 1h30m nineth project meeting max: 2024-10-02 6h15m improved own ECS (POC) max: 2024-10-03 30m tenth project meeting max: 2024-10-03 1h30m fifth project lesson +max: 2024-10-04 2h20m creating class diagram of ecs-homemade (and researching other possibilities for the ecs-homemade) wouter: 2024-09-02 1h project meeting :: project kickoff wouter: 2024-09-02 45m project meeting -- cgit v1.2.3 From 020062f07c370a5e07fcbe3acbebf795da7ba235 Mon Sep 17 00:00:00 2001 From: Max-001 <80035972+Max-001@users.noreply.github.com> Date: Sat, 5 Oct 2024 12:40:07 +0200 Subject: Added task --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index cb07cff..00a153d 100644 --- a/time.txt +++ b/time.txt @@ -96,6 +96,7 @@ max: 2024-10-02 6h15m improved own ECS (POC) max: 2024-10-03 30m tenth project meeting max: 2024-10-03 1h30m fifth project lesson max: 2024-10-04 2h20m creating class diagram of ecs-homemade (and researching other possibilities for the ecs-homemade) +max: 2024-10-05 2h made memory efficient ecs wouter: 2024-09-02 1h project meeting :: project kickoff wouter: 2024-09-02 45m project meeting -- cgit v1.2.3 From 523793d0fa64acbb9a04403a5c6054941a5296d0 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Sat, 5 Oct 2024 15:00:41 +0200 Subject: cleanup + sync design with crepe `loek/audio` source branch --- img/facade-audio.puml | 23 ++++++++++------------- img/theme.ipuml | 17 +++++++++++++++-- latexmkrc | 2 ++ projdoc.cls | 2 +- time.txt | 1 + 5 files changed, 29 insertions(+), 16 deletions(-) diff --git a/img/facade-audio.puml b/img/facade-audio.puml index 6749915..60af60f 100644 --- a/img/facade-audio.puml +++ b/img/facade-audio.puml @@ -2,14 +2,11 @@ !include theme.ipuml skinparam Linetype ortho - package crepe { - package api { - class Resource <> - } + class Asset <> class Sound { - +Sound(resource) + +Sound(asset) -- +pause() +play() @@ -20,7 +17,7 @@ package crepe { -sample : SoLoud::Wav -handle : SoLoud::handle -- - -load(resource) + -load(asset) } class SoundContext <> { @@ -31,6 +28,11 @@ package crepe { -- -engine : SoLoud::Soloud } + + Sound .> SoundContext + SoundContext .> Sound + + Sound .left> Asset } package SoLoud { @@ -38,15 +40,10 @@ package SoLoud { class Wav <> } -' layout -crepe -[hidden]down- SoLoud - crepe.Sound --> SoLoud.Wav crepe.SoundContext --> SoLoud.Soloud -crepe.Sound .> crepe.SoundContext -crepe.SoundContext .> crepe.Sound - -crepe.Sound .> crepe.api.Resource +' LAYOUT +crepe -[hidden]down- SoLoud @enduml diff --git a/img/theme.ipuml b/img/theme.ipuml index f716ddf..ae3b1c7 100644 --- a/img/theme.ipuml +++ b/img/theme.ipuml @@ -1,13 +1,26 @@ +' vim:ft=plantuml + !theme plain skinparam ClassAttributeIconSize 0 skinparam ClassFontStyle bold skinparam DefaultFontName Inter -skinparam DefaultFontSize 14 +skinparam DefaultFontSize 10 skinparam MaxMessageSize 200 skinparam Nodesep 25 -skinparam Padding 2 +' skinparam Padding 0 skinparam Ranksep 50 skinparam RoundCorner 0 +skinparam PackageStyle rectangle +skinparam PackageFontStyle italic + +hide class circle +' class <> for third-party classes hide <> stereotype hide <> members + +' rectangle <> +hide <> stereotype +skinparam Rectangle<>BorderStyle dashed +skinparam Rectangle<>BorderColor gray + diff --git a/latexmkrc b/latexmkrc index d2c3cdc..cdc2001 100644 --- a/latexmkrc +++ b/latexmkrc @@ -12,6 +12,8 @@ $clean_ext .= ' %R.ist %R.xdy bbl run.xml'; 'plan', 'research', 'timerep', + 'design', + 'requirements', ); push @file_not_found, '^Package .* No file `([^\\\']*)\\\''; diff --git a/projdoc.cls b/projdoc.cls index 8a2c05d..b369b18 100644 --- a/projdoc.cls +++ b/projdoc.cls @@ -330,7 +330,7 @@ % adjust scale for puml diagrams \newcommand{\includepumldiag}[1]{% \StrSubstitute{#1}{.puml}{.eps}[\filename]% - \fitimg{\includegraphics[scale=0.6]{\filename}}% + \fitimg{\includegraphics[scale=0.75]{\filename}}% } % prevent page break between two paragraphs diff --git a/time.txt b/time.txt index 4494d0a..bdb122d 100644 --- a/time.txt +++ b/time.txt @@ -57,6 +57,7 @@ loek: 2024-10-01 30m implementation :: audio facade and API loek: 2024-10-03 1h30m project meeting loek: 2024-10-04 15m research :: read others' research loek: 2024-10-04 1h15m project meeting +loek: 2024-10-05 1h10m refacting :: unify unit tests + update code style max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From aa73d0293a1a3e84d6ce18bea967c7d3fa5d0016 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Sun, 6 Oct 2024 17:40:22 +0200 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index 6b33bbc..8d748b7 100644 --- a/time.txt +++ b/time.txt @@ -58,6 +58,7 @@ loek: 2024-10-03 1h30m project meeting loek: 2024-10-04 15m research :: read others' research loek: 2024-10-04 1h15m project meeting loek: 2024-10-05 1h10m refacting :: unify unit tests + update code style +loek: 2024-10-06 3h40m implementation :: scripting interface max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From 443b88053e580a790e2e5e5ecaaf506602bd2ae9 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Mon, 7 Oct 2024 13:44:30 +0200 Subject: update time.txt --- design.tex | 2 +- time.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/design.tex b/design.tex index 1e42c03..7b232fe 100644 --- a/design.tex +++ b/design.tex @@ -52,7 +52,7 @@ contains the following classes: This class is friends with \codeinline{Sound}, so only \codeinline{Sound} is able to get the \codeinline{SoundContext} instance. \item[Sound] This is a wrapper around the \codeinline{SoLoud::Wav} class, and uses - cr\^epe's \codeinline{api::Resource} class to load an audio sample instead. + cr\^epe's \codeinline{Asset} class to load an audio sample instead. \end{description} \begin{figure} diff --git a/time.txt b/time.txt index 8d748b7..4aca083 100644 --- a/time.txt +++ b/time.txt @@ -59,6 +59,7 @@ loek: 2024-10-04 15m research :: read others' research loek: 2024-10-04 1h15m project meeting loek: 2024-10-05 1h10m refacting :: unify unit tests + update code style loek: 2024-10-06 3h40m implementation :: scripting interface +loek: 2024-10-07 2h45m project meeting max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From 0cd06aa8d1cc6ec7a3140459e9acf503bbc164b3 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Tue, 8 Oct 2024 15:41:54 +0200 Subject: update time.txt --- time.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/time.txt b/time.txt index 4aca083..c355164 100644 --- a/time.txt +++ b/time.txt @@ -11,7 +11,7 @@ loek: 2024-09-05 15m repository scaffolding :: additional latex contributing gui loek: 2024-09-05 1h40m project meeting loek: 2024-09-05 1h24m time report script loek: 2024-09-06 55m time report script -loek: 2024-09-09 30m feedback :: niels code style guide +loek: 2024-09-09 30m review :: niels code style guide loek: 2024-09-09 45m review :: wouter research PR#5 loek: 2024-09-09 25m documentation style guide loek: 2024-09-10 1h55m project meeting @@ -60,6 +60,8 @@ loek: 2024-10-04 1h15m project meeting loek: 2024-10-05 1h10m refacting :: unify unit tests + update code style loek: 2024-10-06 3h40m implementation :: scripting interface loek: 2024-10-07 2h45m project meeting +loek: 2024-10-08 40m review :: Max' ECS code +loek: 2024-10-08 5m review :: incorporate feedback and merge PR max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From d3f498235d90112a31c55c4625f719ea09f01217 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Wed, 9 Oct 2024 14:24:36 +0200 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index c355164..28ed423 100644 --- a/time.txt +++ b/time.txt @@ -62,6 +62,7 @@ loek: 2024-10-06 3h40m implementation :: scripting interface loek: 2024-10-07 2h45m project meeting loek: 2024-10-08 40m review :: Max' ECS code loek: 2024-10-08 5m review :: incorporate feedback and merge PR +loek: 2024-10-09 25m review :: feedback discussion + code style update max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From cc474afb533e1c632e6f4a49e7ac0d1e18fdbc79 Mon Sep 17 00:00:00 2001 From: Max-001 <80035972+Max-001@users.noreply.github.com> Date: Wed, 9 Oct 2024 17:14:43 +0200 Subject: Added tasks --- time.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/time.txt b/time.txt index 00a153d..095f5e9 100644 --- a/time.txt +++ b/time.txt @@ -97,6 +97,10 @@ max: 2024-10-03 30m tenth project meeting max: 2024-10-03 1h30m fifth project lesson max: 2024-10-04 2h20m creating class diagram of ecs-homemade (and researching other possibilities for the ecs-homemade) max: 2024-10-05 2h made memory efficient ecs +max: 2024-10-09 2h trying to get clang-format working (ending up upgrading Linux) +max: 2024-10-09 30m reviewing feedback of ecs-homemade +max: 2024-10-09 30m expanding class diagram +max: 2024-10-09 2h50m investigating compiler error options for game programmer when adding too much or too little Components of a specific type wouter: 2024-09-02 1h project meeting :: project kickoff wouter: 2024-09-02 45m project meeting -- cgit v1.2.3 From aa2835cbdbfd71f9d2b6ff74f3243862c2c56ca8 Mon Sep 17 00:00:00 2001 From: Max-001 <80035972+Max-001@users.noreply.github.com> Date: Wed, 9 Oct 2024 17:17:55 +0200 Subject: Added tasks --- time.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/time.txt b/time.txt index 095f5e9..bd38743 100644 --- a/time.txt +++ b/time.txt @@ -97,6 +97,8 @@ max: 2024-10-03 30m tenth project meeting max: 2024-10-03 1h30m fifth project lesson max: 2024-10-04 2h20m creating class diagram of ecs-homemade (and researching other possibilities for the ecs-homemade) max: 2024-10-05 2h made memory efficient ecs +max: 2024-10-07 30m sixth project lesson +max: 2024-10-07 2h15m eleventh project meeting max: 2024-10-09 2h trying to get clang-format working (ending up upgrading Linux) max: 2024-10-09 30m reviewing feedback of ecs-homemade max: 2024-10-09 30m expanding class diagram -- cgit v1.2.3 From 2ff0a4d97024723337e8919bbae4b1a8c94004a4 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Thu, 10 Oct 2024 08:05:20 +0200 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index 28ed423..c8da785 100644 --- a/time.txt +++ b/time.txt @@ -63,6 +63,7 @@ loek: 2024-10-07 2h45m project meeting loek: 2024-10-08 40m review :: Max' ECS code loek: 2024-10-08 5m review :: incorporate feedback and merge PR loek: 2024-10-09 25m review :: feedback discussion + code style update +loek: 2024-10-10 1h05m refacting :: fix build system + update readmes max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From 7e7ee01ba8f9accaecf6349a8504d90cf6ef5164 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Thu, 10 Oct 2024 12:32:16 +0200 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index c8da785..3981aa4 100644 --- a/time.txt +++ b/time.txt @@ -64,6 +64,7 @@ loek: 2024-10-08 40m review :: Max' ECS code loek: 2024-10-08 5m review :: incorporate feedback and merge PR loek: 2024-10-09 25m review :: feedback discussion + code style update loek: 2024-10-10 1h05m refacting :: fix build system + update readmes +loek: 2024-10-10 1h30m project meeting max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From 4ab1b9f7d759649a3622a9e2806562378f9102b7 Mon Sep 17 00:00:00 2001 From: WBoerenkamps Date: Fri, 11 Oct 2024 11:21:16 +0200 Subject: updated time --- time.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/time.txt b/time.txt index 3981aa4..254bc33 100644 --- a/time.txt +++ b/time.txt @@ -133,8 +133,13 @@ wouter: 2024-09-30 1h40m project meeting wouter: 2024-10-03 1h30m discussing event with seger wouter: 2024-10-03 4h developing event poc wouter: 2024-10-03 1h30m creating gameloop design -wouter: 2024-10-04 2h developing event poc wouter: 2024-10-03 1h30m project meeting +wouter: 2024-10-04 2h developing event poc +wouter: 2024-10-04 1h15m project meeting +wouter: 2024-10-07 2h45m project meeting +wouter: 2024-10-08 4h: finishing keyboard and mouse events +wouter: 2024-10-09 3h: intergrating gameloop with events for testing +wouter: 2024-10-10 1h30m project meeting niels: 2024-09-02 1h project meeting :: project kickoff -- cgit v1.2.3 From fcb284af9426e6957b1111cccb8f1cccd346d751 Mon Sep 17 00:00:00 2001 From: heavydemon21 Date: Fri, 11 Oct 2024 13:32:12 +0200 Subject: week 6 time update --- time.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/time.txt b/time.txt index 3981aa4..3b580e6 100644 --- a/time.txt +++ b/time.txt @@ -176,6 +176,11 @@ niels: 2024-10-01 1h30m try implementating library in git submodule. And refacto niels: 2024-10-02 1h finishing adding git submodule and bugs related to compiling external library niels: 2024-10-02 4h refacting code further so that textures and spritesheet work and fixing bugs. niels: 2024-10-04 1h10m project meeting +niels: 2024-10-07 2h45m project meeting +niels: 2024-10-09 2h adding the rendering components to api, and making the rendering system +niels: 2024-10-09 3h researching and programming,debugging the rendersystem +niels: 2024-10-10 3h Test jaro/particels branch to improve sdl functionalities. additionally, researching the necessary components +niels: 2024-10-11 1h30m project meeting -- cgit v1.2.3 From 43067aec84b6c8fd07f8e18754e76ef398363846 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Fri, 11 Oct 2024 13:41:25 +0200 Subject: fix time.txt --- time.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/time.txt b/time.txt index 6764fd7..300a193 100644 --- a/time.txt +++ b/time.txt @@ -145,8 +145,8 @@ wouter: 2024-10-03 1h30m project meeting wouter: 2024-10-04 2h developing event poc wouter: 2024-10-04 1h15m project meeting wouter: 2024-10-07 2h45m project meeting -wouter: 2024-10-08 4h: finishing keyboard and mouse events -wouter: 2024-10-09 3h: intergrating gameloop with events for testing +wouter: 2024-10-08 4h finishing keyboard and mouse events +wouter: 2024-10-09 3h intergrating gameloop with events for testing wouter: 2024-10-10 1h30m project meeting -- cgit v1.2.3 From 74d9aab0fb2717a50fdc46e618be5b3e4a36ae2b Mon Sep 17 00:00:00 2001 From: Jaro Date: Fri, 11 Oct 2024 19:46:25 +0200 Subject: updated time --- time.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/time.txt b/time.txt index 300a193..a75465f 100644 --- a/time.txt +++ b/time.txt @@ -244,4 +244,13 @@ jaro: 2024-10-01 3h15m research physics + collisions jaro: 2024-10-01 1h30m Particels poc jaro: 2024-10-03 2h project meeting + project lesson jaro: 2024-10-04 1h15m project meeting +jaro: 2024-10-07 2h particle system +jaro: 2024-10-07 30m project lesson +jaro: 2024-10-07 2hm project meeting +jaro: 2024-10-07 4h30m particle system +jaro: 2024-10-09 30m particle system with ECS +jaro: 2024-10-10 3h30m particle system with ECS +jaro: 2024-10-10 1h30m project meeting +jaro: 2024-10-11 30m weekly update + # vim:ft=cfg -- cgit v1.2.3 From 2cc43cd24c17b0ec56f01a39b2ac53c15a0a4b88 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Fri, 11 Oct 2024 21:21:13 +0200 Subject: update time.txt descriptions --- time.txt | 76 ++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/time.txt b/time.txt index 300a193..0b68667 100644 --- a/time.txt +++ b/time.txt @@ -1,69 +1,69 @@ -loek: 2024-09-02 1h project meeting :: project kickoff +loek: 2024-09-02 1h project meeting (project kickoff) loek: 2024-09-02 45m project meeting -loek: 2024-09-02 1h4m repository scaffolding -loek: 2024-09-03 25m repository scaffolding -loek: 2024-09-03 1h30m repository scaffolding :: engine repository, unit testing -loek: 2024-09-04 1h30m repository scaffolding :: latex example code +loek: 2024-09-02 1h4m tooling :: repository (scaffolding) +loek: 2024-09-03 25m tooling :: repository (scaffolding) +loek: 2024-09-03 1h30m tooling :: unit testing +loek: 2024-09-04 1h30m tooling :: documentation (add latex example code) loek: 2024-09-04 50m poc :: dynamic library linking test example -loek: 2024-09-04 45m repository scaffolding :: visual studio code latex configuration -loek: 2024-09-04 20m repository scaffolding :: visual studio code cmake configuration -loek: 2024-09-05 15m repository scaffolding :: additional latex contributing guidelines +loek: 2024-09-04 45m tooling :: repository (visual studio code latex configuration) +loek: 2024-09-04 20m tooling :: repository (visual studio code cmake configuration) +loek: 2024-09-05 15m tooling :: documentation (additional latex contributing guidelines) loek: 2024-09-05 1h40m project meeting -loek: 2024-09-05 1h24m time report script -loek: 2024-09-06 55m time report script -loek: 2024-09-09 30m review :: niels code style guide -loek: 2024-09-09 45m review :: wouter research PR#5 -loek: 2024-09-09 25m documentation style guide +loek: 2024-09-05 1h24m tooling :: time report script +loek: 2024-09-06 55m tooling :: time report script +loek: 2024-09-09 30m review :: style (niels code style guide) +loek: 2024-09-09 45m review :: PR review (#5 wouter research) +loek: 2024-09-09 25m docs :: style guide loek: 2024-09-10 1h55m project meeting -loek: 2024-09-10 25m briefing :: watch bob videos -loek: 2024-09-10 5m docs :: update readme -loek: 2024-09-10 12m docs :: add comparison package and more example latex code +loek: 2024-09-10 25m research :: watch bob's videos +loek: 2024-09-10 5m tooling :: repository (update readme) +loek: 2024-09-10 12m tooling :: documentation (comparison package & more example latex code) loek: 2024-09-10 30m project meeting loek: 2024-09-11 1h40m research :: profiling and debugging -loek: 2024-09-12 15m integration :: PR merge +loek: 2024-09-12 15m review :: PR review loek: 2024-09-12 30m research :: audio loek: 2024-09-13 1h10m project meeting -loek: 2024-09-13 45m integration :: PR merge -loek: 2024-09-14 45m refactoring :: clean up LaTeX build system -loek: 2024-09-14 1h10m docs :: requirements -loek: 2024-09-15 2h55m docs :: requirements -loek: 2024-09-16 2h30m docs :: requirements +loek: 2024-09-13 45m review :: PR review +loek: 2024-09-14 45m tooling :: documentation (clean up LaTeX build system) +loek: 2024-09-14 1h10m tooling :: requirements +loek: 2024-09-15 2h55m tooling :: requirements +loek: 2024-09-16 2h30m tooling :: requirements loek: 2024-09-17 1h20m project meeting -loek: 2024-09-17 55m bugs :: cross-platform latexmk filespec -loek: 2024-09-17 2h25m docs :: requirements +loek: 2024-09-17 55m tooling :: documentation (cross-platform latexmk filespec bug) +loek: 2024-09-17 2h25m tooling :: requirements loek: 2024-09-18 2h20m docs :: requirements loek: 2024-09-18 1h50m research :: audio -loek: 2024-09-18 1h05m integration :: PR merge -loek: 2024-09-19 30m docs :: requirements +loek: 2024-09-18 1h05m review :: PR review +loek: 2024-09-19 30m tooling :: requirements loek: 2024-09-19 15m project meeting loek: 2024-09-19 1h30m project meeting loek: 2024-09-19 45m project meeting -loek: 2024-09-19 15m docs :: remove versioning -loek: 2024-09-19 30m PR merge and style guide update +loek: 2024-09-19 15m tooling :: documentation (move to git commit versioning) +loek: 2024-09-19 30m review :: PR review (+ style guide update) loek: 2024-09-22 2h15m docs :: research loek: 2024-09-24 1h45m project meeting -loek: 2024-09-25 3h implementation :: audio facade and API +loek: 2024-09-25 3h implementation :: audio API loek: 2024-09-26 2h project meeting -loek: 2024-09-25 1h20m implementation :: audio facade and API -loek: 2024-09-27 20m PR merge and style guide update -loek: 2024-09-27 55m implementation :: fix library import structure -loek: 2024-09-28 2h20m implementation :: audio facade and API +loek: 2024-09-25 1h20m implementation :: audio API +loek: 2024-09-27 20m review :: PR review (+ style guide update) +loek: 2024-09-27 55m tooling :: build system (fix library import structure) +loek: 2024-09-28 2h20m implementation :: audio API loek: 2024-09-29 1h55m implementation :: debug logging facilities -loek: 2024-09-29 20m implementation :: audio facade -loek: 2024-09-29 45m docs :: audio facade design +loek: 2024-09-29 20m implementation :: audio API +loek: 2024-09-29 45m docs :: design :: audio API loek: 2024-09-30 1h40m project meeting loek: 2024-10-01 2h20m review :: feedback & discussing software design -loek: 2024-10-01 30m implementation :: audio facade and API +loek: 2024-10-01 30m implementation :: audio API loek: 2024-10-03 1h30m project meeting loek: 2024-10-04 15m research :: read others' research loek: 2024-10-04 1h15m project meeting -loek: 2024-10-05 1h10m refacting :: unify unit tests + update code style +loek: 2024-10-05 1h10m tooling :: unit testing (unify unit tests + update code style) loek: 2024-10-06 3h40m implementation :: scripting interface loek: 2024-10-07 2h45m project meeting loek: 2024-10-08 40m review :: Max' ECS code loek: 2024-10-08 5m review :: incorporate feedback and merge PR loek: 2024-10-09 25m review :: feedback discussion + code style update -loek: 2024-10-10 1h05m refacting :: fix build system + update readmes +loek: 2024-10-10 1h05m tooling :: build system (fix libraries + update readmes) loek: 2024-10-10 1h30m project meeting max: 2024-09-02 1h project kickoff -- cgit v1.2.3 From 7af12557fac836ca00ba9de8703f06f3db96aea8 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Sat, 12 Oct 2024 20:55:11 +0200 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index 0b68667..93d502f 100644 --- a/time.txt +++ b/time.txt @@ -65,6 +65,7 @@ loek: 2024-10-08 5m review :: incorporate feedback and merge PR loek: 2024-10-09 25m review :: feedback discussion + code style update loek: 2024-10-10 1h05m tooling :: build system (fix libraries + update readmes) loek: 2024-10-10 1h30m project meeting +loek: 2024-10-12 1h15m implementation :: scripting interface max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From 359e5314ed504ed2dc20df0f9fea4e5f6d7f55b4 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Sun, 13 Oct 2024 20:57:04 +0200 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index b62a38c..5566af0 100644 --- a/time.txt +++ b/time.txt @@ -66,6 +66,7 @@ loek: 2024-10-09 25m review :: feedback discussion + code style update loek: 2024-10-10 1h05m tooling :: build system (fix libraries + update readmes) loek: 2024-10-10 1h30m project meeting loek: 2024-10-12 1h15m implementation :: scripting interface +loek: 2024-10-13 1h implementation :: scripting interface max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From 2706e419bb4d51b891ee6b97eb460d71151b8cab Mon Sep 17 00:00:00 2001 From: Max-001 <80035972+Max-001@users.noreply.github.com> Date: Mon, 14 Oct 2024 14:12:48 +0200 Subject: Added tasks --- time.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/time.txt b/time.txt index fe12cd5..e9e6b2f 100644 --- a/time.txt +++ b/time.txt @@ -111,6 +111,9 @@ max: 2024-10-09 2h trying to get clang-format working (ending up upgrading Linux max: 2024-10-09 30m reviewing feedback of ecs-homemade max: 2024-10-09 30m expanding class diagram max: 2024-10-09 2h50m investigating compiler error options for game programmer when adding too much or too little Components of a specific type +max: 2024-10-13 30m preparing 'kennisdeling' and 'functioneringsgesprek' +max: 2024-10-14 2h kennisdeling +max: 2024-10-14 1h30m twelfth project meeting wouter: 2024-09-02 1h project meeting :: project kickoff wouter: 2024-09-02 45m project meeting -- cgit v1.2.3 From 5589d3ec3d1fa6fca2ed43d56bfb8d05ed3544d5 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Mon, 14 Oct 2024 16:18:20 +0200 Subject: update time.txt --- time.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/time.txt b/time.txt index 5566af0..617f675 100644 --- a/time.txt +++ b/time.txt @@ -67,6 +67,8 @@ loek: 2024-10-10 1h05m tooling :: build system (fix libraries + update readmes) loek: 2024-10-10 1h30m project meeting loek: 2024-10-12 1h15m implementation :: scripting interface loek: 2024-10-13 1h implementation :: scripting interface +loek: 2024-10-14 2h project meeting (class) +loek: 2024-10-14 1h30m project meeting max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From c3004f72518886d064a208a85cf1268dc5a811b3 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Wed, 16 Oct 2024 16:21:26 +0200 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index 617f675..28a7616 100644 --- a/time.txt +++ b/time.txt @@ -69,6 +69,7 @@ loek: 2024-10-12 1h15m implementation :: scripting interface loek: 2024-10-13 1h implementation :: scripting interface loek: 2024-10-14 2h project meeting (class) loek: 2024-10-14 1h30m project meeting +loek: 2024-10-16 1h40m implementation :: scripting interface max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From 798935074f3cf6ddbbc8b554609a8cb022a008a1 Mon Sep 17 00:00:00 2001 From: Max-001 <80035972+Max-001@users.noreply.github.com> Date: Wed, 16 Oct 2024 17:12:53 +0200 Subject: Added tasks --- time.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/time.txt b/time.txt index cce2f9d..4258eca 100644 --- a/time.txt +++ b/time.txt @@ -116,6 +116,9 @@ max: 2024-10-09 2h50m investigating compiler error options for game programmer w max: 2024-10-13 30m preparing 'kennisdeling' and 'functioneringsgesprek' max: 2024-10-14 2h kennisdeling max: 2024-10-14 1h30m twelfth project meeting +max: 2024-10-16 30m investigated whether or not EnTT can handle multiple inheritance +max: 2024-10-16 3h rethinked scripting (to avoid mutliple inheritance) +max: 2024-10-16 20m added new scripting idea to ecs-homemade wouter: 2024-09-02 1h project meeting :: project kickoff wouter: 2024-09-02 45m project meeting -- cgit v1.2.3 From ae7dd2dd9f268f34b1e49b4ce0dcf2a23aa50984 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Wed, 16 Oct 2024 17:24:09 +0200 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index 28a7616..4de8014 100644 --- a/time.txt +++ b/time.txt @@ -70,6 +70,7 @@ loek: 2024-10-13 1h implementation :: scripting interface loek: 2024-10-14 2h project meeting (class) loek: 2024-10-14 1h30m project meeting loek: 2024-10-16 1h40m implementation :: scripting interface +loek: 2024-10-16 40m implementation :: scripting interface max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From e008c6d28cc2ea1beadc9fd9f360dc93d6ce1107 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Wed, 16 Oct 2024 18:33:34 +0200 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index 4de8014..1318a09 100644 --- a/time.txt +++ b/time.txt @@ -71,6 +71,7 @@ loek: 2024-10-14 2h project meeting (class) loek: 2024-10-14 1h30m project meeting loek: 2024-10-16 1h40m implementation :: scripting interface loek: 2024-10-16 40m implementation :: scripting interface +loek: 2024-10-16 20m implementation :: scripting interface max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From ce637a08089287d7aa445e2c4c40fab9199da41a Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Thu, 17 Oct 2024 12:47:46 +0200 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index 1318a09..e870c4b 100644 --- a/time.txt +++ b/time.txt @@ -72,6 +72,7 @@ loek: 2024-10-14 1h30m project meeting loek: 2024-10-16 1h40m implementation :: scripting interface loek: 2024-10-16 40m implementation :: scripting interface loek: 2024-10-16 20m implementation :: scripting interface +loek: 2024-10-17 40m project meeting max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From 96454358e9cbaa13034e436e5a6f58e24d4f32a6 Mon Sep 17 00:00:00 2001 From: Max-001 <80035972+Max-001@users.noreply.github.com> Date: Thu, 17 Oct 2024 16:37:50 +0200 Subject: Added task --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index 4258eca..589151a 100644 --- a/time.txt +++ b/time.txt @@ -119,6 +119,7 @@ max: 2024-10-14 1h30m twelfth project meeting max: 2024-10-16 30m investigated whether or not EnTT can handle multiple inheritance 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 wouter: 2024-09-02 1h project meeting :: project kickoff wouter: 2024-09-02 45m project meeting -- cgit v1.2.3 From 7b43750be38ad205ab1e130930261ca84af714dd Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Thu, 17 Oct 2024 17:17:31 +0200 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index e870c4b..58ead6a 100644 --- a/time.txt +++ b/time.txt @@ -73,6 +73,7 @@ loek: 2024-10-16 1h40m implementation :: scripting interface loek: 2024-10-16 40m implementation :: scripting interface loek: 2024-10-16 20m implementation :: scripting interface loek: 2024-10-17 40m project meeting +loek: 2024-10-17 10m review :: PR review (#5 and #6) max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3 From 4a40378f58160212c0c1c42552a1301e3a498037 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Fri, 18 Oct 2024 11:30:41 +0200 Subject: update time2tex format --- scripts/time2tex.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/scripts/time2tex.py b/scripts/time2tex.py index a5d6802..f3f8de9 100755 --- a/scripts/time2tex.py +++ b/scripts/time2tex.py @@ -11,7 +11,7 @@ def fmt_duration(sec): hour = mins // 60 if hour > 0: - out.append("%02dh" % (hour, )) + out.append("%dh" % (hour, )) mins = mins % 60 out.append("%02dm" % (mins, )) @@ -91,16 +91,13 @@ def fmt_weekly_overview(times): return tex.env('table', tex.join( tex.cmd('centering'), tex.cmd('fitimg', - tex.env('tabular', r'l' + r'r@{~}l' * len(members) + r'@{\qquad}r', tex.join( + tex.env('tabular', r'l' + r'r@{~}l' * len(members) + r'>{\quad}r', tex.join( tex.cmd('toprule'), - tex.tabrule(*[ - tex.cmd('textbf', cell) - for cell in [ - tex.esc("#"), - *tex.explist([ member, "" ] for member in members), - "Subtotal", - ] - ]), + tex.tabrule( + tex.cmd("textbf", tex.esc("#")), + *[tex.cmd("multicolumn", "2", "c", tex.cmd("textbf", member)) for member in members], + tex.cmd("textbf", "Subtotal"), + ), tex.cmd('midrule'), *[ tex.tabrule(*[ -- cgit v1.2.3 From 4760be8c90297857ba5c9cf82e2478039fdc9365 Mon Sep 17 00:00:00 2001 From: Loek Le Blansch Date: Fri, 18 Oct 2024 14:50:41 +0200 Subject: update time.txt --- time.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/time.txt b/time.txt index c55d0c7..301e70f 100644 --- a/time.txt +++ b/time.txt @@ -74,6 +74,7 @@ loek: 2024-10-16 40m implementation :: scripting interface loek: 2024-10-16 20m implementation :: scripting interface loek: 2024-10-17 40m project meeting loek: 2024-10-17 10m review :: PR review (#5 and #6) +loek: 2024-10-18 1h40m docs :: design :: scripting interface max: 2024-09-02 1h project kickoff max: 2024-09-02 45m first project meeting -- cgit v1.2.3