Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

31 files changed, 150 insertions, 0 deletions

diff --git a/kpovmodeler/examples/includes/Makefile.am b/kpovmodeler/examples/includes/Makefile.am
new file mode 100644
index 00000000..9d7b21f2
--- /dev/null
+++ b/kpovmodeler/examples/includes/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = inlined original
\ No newline at end of file
diff --git a/kpovmodeler/examples/includes/inlined/Makefile.am b/kpovmodeler/examples/includes/inlined/Makefile.am
new file mode 100644
index 00000000..f798eb8b
--- /dev/null
+++ b/kpovmodeler/examples/includes/inlined/Makefile.am
@@ -0,0 +1,4 @@
+exdir = $(kde_datadir)/kpovmodeler/examples/includes/inlined
+ex_DATA = chars.kpm finish.kpm glass.kpm golds.kpm metals.kpm shapes.kpm \
+	shapes2.kpm shapesq.kpm skies.kpm stars.kpm stones1.kpm stones2.kpm \
+	textures.kpm woods.kpm
\ No newline at end of file
diff --git a/kpovmodeler/examples/includes/inlined/chars.kpm b/kpovmodeler/examples/includes/inlined/chars.kpm
new file mode 100644
index 00000000..606e7db0
--- /dev/null
+++ b/kpovmodeler/examples/includes/inlined/chars.kpm
diff --git a/kpovmodeler/examples/includes/inlined/finish.kpm b/kpovmodeler/examples/includes/inlined/finish.kpm
new file mode 100644
index 00000000..d7131c4d
--- /dev/null
+++ b/kpovmodeler/examples/includes/inlined/finish.kpm
diff --git a/kpovmodeler/examples/includes/inlined/glass.kpm b/kpovmodeler/examples/includes/inlined/glass.kpm
new file mode 100644
index 00000000..329b68e1
--- /dev/null
+++ b/kpovmodeler/examples/includes/inlined/glass.kpm
@@ -0,0 +1,141 @@
+<!DOCTYPE KPOVMODELER>
+<scene minorFormat="0" majorFormat="1" visibility_level="10" >
+ <extra_data>
+  <rendermode sampling_method="0" width="640" subsection="0" antialiasing="0" end_column="640" start_row="1" radiosity="0" height="480" alpha="0" start_column="1" end_row="480" aa_depth="2" aa_jitter="0" aa_jitter_amount="1" aa_threshold="0.3" quality="9" description="Default" />
+ </extra_data>
+ <comment>
+Persistence of Vision Raytracer Version 3.1
+Glass finishes and textures
+</comment>
+ <comment>Changes in ver. 3.1 moved refraction and ior to the interior statment.
+Use I_Glass in conjunction with each of the finish statments below.</comment>
+ <comment>Glass Interior</comment>
+ <declare id="I_Glass" >
+  <interior enable_fade_power="0" fade_power="0" fade_distance="0" caustics="0" ior="1.5" enable_ior="1" enable_fade_distance="0" enable_caustics="0" name="" />
+ </declare>
+ <comment>Glass Finishes</comment>
+ <declare id="F_Glass1" >
+  <finish enable_brilliance="0" enable_metallic="0" enable_exponent="0" enable_diffuse="1" metallic="1" enable_reflection="1" irid_turbulence="0" irid="0" crand="0" brilliance="1" enable_roughness="1" enable_specular="1" enable_ambient="1" irid_amount="0" reflection_exponent="1" roughness="0.001" enable_phong_size="0" enable_phong="0" irid_thickness="0" phong="0" ambient="0 0 0 0 0" reflection="0.1 0.1 0.1 0.1 0.1" diffuse="0" name="" specular="1" phongsize="40" enable_crand="0" />
+ </declare>
+ <declare id="F_Glass2" >
+  <finish enable_brilliance="0" enable_metallic="0" enable_exponent="0" enable_diffuse="1" metallic="1" enable_reflection="1" irid_turbulence="0" irid="0" crand="0" brilliance="1" enable_roughness="0" enable_specular="0" enable_ambient="1" irid_amount="0" reflection_exponent="1" roughness="0.05" enable_phong_size="1" enable_phong="1" irid_thickness="0" phong="0.3" ambient="0 0 0 0 0" reflection="0.5 0.5 0.5 0.5 0.5" diffuse="0" name="" specular="0" phongsize="60" enable_crand="0" />
+ </declare>
+ <declare id="F_Glass3" >
+  <finish enable_brilliance="0" enable_metallic="0" enable_exponent="0" enable_diffuse="1" metallic="1" enable_reflection="1" irid_turbulence="0" irid="0" crand="0" brilliance="1" enable_roughness="1" enable_specular="1" enable_ambient="1" irid_amount="0" reflection_exponent="1" roughness="0.003" enable_phong_size="1" enable_phong="1" irid_thickness="0" phong="1" ambient="0.1 0.1 0.1 0.1 0.1" reflection="0.1 0.1 0.1 0.1 0.1" diffuse="0.1" name="" specular="0.8" phongsize="400" enable_crand="0" />
+ </declare>
+ <declare id="F_Glass4" >
+  <finish enable_brilliance="0" enable_metallic="0" enable_exponent="0" enable_diffuse="1" metallic="1" enable_reflection="1" irid_turbulence="0" irid="0" crand="0" brilliance="1" enable_roughness="1" enable_specular="1" enable_ambient="1" irid_amount="0" reflection_exponent="1" roughness="0.001" enable_phong_size="0" enable_phong="0" irid_thickness="0" phong="0" ambient="0.1 0.1 0.1 0.1 0.1" reflection="0.25 0.25 0.25 0.25 0.25" diffuse="0.1" name="" specular="1" phongsize="40" enable_crand="0" />
+ </declare>
+ <comment>Glass Textures</comment>
+ <comment>Simple clear glass</comment>
+ <declare id="T_Glass1" >
+  <texture name="" >
+   <pigment name="" >
+    <solidcolor color="1 1 1 0.7 0" />
+   </pigment>
+   <finish enable_brilliance="0" enable_metallic="0" enable_exponent="0" enable_diffuse="1" metallic="1" enable_reflection="1" irid_turbulence="0" irid="0" crand="0" brilliance="1" enable_roughness="1" enable_specular="1" enable_ambient="1" irid_amount="0" reflection_exponent="1" roughness="0.001" enable_phong_size="0" enable_phong="0" irid_thickness="0" phong="0" ambient="0 0 0 0 0" reflection="0.1 0.1 0.1 0.1 0.1" diffuse="0" name="" specular="1" phongsize="40" enable_crand="0" />
+  </texture>
+ </declare>
+ <comment>More like an acrylic plastic</comment>
+ <declare id="T_Glass2" >
+  <texture name="" >
+   <pigment name="" >
+    <solidcolor color="1 1 1 1 0" />
+   </pigment>
+   <finish enable_brilliance="0" enable_metallic="0" enable_exponent="0" enable_diffuse="1" metallic="1" enable_reflection="1" irid_turbulence="0" irid="0" crand="0" brilliance="1" enable_roughness="0" enable_specular="0" enable_ambient="1" irid_amount="0" reflection_exponent="1" roughness="0.05" enable_phong_size="1" enable_phong="1" irid_thickness="0" phong="0.3" ambient="0 0 0 0 0" reflection="0.5 0.5 0.5 0.5 0.5" diffuse="0" name="" specular="0" phongsize="60" enable_crand="0" />
+  </texture>
+ </declare>
+ <comment>An excellent lead crystal glass!</comment>
+ <declare id="T_Glass3" >
+  <texture name="" >
+   <pigment name="" >
+    <solidcolor color="0.98 0.98 0.98 0.9 0" />
+   </pigment>
+   <finish enable_brilliance="0" enable_metallic="0" enable_exponent="0" enable_diffuse="1" metallic="1" enable_reflection="1" irid_turbulence="0" irid="0" crand="0" brilliance="1" enable_roughness="1" enable_specular="1" enable_ambient="1" irid_amount="0" reflection_exponent="1" roughness="0.003" enable_phong_size="1" enable_phong="1" irid_thickness="0" phong="1" ambient="0.1 0.1 0.1 0.1 0.1" reflection="0.1 0.1 0.1 0.1 0.1" diffuse="0.1" name="" specular="0.8" phongsize="400" enable_crand="0" />
+  </texture>
+ </declare>
+ <declare id="T_Glass4" >
+  <texture name="" >
+   <pigment name="" >
+    <solidcolor color="0.98 1 0.99 0.75 0" />
+   </pigment>
+   <finish enable_brilliance="0" enable_metallic="0" enable_exponent="0" enable_diffuse="1" metallic="1" enable_reflection="1" irid_turbulence="0" irid="0" crand="0" brilliance="1" enable_roughness="1" enable_specular="1" enable_ambient="1" irid_amount="0" reflection_exponent="1" roughness="0.001" enable_phong_size="0" enable_phong="0" irid_thickness="0" phong="0" ambient="0.1 0.1 0.1 0.1 0.1" reflection="0.25 0.25 0.25 0.25 0.25" diffuse="0.1" name="" specular="1" phongsize="40" enable_crand="0" />
+  </texture>
+ </declare>
+ <declare id="T_Old_Glass" >
+  <texture name="" >
+   <finish enable_brilliance="0" enable_metallic="0" enable_exponent="0" enable_diffuse="1" metallic="1" enable_reflection="1" irid_turbulence="0" irid="0" crand="0" brilliance="1" enable_roughness="1" enable_specular="1" enable_ambient="1" irid_amount="0" reflection_exponent="1" roughness="0.001" enable_phong_size="0" enable_phong="0" irid_thickness="0" phong="0" ambient="0.1 0.1 0.1 0.1 0.1" reflection="0.25 0.25 0.25 0.25 0.25" diffuse="0.1" name="" specular="1" phongsize="40" enable_crand="0" />
+   <pigment name="" >
+    <solidcolor color="0.8 0.9 0.85 0.85 0" />
+   </pigment>
+  </texture>
+ </declare>
+ <declare id="T_Winebottle_Glass" >
+  <texture name="" >
+   <finish enable_brilliance="0" enable_metallic="0" enable_exponent="0" enable_diffuse="1" metallic="1" enable_reflection="1" irid_turbulence="0" irid="0" crand="0" brilliance="1" enable_roughness="1" enable_specular="1" enable_ambient="1" irid_amount="0" reflection_exponent="1" roughness="0.001" enable_phong_size="0" enable_phong="0" irid_thickness="0" phong="0" ambient="0.1 0.1 0.1 0.1 0.1" reflection="0.25 0.25 0.25 0.25 0.25" diffuse="0.1" name="" specular="1" phongsize="40" enable_crand="0" />
+   <pigment name="" >
+    <solidcolor color="0.4 0.72 0.4 0.6 0" />
+   </pigment>
+  </texture>
+ </declare>
+ <declare id="T_Beerbottle_Glass" >
+  <texture name="" >
+   <finish enable_brilliance="0" enable_metallic="0" enable_exponent="0" enable_diffuse="1" metallic="1" enable_reflection="1" irid_turbulence="0" irid="0" crand="0" brilliance="1" enable_roughness="1" enable_specular="1" enable_ambient="1" irid_amount="0" reflection_exponent="1" roughness="0.001" enable_phong_size="0" enable_phong="0" irid_thickness="0" phong="0" ambient="0.1 0.1 0.1 0.1 0.1" reflection="0.25 0.25 0.25 0.25 0.25" diffuse="0.1" name="" specular="1" phongsize="40" enable_crand="0" />
+   <pigment name="" >
+    <solidcolor color="0.7 0.5 0.1 0.6 0" />
+   </pigment>
+  </texture>
+ </declare>
+ <comment>A few color variations on Norm's glass
+Ruby glass</comment>
+ <declare id="T_Ruby_Glass" >
+  <texture name="" >
+   <finish enable_brilliance="0" enable_metallic="0" enable_exponent="0" enable_diffuse="1" metallic="1" enable_reflection="1" irid_turbulence="0" irid="0" crand="0" brilliance="1" enable_roughness="1" enable_specular="1" enable_ambient="1" irid_amount="0" reflection_exponent="1" roughness="0.001" enable_phong_size="0" enable_phong="0" irid_thickness="0" phong="0" ambient="0.1 0.1 0.1 0.1 0.1" reflection="0.25 0.25 0.25 0.25 0.25" diffuse="0.1" name="" specular="1" phongsize="40" enable_crand="0" />
+   <pigment name="" >
+    <solidcolor color="0.9 0.1 0.2 0.8 0" />
+   </pigment>
+  </texture>
+ </declare>
+ <declare id="T_Green_Glass" >
+  <texture name="" >
+   <pigment name="" >
+    <solidcolor color="0.8 1 0.95 0.9 0" />
+   </pigment>
+   <finish enable_brilliance="0" enable_metallic="0" enable_exponent="0" enable_diffuse="1" metallic="1" enable_reflection="1" irid_turbulence="0" irid="0" crand="0" brilliance="1" enable_roughness="1" enable_specular="1" enable_ambient="1" irid_amount="0" reflection_exponent="1" roughness="0.003" enable_phong_size="1" enable_phong="1" irid_thickness="0" phong="1" ambient="0.1 0.1 0.1 0.1 0.1" reflection="0.1 0.1 0.1 0.1 0.1" diffuse="0.1" name="" specular="0.8" phongsize="400" enable_crand="0" />
+  </texture>
+ </declare>
+ <declare id="T_Dark_Green_Glass" >
+  <texture name="" >
+   <finish enable_brilliance="0" enable_metallic="0" enable_exponent="0" enable_diffuse="1" metallic="1" enable_reflection="1" irid_turbulence="0" irid="0" crand="0" brilliance="1" enable_roughness="1" enable_specular="1" enable_ambient="1" irid_amount="0" reflection_exponent="1" roughness="0.001" enable_phong_size="0" enable_phong="0" irid_thickness="0" phong="0" ambient="0.1 0.1 0.1 0.1 0.1" reflection="0.25 0.25 0.25 0.25 0.25" diffuse="0.1" name="" specular="1" phongsize="40" enable_crand="0" />
+   <pigment name="" >
+    <solidcolor color="0.1 0.7 0.8 0.8 0" />
+   </pigment>
+  </texture>
+ </declare>
+ <declare id="T_Yellow_Glass" >
+  <texture name="" >
+   <finish enable_brilliance="0" enable_metallic="0" enable_exponent="0" enable_diffuse="1" metallic="1" enable_reflection="1" irid_turbulence="0" irid="0" crand="0" brilliance="1" enable_roughness="1" enable_specular="1" enable_ambient="1" irid_amount="0" reflection_exponent="1" roughness="0.001" enable_phong_size="0" enable_phong="0" irid_thickness="0" phong="0" ambient="0.1 0.1 0.1 0.1 0.1" reflection="0.25 0.25 0.25 0.25 0.25" diffuse="0.1" name="" specular="1" phongsize="40" enable_crand="0" />
+   <pigment name="" >
+    <solidcolor color="0.8 0.8 0.2 0.8 0" />
+   </pigment>
+  </texture>
+ </declare>
+ <comment>Orange/Amber glass</comment>
+ <declare id="T_Orange_Glass" >
+  <texture name="" >
+   <finish enable_brilliance="0" enable_metallic="0" enable_exponent="0" enable_diffuse="1" metallic="1" enable_reflection="1" irid_turbulence="0" irid="0" crand="0" brilliance="1" enable_roughness="1" enable_specular="1" enable_ambient="1" irid_amount="0" reflection_exponent="1" roughness="0.001" enable_phong_size="0" enable_phong="0" irid_thickness="0" phong="0" ambient="0.1 0.1 0.1 0.1 0.1" reflection="0.25 0.25 0.25 0.25 0.25" diffuse="0.1" name="" specular="1" phongsize="40" enable_crand="0" />
+   <pigment name="" >
+    <solidcolor color="1 0.5 0 0.8 0" />
+   </pigment>
+  </texture>
+ </declare>
+ <comment>Vicks bottle, glass</comment>
+ <declare id="T_Vicksbottle_Glass" >
+  <texture name="" >
+   <finish enable_brilliance="0" enable_metallic="0" enable_exponent="0" enable_diffuse="1" metallic="1" enable_reflection="1" irid_turbulence="0" irid="0" crand="0" brilliance="1" enable_roughness="1" enable_specular="1" enable_ambient="1" irid_amount="0" reflection_exponent="1" roughness="0.001" enable_phong_size="0" enable_phong="0" irid_thickness="0" phong="0" ambient="0.1 0.1 0.1 0.1 0.1" reflection="0.25 0.25 0.25 0.25 0.25" diffuse="0.1" name="" specular="1" phongsize="40" enable_crand="0" />
+   <pigment name="" >
+    <solidcolor color="0.1 0.15 0.5 0.9 0" />
+   </pigment>
+  </texture>
+ </declare>
+</scene>
diff --git a/kpovmodeler/examples/includes/inlined/golds.kpm b/kpovmodeler/examples/includes/inlined/golds.kpm
new file mode 100644
index 00000000..91feeca0
--- /dev/null
+++ b/kpovmodeler/examples/includes/inlined/golds.kpm
diff --git a/kpovmodeler/examples/includes/inlined/metals.kpm b/kpovmodeler/examples/includes/inlined/metals.kpm
new file mode 100644
index 00000000..80f7f432
--- /dev/null
+++ b/kpovmodeler/examples/includes/inlined/metals.kpm
diff --git a/kpovmodeler/examples/includes/inlined/shapes.kpm b/kpovmodeler/examples/includes/inlined/shapes.kpm
new file mode 100644
index 00000000..0390613d
--- /dev/null
+++ b/kpovmodeler/examples/includes/inlined/shapes.kpm
diff --git a/kpovmodeler/examples/includes/inlined/shapes2.kpm b/kpovmodeler/examples/includes/inlined/shapes2.kpm
new file mode 100644
index 00000000..72421aef
--- /dev/null
+++ b/kpovmodeler/examples/includes/inlined/shapes2.kpm
diff --git a/kpovmodeler/examples/includes/inlined/shapesq.kpm b/kpovmodeler/examples/includes/inlined/shapesq.kpm
new file mode 100644
index 00000000..3aa691b6
--- /dev/null
+++ b/kpovmodeler/examples/includes/inlined/shapesq.kpm
diff --git a/kpovmodeler/examples/includes/inlined/skies.kpm b/kpovmodeler/examples/includes/inlined/skies.kpm
new file mode 100644
index 00000000..9c4ff952
--- /dev/null
+++ b/kpovmodeler/examples/includes/inlined/skies.kpm
diff --git a/kpovmodeler/examples/includes/inlined/stars.kpm b/kpovmodeler/examples/includes/inlined/stars.kpm
new file mode 100644
index 00000000..9ec844a6
--- /dev/null
+++ b/kpovmodeler/examples/includes/inlined/stars.kpm
diff --git a/kpovmodeler/examples/includes/inlined/stones1.kpm b/kpovmodeler/examples/includes/inlined/stones1.kpm
new file mode 100644
index 00000000..67ddadfe
--- /dev/null
+++ b/kpovmodeler/examples/includes/inlined/stones1.kpm
diff --git a/kpovmodeler/examples/includes/inlined/stones2.kpm b/kpovmodeler/examples/includes/inlined/stones2.kpm
new file mode 100644
index 00000000..955052e5
--- /dev/null
+++ b/kpovmodeler/examples/includes/inlined/stones2.kpm
diff --git a/kpovmodeler/examples/includes/inlined/textures.kpm b/kpovmodeler/examples/includes/inlined/textures.kpm
new file mode 100644
index 00000000..4f5d3dc9
--- /dev/null
+++ b/kpovmodeler/examples/includes/inlined/textures.kpm
diff --git a/kpovmodeler/examples/includes/inlined/woods.kpm b/kpovmodeler/examples/includes/inlined/woods.kpm
new file mode 100644
index 00000000..f5b12879
--- /dev/null
+++ b/kpovmodeler/examples/includes/inlined/woods.kpm
diff --git a/kpovmodeler/examples/includes/original/Makefile.am b/kpovmodeler/examples/includes/original/Makefile.am
new file mode 100644
index 00000000..544ecd09
--- /dev/null
+++ b/kpovmodeler/examples/includes/original/Makefile.am
@@ -0,0 +1,4 @@
+exdir = $(kde_datadir)/kpovmodeler/examples/includes/original
+ex_DATA = chars.kpm finish.kpm glass.kpm golds.kpm metals.kpm shapes.kpm \
+	shapes2.kpm shapesq.kpm skies.kpm stars.kpm stones1.kpm stones2.kpm \
+	textures.kpm woods.kpm
\ No newline at end of file
diff --git a/kpovmodeler/examples/includes/original/chars.kpm b/kpovmodeler/examples/includes/original/chars.kpm
new file mode 100644
index 00000000..1f16af27
--- /dev/null
+++ b/kpovmodeler/examples/includes/original/chars.kpm
diff --git a/kpovmodeler/examples/includes/original/finish.kpm b/kpovmodeler/examples/includes/original/finish.kpm
new file mode 100644
index 00000000..57964af6
--- /dev/null
+++ b/kpovmodeler/examples/includes/original/finish.kpm
diff --git a/kpovmodeler/examples/includes/original/glass.kpm b/kpovmodeler/examples/includes/original/glass.kpm
new file mode 100644
index 00000000..9750c57a
--- /dev/null
+++ b/kpovmodeler/examples/includes/original/glass.kpm
diff --git a/kpovmodeler/examples/includes/original/golds.kpm b/kpovmodeler/examples/includes/original/golds.kpm
new file mode 100644
index 00000000..d11b632b
--- /dev/null
+++ b/kpovmodeler/examples/includes/original/golds.kpm
diff --git a/kpovmodeler/examples/includes/original/metals.kpm b/kpovmodeler/examples/includes/original/metals.kpm
new file mode 100644
index 00000000..c5634789
--- /dev/null
+++ b/kpovmodeler/examples/includes/original/metals.kpm
diff --git a/kpovmodeler/examples/includes/original/shapes.kpm b/kpovmodeler/examples/includes/original/shapes.kpm
new file mode 100644
index 00000000..e587d44b
--- /dev/null
+++ b/kpovmodeler/examples/includes/original/shapes.kpm
diff --git a/kpovmodeler/examples/includes/original/shapes2.kpm b/kpovmodeler/examples/includes/original/shapes2.kpm
new file mode 100644
index 00000000..206f375a
--- /dev/null
+++ b/kpovmodeler/examples/includes/original/shapes2.kpm
diff --git a/kpovmodeler/examples/includes/original/shapesq.kpm b/kpovmodeler/examples/includes/original/shapesq.kpm
new file mode 100644
index 00000000..416d190e
--- /dev/null
+++ b/kpovmodeler/examples/includes/original/shapesq.kpm
diff --git a/kpovmodeler/examples/includes/original/skies.kpm b/kpovmodeler/examples/includes/original/skies.kpm
new file mode 100644
index 00000000..e5c65c04
--- /dev/null
+++ b/kpovmodeler/examples/includes/original/skies.kpm
diff --git a/kpovmodeler/examples/includes/original/stars.kpm b/kpovmodeler/examples/includes/original/stars.kpm
new file mode 100644
index 00000000..b17cb306
--- /dev/null
+++ b/kpovmodeler/examples/includes/original/stars.kpm
diff --git a/kpovmodeler/examples/includes/original/stones1.kpm b/kpovmodeler/examples/includes/original/stones1.kpm
new file mode 100644
index 00000000..0753b49e
--- /dev/null
+++ b/kpovmodeler/examples/includes/original/stones1.kpm
diff --git a/kpovmodeler/examples/includes/original/stones2.kpm b/kpovmodeler/examples/includes/original/stones2.kpm
new file mode 100644
index 00000000..16438514
--- /dev/null
+++ b/kpovmodeler/examples/includes/original/stones2.kpm
diff --git a/kpovmodeler/examples/includes/original/textures.kpm b/kpovmodeler/examples/includes/original/textures.kpm
new file mode 100644
index 00000000..ae6cca1f
--- /dev/null
+++ b/kpovmodeler/examples/includes/original/textures.kpm
diff --git a/kpovmodeler/examples/includes/original/woods.kpm b/kpovmodeler/examples/includes/original/woods.kpm
new file mode 100644
index 00000000..4cdca2ec
--- /dev/null
+++ b/kpovmodeler/examples/includes/original/woods.kpm