From 2db90bfe4b174570424c408f04000902411d8755 Mon Sep 17 00:00:00 2001 From: Joshua Baer Date: Mon, 12 Apr 2021 21:51:55 +0200 Subject: update to current state of book --- vorlesungen/slides/4/galois/images/Makefile | 24 ++-- vorlesungen/slides/4/galois/images/common.inc | 178 ++++++++++++------------ vorlesungen/slides/4/galois/images/wuerfel.pov | 18 +-- vorlesungen/slides/4/galois/images/wuerfel2.pov | 18 +-- 4 files changed, 119 insertions(+), 119 deletions(-) (limited to 'vorlesungen/slides/4/galois/images') diff --git a/vorlesungen/slides/4/galois/images/Makefile b/vorlesungen/slides/4/galois/images/Makefile index 444944e..fd197ce 100644 --- a/vorlesungen/slides/4/galois/images/Makefile +++ b/vorlesungen/slides/4/galois/images/Makefile @@ -1,12 +1,12 @@ -# -# Makefile -# -# (c) 2021 Prof Dr Andreas Müller, OST Ostschweizer Fachhochschule -# -all: wuerfel2.png wuerfel.png - -wuerfel.png: wuerfel.pov common.inc - povray +A0.1 -W1080 -H1080 -Owuerfel.png wuerfel.pov - -wuerfel2.png: wuerfel2.pov common.inc - povray +A0.1 -W1080 -H1080 -Owuerfel2.png wuerfel2.pov +# +# Makefile +# +# (c) 2021 Prof Dr Andreas Müller, OST Ostschweizer Fachhochschule +# +all: wuerfel2.png wuerfel.png + +wuerfel.png: wuerfel.pov common.inc + povray +A0.1 -W1080 -H1080 -Owuerfel.png wuerfel.pov + +wuerfel2.png: wuerfel2.pov common.inc + povray +A0.1 -W1080 -H1080 -Owuerfel2.png wuerfel2.pov diff --git a/vorlesungen/slides/4/galois/images/common.inc b/vorlesungen/slides/4/galois/images/common.inc index 6cfcabe..44ee4c8 100644 --- a/vorlesungen/slides/4/galois/images/common.inc +++ b/vorlesungen/slides/4/galois/images/common.inc @@ -1,89 +1,89 @@ -// -// common.inc -// -// (c) 2021 Prof Dr Andreas Müller, OST Ostschweizer Fachhochschule -// -#version 3.7; -#include "colors.inc" -#include "textures.inc" -#include "stones.inc" - -global_settings { - assumed_gamma 1 -} - -#declare imagescale = 0.133; -#declare O = <0, 0, 0>; -#declare E = <1, 1, 1>; -#declare a = pow(2, 1/3); -#declare at = 0.02; - -camera { - location <3, 2, 12> - look_at E * (a / 2) * 0.93 - right x * imagescale - up y * imagescale -} - -light_source { - <11, 20, 16> color White - area_light <1,0,0> <0,0,1>, 10, 10 - adaptive 1 - jitter -} - -sky_sphere { - pigment { - color rgb<1,1,1> - } -} - -#macro wuerfelgitter(A, AT) - cylinder { O, , AT } - cylinder { O, <0, A, 0>, AT } - cylinder { O, <0, 0, A>, AT } - cylinder { , , AT } - cylinder { , , AT } - cylinder { <0, A, 0>, , AT } - cylinder { <0, A, 0>, <0, A, A>, AT } - cylinder { <0, 0, A>, , AT } - cylinder { <0, 0, A>, <0, A, A>, AT } - cylinder { , , AT } - cylinder { , , AT } - cylinder { <0, A, A>, , AT } - sphere { <0, 0, 0>, AT } - sphere { , AT } - sphere { <0, A, 0>, AT } - sphere { <0, 0, A>, AT } - sphere { , AT } - sphere { , AT } - sphere { <0, A, A>, AT } - sphere { , AT } -#end - -#macro wuerfel() - union { - box { O, E } - wuerfelgitter(1, 0.5*at) - texture { - T_Grnt24 - } - finish { - specular 0.9 - metallic - } - } -#end - -#macro wuerfel2() - union { - wuerfelgitter(a, at) - pigment { - color rgb<0.8,0.4,0.4> - } - finish { - specular 0.9 - metallic - } - } -#end +// +// common.inc +// +// (c) 2021 Prof Dr Andreas Müller, OST Ostschweizer Fachhochschule +// +#version 3.7; +#include "colors.inc" +#include "textures.inc" +#include "stones.inc" + +global_settings { + assumed_gamma 1 +} + +#declare imagescale = 0.133; +#declare O = <0, 0, 0>; +#declare E = <1, 1, 1>; +#declare a = pow(2, 1/3); +#declare at = 0.02; + +camera { + location <3, 2, 12> + look_at E * (a / 2) * 0.93 + right x * imagescale + up y * imagescale +} + +light_source { + <11, 20, 16> color White + area_light <1,0,0> <0,0,1>, 10, 10 + adaptive 1 + jitter +} + +sky_sphere { + pigment { + color rgb<1,1,1> + } +} + +#macro wuerfelgitter(A, AT) + cylinder { O, , AT } + cylinder { O, <0, A, 0>, AT } + cylinder { O, <0, 0, A>, AT } + cylinder { , , AT } + cylinder { , , AT } + cylinder { <0, A, 0>, , AT } + cylinder { <0, A, 0>, <0, A, A>, AT } + cylinder { <0, 0, A>, , AT } + cylinder { <0, 0, A>, <0, A, A>, AT } + cylinder { , , AT } + cylinder { , , AT } + cylinder { <0, A, A>, , AT } + sphere { <0, 0, 0>, AT } + sphere { , AT } + sphere { <0, A, 0>, AT } + sphere { <0, 0, A>, AT } + sphere { , AT } + sphere { , AT } + sphere { <0, A, A>, AT } + sphere { , AT } +#end + +#macro wuerfel() + union { + box { O, E } + wuerfelgitter(1, 0.5*at) + texture { + T_Grnt24 + } + finish { + specular 0.9 + metallic + } + } +#end + +#macro wuerfel2() + union { + wuerfelgitter(a, at) + pigment { + color rgb<0.8,0.4,0.4> + } + finish { + specular 0.9 + metallic + } + } +#end diff --git a/vorlesungen/slides/4/galois/images/wuerfel.pov b/vorlesungen/slides/4/galois/images/wuerfel.pov index a5db465..a0466f3 100644 --- a/vorlesungen/slides/4/galois/images/wuerfel.pov +++ b/vorlesungen/slides/4/galois/images/wuerfel.pov @@ -1,9 +1,9 @@ -// -// wuerfel.pov -// -// (c) 2021 Prof Dr Andreas Müller, OST Ostschweizer Fachhochschule -// -#include "common.inc" - -wuerfel() - +// +// wuerfel.pov +// +// (c) 2021 Prof Dr Andreas Müller, OST Ostschweizer Fachhochschule +// +#include "common.inc" + +wuerfel() + diff --git a/vorlesungen/slides/4/galois/images/wuerfel2.pov b/vorlesungen/slides/4/galois/images/wuerfel2.pov index ac32b2f..a11bab0 100644 --- a/vorlesungen/slides/4/galois/images/wuerfel2.pov +++ b/vorlesungen/slides/4/galois/images/wuerfel2.pov @@ -1,9 +1,9 @@ -// -// wuerfel.pov -// -// (c) 2021 Prof Dr Andreas Müller, OST Ostschweizer Fachhochschule -// -#include "common.inc" - -wuerfel() -wuerfel2() +// +// wuerfel.pov +// +// (c) 2021 Prof Dr Andreas Müller, OST Ostschweizer Fachhochschule +// +#include "common.inc" + +wuerfel() +wuerfel2() -- cgit v1.2.1