Merge remote-tracking branch 'origin/master' into max/time

6 files changed, 44 insertions, 18 deletions

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/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 <<irrelevant>>
-	}
+	class Asset <<irrelevant>>
 
 	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 <<Singleton>> {
@@ -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 <<irrelevant>>
 }
 
-' 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 <<irrelevant>> for third-party classes
 hide <<irrelevant>> stereotype
 hide <<irrelevant>> members
+
+' rectangle <<group>>
+hide <<group>> stereotype
+skinparam Rectangle<<group>>BorderStyle dashed
+skinparam Rectangle<<group>>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 bd38743..d25d937 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
@@ -57,6 +57,12 @@ 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
+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
@@ -218,4 +224,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