From 48d21efc9eece6adfe4e8c1990ea5189dd2aafbb Mon Sep 17 00:00:00 2001 From: CDaut Date: Thu, 15 Jun 2023 23:26:09 +0200 Subject: [PATCH] nice tikz stuff ;D --- .gitignore | 4 +- presentation/diagrams/raytracing_anim.tex | 148 +++++++++++++--------- presentation/prototyper.tex | 2 + 3 files changed, 96 insertions(+), 58 deletions(-) diff --git a/.gitignore b/.gitignore index 37124b5..e48bf66 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,6 @@ presentation.toc presentation/build/ -build/ \ No newline at end of file +build/ + +indent.log \ No newline at end of file diff --git a/presentation/diagrams/raytracing_anim.tex b/presentation/diagrams/raytracing_anim.tex index 9abecc0..f1ffd68 100644 --- a/presentation/diagrams/raytracing_anim.tex +++ b/presentation/diagrams/raytracing_anim.tex @@ -1,80 +1,114 @@ - \begin{center} - \begin{minipage}{0.3\linewidth} - \begin{tikzpicture} - % scene draufsicht - \node[above] at (2,4.3) {top view}; +\begin{center} + \begin{minipage}{0.2\linewidth} + \begin{tikzpicture} + % scene draufsicht + \node[above] at (1,2.2) {top view}; - \fill[ - kit-blue100 - ](0,0) -- (0,4) -- (4,4) -- (4,0) -- cycle; + \fill[ + kit-blue100 + ](0,0) -- (0,2) -- (2,2) -- (2,0) -- cycle; - \fill[ - kit-green100 - ](0.5,0.5) -- (0.5,3.5) -- (3.5,3.5) -- (3.5,0.5) -- cycle; + \fill[ + kit-green100 + ](0.25,0.25) -- (0.25,1.75) -- (1.75,1.75) -- (1.75,0.25) -- cycle; - \node[below] at (2,-0.3) {$\uparrow$Sun$\uparrow$}; + \node[below] at (1,-0.3) {$\uparrow$Sun$\uparrow$}; - \foreach \x in {0.25,0.5,...,3.75}{ + \only<2>{ + \foreach \x in {0,0.25,...,2}{ \node[ circle, draw, - red, - visible on = < 2-> - ] (marker) at (\x,3.8){}; + red + ] (marker) at (\x,1.875){}; } + } - \end{tikzpicture} - \end{minipage} - \hspace{5mm} - \begin{minipage}{0.4\linewidth} - \begin{tikzpicture} - % scene seite - \node[above] at (2,2) {side view}; - \node[below] at (2,-0.5) {(no indirect lighting)}; + \only<3>{ + \foreach \x in {0,0.25,...,2}{ + \node[ + circle, + draw, + red + ] (marker) at (\x,0.125){}; + } + } - \draw[ - kit-green100 - ](0.5,0.5) -- (3.5,0.5); + \end{tikzpicture} + \end{minipage} + \hspace{5mm} + \begin{minipage}{0.4\linewidth} + \begin{tikzpicture} + % scene seite + \node[above] at (2,2) {side view}; + \node[below] at (2,-0.5) {(no indirect lighting)}; - \draw[ - kit-blue100 - ] (0,0) -- (4,0); + \draw[ + kit-green100 + ](0.5,0.5) -- (3.5,0.5); + \draw[ + kit-blue100 + ] (0,0) -- (4,0); + + \only<2>{ \draw[ red, - visible on = <2-> ] node[left] at (0.2,1) {primary ray} (0.2,0) -- (1,2); \draw[ - kit-red40, - visible on = <2-> + kit-gray40, ] node[right] at (1,1) {secondary ray} (0.2,0) -- (4,2); + } - \node[ - circle, - draw, - kit-yellow100, - ] (sun) at (4,2) {}; + \only<3>{ + \draw[ + red, + ] node[left] at (3.4,1) {primary ray} (3.8,0) -- (3,2); + \draw[ + kit-blue40, + ] node[right] at (4,1) {secondary ray} (3.8,0) -- (4,2); + } - \end{tikzpicture} - \end{minipage} - \hspace{5mm} - \begin{minipage}{0.2\linewidth} - \begin{tikzpicture} - \node[above] at (1,2.5) {output image}; - \draw (0,0) -- (2,0) -- (2,2) -- (0,2) -- cycle; - \draw[very thin,color=kit-gray30, step=0.1] (0,0) grid (2,2); + \node[ + circle, + fill, + kit-yellow100, + ] (sun) at (4,2) {}; - \fill[ - kit-blue100, - visible on = <2-> - ](0,2) -- (2,2) -- (2,1.9) -- (0,1.9) -- cycle; + \end{tikzpicture} + \end{minipage} + \hspace{5mm} + \begin{minipage}{0.2\linewidth} + \begin{tikzpicture} + \node[above] at (1,2.5) {output image}; + \draw (0,0) -- (2,0) -- (2,2) -- (0,2) -- cycle; - \fill[ - kit-gray70, - visible on = <2-> - ](0.2,2) -- (1.8,2) -- (1.8,1.9) -- (0.2,1.9) -- cycle; + \fill[ + kit-blue100, + visible on = <2-> + ](0,2) -- (2,2) -- (2,1.9) -- (0,1.9) -- cycle; - \end{tikzpicture} - \end{minipage} - \end{center} + \fill[ + kit-gray70, + visible on = <2-> + ](0.2,2) -- (1.8,2) -- (1.8,1.9) -- (0.2,1.9) -- cycle; + + \fill[ + kit-blue100, + visible on = <3-> + ](0,0) -- (0,2) -- (2,2) -- (2,0) -- cycle; + \fill[ + kit-gray70, + visible on = <3-> + ](0.2,2) -- (1.8,2) -- (1.8,1.8) -- (0.2,1.8) -- cycle; + + \fill[ + kit-green100, + visible on = <3-> + ](0.2,1.8) -- (1.8,1.8) -- (1.8,0.2) -- (0.2,0.2) -- cycle; + + \draw[very thin,color=kit-gray30, step=0.1] (0,0) grid (2,2); + \end{tikzpicture} + \end{minipage} +\end{center} diff --git a/presentation/prototyper.tex b/presentation/prototyper.tex index da3a5fb..f534034 100644 --- a/presentation/prototyper.tex +++ b/presentation/prototyper.tex @@ -9,5 +9,7 @@ \begin{document} +\begin{frame} \input{diagrams/raytracing_anim.tex} +\end{frame} \end{document} \ No newline at end of file