diff --git a/docs/diagrammes/classes/classes.fdb_latexmk b/docs/diagrammes/classes/classes.fdb_latexmk index db07909..b553e6f 100644 --- a/docs/diagrammes/classes/classes.fdb_latexmk +++ b/docs/diagrammes/classes/classes.fdb_latexmk @@ -1,8 +1,8 @@ # Fdb version 3 -["pdflatex"] 1458341063 "classes.tex" "/home/matteo/Développement/projet-cmi/docs/diagrammes/classes/classes.pdf" "classes" 1458341063 +["pdflatex"] 1458342058 "classes.tex" "/home/matteo/Développement/projet-cmi/docs/diagrammes/classes/classes.pdf" "classes" 1458342059 "/dev/null" 1458319343 0 d41d8cd98f00b204e9800998ecf8427e "" "/etc/texmf/web2c/texmf.cnf" 1448651457 1101 af7716885e081ab43982cab7b4672c1a "" - "/home/matteo/Développement/projet-cmi/docs/diagrammes/classes/classes.aux" 1458341063 242 1307d8a02d1e67cd0e2b52e6a2f90ab0 "" + "/home/matteo/Développement/projet-cmi/docs/diagrammes/classes/classes.aux" 1458342059 242 1307d8a02d1e67cd0e2b52e6a2f90ab0 "" "/home/matteo/texmf/tex/latex/tikz-uml/tikz-uml.sty" 1359744139 211430 eac0f9dc7c1f83dd13dd86c58b009eb9 "" "/usr/share/texlive/texmf-dist/fonts/map/fontname/texfonts.map" 1272929888 3287 e6b82fe08f5336d4d5ebc73fb1152e87 "" "/usr/share/texlive/texmf-dist/fonts/tfm/jknappen/ec/ecrm1000.tfm" 1136768653 3584 adb004a0c8e7c46ee66cad73671f37b4 "" @@ -143,6 +143,7 @@ "/usr/share/texmf/fonts/tfm/public/lm/ec-lmr9.tfm" 1254938640 12084 b7f5e4c003de6f57f07c7e9fee73a37c "" "/usr/share/texmf/fonts/tfm/public/lm/ec-lmri9.tfm" 1254938640 17148 ca1ae65757b004f470b8cd636199f6fc "" "/usr/share/texmf/fonts/tfm/public/lm/ec-lmtt9.tfm" 1254938640 1372 a2ff2d4391a2d6bba15b518acb79e80f "" + "/usr/share/texmf/fonts/tfm/public/lm/ec-lmtti10.tfm" 1254938640 1372 0dcee1a56926aed3dd9ded91b7563563 "" "/usr/share/texmf/fonts/tfm/public/lm/lmex10.tfm" 1254938640 992 ce925c9346c7613270a79afbee98c070 "" "/usr/share/texmf/fonts/tfm/public/lm/lmmi5.tfm" 1254938640 1508 198f5b7b99b5769126de3a533f6fc334 "" "/usr/share/texmf/fonts/tfm/public/lm/lmmi6.tfm" 1254938640 1512 94a3fd88c6f27dbd9ecb46987e297a4e "" @@ -157,6 +158,7 @@ "/usr/share/texmf/fonts/type1/public/lm/lmr9.pfb" 1254938640 121065 50bbfa703ce7e11638752ef5a6d120c7 "" "/usr/share/texmf/fonts/type1/public/lm/lmri9.pfb" 1254938640 109598 cb570392cb143ca78182169795feed7a "" "/usr/share/texmf/fonts/type1/public/lm/lmtt9.pfb" 1254938640 108480 ee1de99df36ee0a16b36023b9c9d8a58 "" + "/usr/share/texmf/fonts/type1/public/lm/lmtti10.pfb" 1254938640 98822 859130196f7a6d2d1173200c66afbcff "" "/usr/share/texmf/tex/latex/lm/lmodern.sty" 1256929440 1606 c17281c7cff2bbd7ff0173e1433487ec "" "/usr/share/texmf/tex/latex/lm/omllmm.fd" 1256929440 888 44447a3a3af84a22454ef89500942d93 "" "/usr/share/texmf/tex/latex/lm/omslmsy.fd" 1256929440 805 af340a8260c447aa315cfc740ff0152f "" @@ -167,11 +169,11 @@ "/usr/share/texmf/web2c/texmf.cnf" 1435377840 31349 7675f8adfbe12aae865d340d35423a49 "" "/var/lib/texmf/fonts/map/pdftex/updmap/pdftex.map" 1448651651 1779312 b2f993ff39f888114b7dddf8751f0ae0 "" "/var/lib/texmf/web2c/pdftex/pdflatex.fmt" 1448651758 3845440 b767bcfad02834add06449ca1e913284 "" - "classes.aux" 1458341063 242 1307d8a02d1e67cd0e2b52e6a2f90ab0 "" - "classes.tex" 1457543824 1605 a530e20dcbe7e5739ed4cc25cc5a8215 "" + "classes.aux" 1458342059 242 1307d8a02d1e67cd0e2b52e6a2f90ab0 "" + "classes.tex" 1458342057 1961 853842d45c239f785677c0ad7331b07e "" (generated) - "classes.pdf" + "/home/matteo/Développement/projet-cmi/docs/diagrammes/classes/classes.log" "classes.aux" "classes.log" - "/home/matteo/Développement/projet-cmi/docs/diagrammes/classes/classes.log" "/home/matteo/Développement/projet-cmi/docs/diagrammes/classes/classes.pdf" + "classes.pdf" diff --git a/docs/diagrammes/classes/classes.fls b/docs/diagrammes/classes/classes.fls index 5b15d1d..11ae2ab 100644 --- a/docs/diagrammes/classes/classes.fls +++ b/docs/diagrammes/classes/classes.fls @@ -265,6 +265,7 @@ INPUT /usr/share/texmf/tex/latex/lm/t1lmtt.fd INPUT /usr/share/texmf/tex/latex/lm/t1lmtt.fd INPUT /usr/share/texmf/fonts/tfm/public/lm/ec-lmtt9.tfm INPUT /usr/share/texmf/fonts/tfm/public/lm/ec-lmri9.tfm +INPUT /usr/share/texmf/fonts/tfm/public/lm/ec-lmtti10.tfm INPUT /var/lib/texmf/fonts/map/pdftex/updmap/pdftex.map INPUT /home/matteo/Développement/projet-cmi/docs/diagrammes/classes/classes.aux INPUT /usr/share/texmf/fonts/enc/dvips/lm/lm-ec.enc @@ -272,3 +273,4 @@ INPUT /usr/share/texmf/fonts/type1/public/lm/lmbx9.pfb INPUT /usr/share/texmf/fonts/type1/public/lm/lmr9.pfb INPUT /usr/share/texmf/fonts/type1/public/lm/lmri9.pfb INPUT /usr/share/texmf/fonts/type1/public/lm/lmtt9.pfb +INPUT /usr/share/texmf/fonts/type1/public/lm/lmtti10.pfb diff --git a/docs/diagrammes/classes/classes.log b/docs/diagrammes/classes/classes.log index 961ea0c..73e91b3 100644 --- a/docs/diagrammes/classes/classes.log +++ b/docs/diagrammes/classes/classes.log @@ -1,4 +1,4 @@ -This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=pdflatex 2015.11.27) 18 MAR 2016 23:44 +This is pdfTeX, Version 3.14159265-2.6-1.40.16 (TeX Live 2015/Debian) (preloaded format=pdflatex 2015.11.27) 19 MAR 2016 00:00 entering extended mode restricted \write18 enabled. file:line:error style messages enabled. @@ -832,18 +832,18 @@ File: t1lmtt.fd 2009/10/30 v1.6 Font defs for Latin Modern {/var/lib/texmf/fonts/map/pdftex/updmap/pdftex.map}] (/home/matteo/Développement/projet-cmi/docs/diagrammes/classes/classes.aux) ) Here is how much of TeX's memory you used: - 17990 strings out of 493085 - 381205 string characters out of 6136916 - 515329 words of memory out of 5000000 - 21102 multiletter control sequences out of 15000+600000 - 28970 words of font info for 30 fonts, out of 8000000 for 9000 + 17992 strings out of 493085 + 381237 string characters out of 6136916 + 514760 words of memory out of 5000000 + 21103 multiletter control sequences out of 15000+600000 + 29289 words of font info for 31 fonts, out of 8000000 for 9000 1141 hyphenation exceptions out of 8191 - 62i,9n,84p,443b,807s stack positions out of 5000i,500n,10000p,200000b,80000s -{/usr/share/texmf/fonts/enc/dvips/lm/lm-ec.enc} -Output written on /home/matteo/Développement/projet-cmi/docs/diagrammes/classes/classes.pdf (1 page, 92689 bytes). + 62i,9n,84p,443b,833s stack positions out of 5000i,500n,10000p,200000b,80000s +{/usr/share/texmf/fonts/enc/dvips/lm/lm-ec.enc} +Output written on /home/matteo/Développement/projet-cmi/docs/diagrammes/classes/classes.pdf (1 page, 107789 bytes). PDF statistics: - 52 PDF objects out of 1000 (max. 8388607) - 28 compressed objects within 1 object stream + 56 PDF objects out of 1000 (max. 8388607) + 31 compressed objects within 1 object stream 0 named destinations out of 1000 (max. 500000) 109 words of extra memory for PDF output out of 10000 (max. 10000000) diff --git a/docs/diagrammes/classes/classes.pdf b/docs/diagrammes/classes/classes.pdf index a9ef975..268bde9 100644 Binary files a/docs/diagrammes/classes/classes.pdf and b/docs/diagrammes/classes/classes.pdf differ diff --git a/docs/diagrammes/classes/classes.synctex.gz b/docs/diagrammes/classes/classes.synctex.gz index 3fa129d..d1b84cb 100644 Binary files a/docs/diagrammes/classes/classes.synctex.gz and b/docs/diagrammes/classes/classes.synctex.gz differ diff --git a/docs/diagrammes/classes/classes.tex b/docs/diagrammes/classes/classes.tex index 29146ac..6089bbb 100644 --- a/docs/diagrammes/classes/classes.tex +++ b/docs/diagrammes/classes/classes.tex @@ -9,57 +9,58 @@ \begin{document} \begin{tikzpicture} - \umlclass[y=.5]{Engine}{ - objects : tableau de \texttt{Object}\\ - goLeftKey: booléen\\ - goRightKey : booléen\\ - clock : horloge + \umlclass[x=6]{Engine}{ + clock : horloge\\ + state : \texttt{EngineState} }{ + update() : vide\\ draw() : vide\\ - update() : vide + start() : vide\\ + addObject(objet : \texttt{Object}) : vide } - \umlclass[x=6,y=-1]{State}{ - objects : tableau de \texttt{Object}\\ - goLeftKey: booléen\\ - goRightKey : booléen\\ + \umlclass{EngineState}{ + objects : tableau d'\texttt{Object}\\ + keys : tableau de booléens\\ delta : flottant }{} - \umlabstract[y=-4]{Object}{ - position : vecteur\\ - charge : entier signé - }{ - \umlvirt{draw(fenêtre : Fenêtre) : vide}\\ - \umlvirt{update(état : State) : vide}\\ - \umlvirt{getLayer() : entier}\\ - getPosition() : vecteur\\ - getCharge() : entier signé - } - - \umlabstract[y=-8,x=4]{PhysicsObject}{ + \umlabstract[y=-5.5]{Object}{ + acceleration : vecteur\\ velocity : vecteur\\ - mass : flottant + position : vecteur\\ + mass : flottant\\ + charge : flottant\\ + restitution : flottant\\ + layer : entier }{ - getForces(état : State) : vecteur\\ - update(état : State) : vide + \umlvirt{draw() : vide}\\ + \umlvirt{getForces(état : \texttt{EngineState}) : vecteur}\\ + \umlvirt{update(état : \texttt{EngineState}) : vide}\\ + \umlvirt{getAABB() : boîte}\\ + \umlvirt{getCollisionInfo(balle : \texttt{Ball}) : vecteur, flottant}\\ + \umlvirt{getCollisionInfo(bloc : \texttt{Block}) : vecteur, flottant}\\ + collide(objet : \texttt{Object}) : vide } - \umlclass[y=-11.5,x=4]{Ball}{}{ - draw(fenêtre : Fenêtre) : vide\\ - getForces(état : State) : vecteur\\ - getLayer() : 1 + \umlclass[y=-11,x=4]{Ball}{}{ + getForces(état : \texttt{EngineState}) : vecteur\\ + draw() : vide\\ + getAABB() : boîte\\ + getCollisionInfo(balle : \texttt{Ball}) : vecteur, flottant\\ + getCollisionInfo(bloc : \texttt{Block}) : vecteur, flottant } - \umlclass[y=-8,x=-4]{Block}{}{ - draw(fenêtre : Fenêtre) : vide\\ - update(état : State) : vide\\ - getLayer() : 0 + \umlclass[y=-11,x=-4]{Block}{}{ + draw() : vide\\ + getAABB() : boîte\\ + getCollisionInfo(balle : \texttt{Ball}) : vecteur, flottant\\ + getCollisionInfo(bloc : \texttt{Block}) : vecteur, flottant } - \umlcompo{Engine}{Object} + \umlunicompo{EngineState}{Object} + \umluniassoc{Engine}{EngineState} \umlinherit{Object}{Block} - \umlinherit{Object}{PhysicsObject} - \umlinherit{PhysicsObject}{Ball} + \umlinherit{Object}{Ball} \end{tikzpicture} \end{document}