verlag - spelfouten

9 files changed, 51 insertions, 117 deletions

diff --git a/Smoke/Week 2.suo b/Smoke/Week 2.suo
index 83dfb45..30c8b5d 100644
--- a/Smoke/Week 2.suo
+++ b/Smoke/Week 2.suo
diff --git a/Smoke/renderer_gl.c b/Smoke/renderer_gl.c
index 698bcf1..f078294 100644
--- a/Smoke/renderer_gl.c
+++ b/Smoke/renderer_gl.c
@@ -298,7 +298,7 @@ static void render_normals(void)
       glVertex3f(px, py, pz);
       glVertex3f(px +(normal[idx].x * NORMAL_SCALE),
                  py +(normal[idx].y * NORMAL_SCALE),
-                 pz +(normal[idx].z * NORMAL_SCALE * 16));
+                 pz +(normal[idx].z * NORMAL_SCALE));
     }
   }
   glEnable(GL_LIGHTING);
diff --git a/Smoke/report/2IV35-Report.aux b/Smoke/report/2IV35-Report.aux
index 2cf41a8..4e49bb4 100644
--- a/Smoke/report/2IV35-Report.aux
+++ b/Smoke/report/2IV35-Report.aux
@@ -9,4 +9,3 @@
 \@input{chapter7.aux}

 \@input{chapter8.aux}

 \@input{chapter9.aux}

-\@input{chapter10.aux}

diff --git a/Smoke/report/2IV35-Report.log b/Smoke/report/2IV35-Report.log
index e7b0c5c..865baf3 100644
--- a/Smoke/report/2IV35-Report.log
+++ b/Smoke/report/2IV35-Report.log
@@ -1,4 +1,4 @@
-This is pdfeTeX, Version 3.141592-1.21a-2.2 (MiKTeX 2.4) (preloaded format=latex 2007.9.5)  11 JAN 2008 04:16

+This is pdfeTeX, Version 3.141592-1.21a-2.2 (MiKTeX 2.4) (preloaded format=latex 2007.9.5)  11 JAN 2008 09:09

 entering extended mode

 **2IV35-Report.tex

 (2IV35-Report.tex

@@ -136,7 +136,7 @@ File: color.cfg 2003/03/08 v1.0 MiKTeX 'color' configuration
 Package color Info: Driver file: pdftex.def on input line 125.

 ) (2IV35-Report.aux (toc.aux)

 (chapter1.aux) (chapter2.aux) (chapter3.aux) (chapter4.aux) (chapter5.aux)

-(chapter6.aux) (chapter7.aux) (chapter8.aux) (chapter9.aux) (chapter10.aux))

+(chapter6.aux) (chapter7.aux) (chapter8.aux) (chapter9.aux))

 LaTeX Font Info:    Checking defaults for OML/cmm/m/it on input line 8.

 LaTeX Font Info:    ... okay on input line 8.

 LaTeX Font Info:    Checking defaults for T1/cmr/m/n on input line 8.

@@ -210,7 +210,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 3--4
 <practical.png, id=20, 569.12625pt x 423.5825pt>

 File: practical.png Graphic file (type png)

  <use practical.png>

-Underfull \hbox (badness 10000) in paragraph at lines 10--12

+Underfull \hbox (badness 10000) in paragraph at lines 10--11

 

  []

 

@@ -219,17 +219,17 @@ Underfull \hbox (badness 10000) in paragraph at lines 10--12
 

 

  <practical.png>]

-Underfull \hbox (badness 10000) in paragraph at lines 13--15

+Underfull \hbox (badness 10000) in paragraph at lines 12--13

 

  []

 

 

-Underfull \hbox (badness 10000) in paragraph at lines 16--18

+Underfull \hbox (badness 10000) in paragraph at lines 14--15

 

  []

 

 )

-Underfull \hbox (badness 10000) in paragraph at lines 19--19

+Underfull \hbox (badness 10000) in paragraph at lines 16--19

 

  []

 

@@ -279,43 +279,43 @@ Underfull \hbox (badness 10000) in paragraph at lines 7--8
  []

 

 

-Underfull \hbox (badness 10000) in paragraph at lines 15--16

+Underfull \hbox (badness 10000) in paragraph at lines 14--15

 

  []

 

 

-Underfull \hbox (badness 10000) in paragraph at lines 17--18

+Underfull \hbox (badness 10000) in paragraph at lines 16--17

 

  []

 

-[7

 

+Underfull \hbox (badness 10000) in paragraph at lines 20--21

 

+ []

 

-]

-Underfull \hbox (badness 10000) in paragraph at lines 21--22

+[7

 

- []

 

-<wilrik.png, id=41, 847.165pt x 629.35126pt>

+

+] <wilrik.png, id=41, 847.165pt x 629.35126pt>

 File: wilrik.png Graphic file (type png)

  <use wilrik.png>

-Underfull \hbox (badness 10000) in paragraph at lines 32--33

+Underfull \hbox (badness 10000) in paragraph at lines 31--32

 

  []

 

 

-Underfull \hbox (badness 10000) in paragraph at lines 38--39

+Underfull \hbox (badness 10000) in paragraph at lines 37--38

 

  []

 

 [8 <wilrik.png>]

-Underfull \hbox (badness 10000) in paragraph at lines 42--43

+Underfull \hbox (badness 10000) in paragraph at lines 41--42

 

  []

 

 )

-Underfull \hbox (badness 10000) in paragraph at lines 44--21

+Underfull \hbox (badness 10000) in paragraph at lines 43--21

 

  []

 

@@ -498,7 +498,7 @@ Underfull \hbox (badness 10000) in paragraph at lines 11--15
  []

 

 

-Underfull \hbox (badness 10000) in paragraph at lines 18--20

+Underfull \hbox (badness 10000) in paragraph at lines 18--19

 

  []

 

@@ -509,12 +509,12 @@ Underfull \hbox (badness 10000) in paragraph at lines 18--20
 ] <height_plot.png, id=112, 847.165pt x 629.35126pt>

 File: height_plot.png Graphic file (type png)

  <use height_plot.png>

-Underfull \hbox (badness 10000) in paragraph at lines 33--36

+Underfull \hbox (badness 10000) in paragraph at lines 32--35

 

  []

 

 

-Underfull \hbox (badness 10000) in paragraph at lines 37--39

+Underfull \hbox (badness 10000) in paragraph at lines 36--38

 

  []

 

@@ -522,47 +522,47 @@ Underfull \hbox (badness 10000) in paragraph at lines 37--39
 File: height_plot2.png Graphic file (type png)

  <use height_plot2.png>

 [21 <height_plot.png>]

-Underfull \hbox (badness 10000) in paragraph at lines 47--50

+Underfull \hbox (badness 10000) in paragraph at lines 46--49

 

  []

 

 

-Underfull \hbox (badness 10000) in paragraph at lines 51--53

+Underfull \hbox (badness 10000) in paragraph at lines 50--52

 

  []

 

 

-Underfull \hbox (badness 10000) in paragraph at lines 56--57

+Underfull \hbox (badness 10000) in paragraph at lines 55--56

 

  []

 

 

-Underfull \hbox (badness 10000) in paragraph at lines 60--62

+Underfull \hbox (badness 10000) in paragraph at lines 59--61

 

  []

 

 [22 <height_plot2.png>]

-Underfull \hbox (badness 10000) in paragraph at lines 63--65

+Underfull \hbox (badness 10000) in paragraph at lines 62--64

 

  []

 

 

-Underfull \hbox (badness 10000) in paragraph at lines 68--70

+Underfull \hbox (badness 10000) in paragraph at lines 67--68

 

  []

 

 

-Underfull \hbox (badness 10000) in paragraph at lines 71--73

+Underfull \hbox (badness 10000) in paragraph at lines 69--71

 

  []

 

 

-Underfull \hbox (badness 10000) in paragraph at lines 76--79

+Underfull \hbox (badness 10000) in paragraph at lines 74--77

 

  []

 

 )

-Underfull \hbox (badness 10000) in paragraph at lines 80--25

+Underfull \hbox (badness 10000) in paragraph at lines 78--25

 

  []

 

@@ -657,88 +657,27 @@ Underfull \hbox (badness 10000) in paragraph at lines 21--27
 

  []

 

-[28] (chapter10.tex

-Chapter 10.

-

-Underfull \hbox (badness 10000) in paragraph at lines 3--4

-

- []

-

-

-Underfull \hbox (badness 10000) in paragraph at lines 7--9

-

- []

-

-

-Underfull \hbox (badness 10000) in paragraph at lines 10--12

-

- []

-

-

-Underfull \hbox (badness 10000) in paragraph at lines 13--15

-

- []

-

-

-Underfull \hbox (badness 10000) in paragraph at lines 16--18

-

- []

-

-

-Underfull \hbox (badness 10000) in paragraph at lines 19--21

-

- []

-

-

-Underfull \hbox (badness 10000) in paragraph at lines 22--24

-

- []

-

-

-Underfull \hbox (badness 10000) in paragraph at lines 25--27

-

- []

-

-[29

-

-

-

-]

-Underfull \hbox (badness 10000) in paragraph at lines 28--30

-

- []

-

-

-Underfull \hbox (badness 10000) in paragraph at lines 31--33

-

- []

-

-)

-Underfull \hbox (badness 10000) in paragraph at lines 36--28

-

- []

-

-[30] (2IV35-Report.aux (toc.aux) (chapter1.aux) (chapter2.aux) (chapter3.aux)

+[28] (2IV35-Report.aux (toc.aux) (chapter1.aux) (chapter2.aux) (chapter3.aux)

 (chapter4.aux) (chapter5.aux) (chapter6.aux) (chapter7.aux) (chapter8.aux)

-(chapter9.aux) (chapter10.aux)) ) 

+(chapter9.aux)) ) 

 Here is how much of TeX's memory you used:

- 2131 strings out of 95490

- 23186 string characters out of 1188952

- 75550 words of memory out of 1076186

- 4899 multiletter control sequences out of 60000

+ 2110 strings out of 95490

+ 23005 string characters out of 1188952

+ 75278 words of memory out of 1075914

+ 4898 multiletter control sequences out of 60000

  13870 words of font info for 54 fonts, out of 500000 for 1000

  54 hyphenation exceptions out of 4999

- 27i,6n,22p,573b,203s stack positions out of 1500i,500n,5000p,200000b,32768s

+ 27i,6n,22p,574b,203s stack positions out of 1500i,500n,5000p,200000b,32768s

 PDF statistics:

- 147 PDF objects out of 300000

+ 140 PDF objects out of 300000

  0 named destinations out of 300000

  66 words of extra memory for PDF output out of 65536

-<C:\MiKTeX\texmf\fonts\type1\bluesky\cm\cmmi8.

-pfb><C:\MiKTeX\texmf\fonts\type1\bluesky\cm\cmsy8.pfb><C:\MiKTeX\texmf\fonts\ty

-pe1\bluesky\cm\cmr8.pfb><C:\MiKTeX\texmf\fonts\type1\bluesky\cm\cmex10.pfb><C:\

-MiKTeX\texmf\fonts\type1\bluesky\cm\cmti12.pfb><C:\MiKTeX\texmf\fonts\type1\blu

-esky\cm\cmtt12.pfb><C:\MiKTeX\texmf\fonts\type1\bluesky\cm\cmsy10.pfb><C:\MiKTe

-X\texmf\fonts\type1\bluesky\cm\cmmi12.pfb><C:\MiKTeX\texmf\fonts\type1\bluesky\

-cm\cmbx12.pfb><C:\MiKTeX\texmf\fonts\type1\bluesky\cm\cmr12.pfb><C:\MiKTeX\texm

-f\fonts\type1\bluesky\cm\cmr17.pfb>

-Output written on 2IV35-Report.pdf (31 pages, 1072372 bytes).

+<C:\MiKTeX\texmf\fonts\type1\bluesky\cm\cmmi8.pfb><C:\MiKTeX\t

+exmf\fonts\type1\bluesky\cm\cmsy8.pfb><C:\MiKTeX\texmf\fonts\type1\bluesky\cm\c

+mr8.pfb><C:\MiKTeX\texmf\fonts\type1\bluesky\cm\cmex10.pfb><C:\MiKTeX\texmf\fon

+ts\type1\bluesky\cm\cmti12.pfb><C:\MiKTeX\texmf\fonts\type1\bluesky\cm\cmtt12.p

+fb><C:\MiKTeX\texmf\fonts\type1\bluesky\cm\cmsy10.pfb><C:\MiKTeX\texmf\fonts\ty

+pe1\bluesky\cm\cmmi12.pfb><C:\MiKTeX\texmf\fonts\type1\bluesky\cm\cmbx12.pfb><C

+:\MiKTeX\texmf\fonts\type1\bluesky\cm\cmr12.pfb><C:\MiKTeX\texmf\fonts\type1\bl

+uesky\cm\cmr17.pfb>

+Output written on 2IV35-Report.pdf (29 pages, 1069546 bytes).

diff --git a/Smoke/report/2IV35-Report.pdf b/Smoke/report/2IV35-Report.pdf
index dfd956f..dc34127 100644
--- a/Smoke/report/2IV35-Report.pdf
+++ b/Smoke/report/2IV35-Report.pdf
diff --git a/Smoke/report/2IV35-Report.tex b/Smoke/report/2IV35-Report.tex
index 32b5ece..3da570a 100644
--- a/Smoke/report/2IV35-Report.tex
+++ b/Smoke/report/2IV35-Report.tex
@@ -25,6 +25,5 @@
 \include{chapter7}

 \include{chapter8}

 \include{chapter9}

-\include{chapter10}

 

 \end{document}

diff --git a/Smoke/report/2IV35-Report.toc b/Smoke/report/2IV35-Report.toc
index afd6593..4b5c16b 100644
--- a/Smoke/report/2IV35-Report.toc
+++ b/Smoke/report/2IV35-Report.toc
@@ -34,6 +34,3 @@
 \contentsline {chapter}{\numberline {9}Conclusion}{27}

 \contentsline {section}{\numberline {9.1}Visualization}{27}

 \contentsline {section}{\numberline {9.2}The course}{28}

-\contentsline {chapter}{\numberline {10}Functionality}{29}

-\contentsline {section}{\numberline {10.1}Simulation}{29}

-\contentsline {section}{\numberline {10.2}Camera position}{30}

diff --git a/Smoke/report/chapter2.tex b/Smoke/report/chapter2.tex
index 2d1effa..13e96fc 100644
--- a/Smoke/report/chapter2.tex
+++ b/Smoke/report/chapter2.tex
@@ -18,6 +18,6 @@ The above screenshot shows us the fluid movement using a grey colormap. This sim
 

 \section{Internal structure}

 

-The first assignment was to simply compile the code. This was fairly easy. However, the code was a bit unstructured. Everything was put into one big file. To be able to add additional functionality without losing sight it was needed to create a file for every new technique being implemented. Furthermore the calculations, rendering functions and user interaction code were split from eachother. \\

+The first assignment was to simply compile the code. This was fairly easy. However, the code was a bit unstructured. Everything was put into one big file. To be able to add additional functionality without losing sight it was needed to create a file for every new technique being implemented. Furthermore the calculations, rendering functions and user interaction code were split from each other. \\

 

 With this new structure it was possible to be able to manage the code and add additional functionality. The programming language of our choice was C and for the graphical user interface the GTK+ library with the OpenGL extension was chosen. For project managment SVN was used. This was very useful since both students had different development environments and also did a lot of work at home. \\

diff --git a/Smoke/report/chapter3.tex b/Smoke/report/chapter3.tex
index 3ab4c9e..04a1994 100644
--- a/Smoke/report/chapter3.tex
+++ b/Smoke/report/chapter3.tex
@@ -13,11 +13,11 @@ $$ red = green = blue = value $$
 

 To be able to reason about the colored images, a legend at the top of the screen was added. The leftmost colors indicate low values and the rightmost colors indicate high values. With such a colormap legend, it's easier to understand the produced images and say something about the value of the fluid. \\

 

-Using a slider it is possible to change the number of colors. By default this value is set to 256 colors, but this is easily changed to anything below that. At lower number of colors big bands of colors will start to appear maing variations more visiable. \\

+Using a slider it is possible to change the number of colors. By default this value is set to 256 colors, but this is easily changed to anything below that. At lower number of colors big bands of colors will start to appear making variations more visible. \\

 

 \section{Implementation}

 

-Next to the 3 supplied colormaps 5 additional colormaps where added. Three of these where only contain one color, red, green or blue. These are not only useful for isolines but also when wanting to see height plots, but not get distracted by the flow of density. The remaining two colormaps are the "Wilrik" colormap, it implements a fire elemental color scheme and the "Oliver" colormap which may seem like a tripy odd map, not like a colormap at all. It does serve a purpose however, it allows to easly see rapid changing values. \\

+Next to the 3 supplied colormaps 5 additional colormaps where added. Three of these where only contain one color, red, green or blue. These are not only useful for isolines but also when wanting to see height plots, but not get distracted by the flow of density. The remaining two colormaps are the "Wilrik" colormap, it implements a fire elemental color scheme and the "Oliver" colormap which may seem like a weird odd map, not like a colormap at all. It does serve a purpose however, it allows to easily see rapid changing values. \\

 

 \begin {center}

   \includegraphics[width=100mm]{wilrik.png} \\

@@ -34,7 +34,7 @@ To create a repeating band of colors, the following formula was used:
 

 $$ value = (((int)(value * 100)) \texttt{ mod } 10)/10 $$

 

-By first mutliplying our value by 100 and converting it to an integer the value get's reduced in significance. If this would be devided by 100 again the result would be 100 different bands of color. By taking the module of 10 first however, a repeating sequence of bands is achieved. To compensate for the earlier multiplication of 100 it's required to devide by 10 once more, as color values are set to be between 0 and 1. \\

+By first multiplying our value by 100 and converting it to an integer the value get's reduced in significance. If this would be divided by 100 again the result would be 100 different bands of color. By taking the module of 10 first however, a repeating sequence of bands is achieved. To compensate for the earlier multiplication of 100 it's required to devide by 10 once more, as color values are set to be between 0 and 1. \\

 

 \section{Difficulties}