commit 7bd24d1ff97fa68fcdc5810af8b579027aef9f4a
parent d0bde622f4c812a5d9c9b1c27a0337a77fbff1f7
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date: Mon, 24 Apr 2017 14:22:01 +0200
Adapt test08 to new circular clips' default.
Remove useless ground geometry.
Diffstat:
3 files changed, 31 insertions(+), 51 deletions(-)
diff --git a/yaml/test08.ref b/yaml/test08.ref
@@ -1,12 +1,12 @@
#--- Sun direction: 0 63 (-0.45399 -0 -0.891007)
7 1 1 10000 0
-83.314 0
+85.5109 0
0 0
-0.919508 0.000423742
+0.917875 0.000431307
0 0
-76.5367 1.3487e-08
+78.4137 2.52319e-08
0 0
0 0
-reflector.ground.pivot.small_square 10 1 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 76.5367 1.3487e-08 0 0 0 0 0 0
-reflector.ground.pivot.parabol 6 83.314 10000 0 0 0 0
-10 6 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 76.5367 1.3487e-08 0 0 0 0
+reflector.pivot.small_square 6 1 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 78.4137 2.52319e-08 0 0 0 0 0 0
+reflector.pivot.parabol 2 85.5109 10000 0 0 0 0
+6 2 FRONT: -1 -1 -1 -1 -1 -1 -1 -1 BACK: 0 0 78.4137 2.52319e-08 0 0 0 0
diff --git a/yaml/test08.yaml b/yaml/test08.yaml
@@ -7,54 +7,34 @@
matte: { reflectivity: 1 }
- material: &specular
- mirror: { reflectivity: 1, roughness: 0 }
-
-
+ mirror: { reflectivity: 1, roughness: 0 }
+
- template: &self_oriented_parabol
- name: "ground"
- primary: 0
- geometry:
- - material: *lambertian
+ name: "pivot"
+ transform: { translation: [0, 0, 4], rotation: [0, 0, 90] }
+ x_pivot:
+ target: { sun: *sun }
+ children:
+ - name: "parabol"
+ primary: 1
+ geometry:
+ - material: *specular
+ parabol:
+ focal: 4
+ clip:
+ - operation: AND
+ circle: { radius: 5 }
+ - name: "small_square"
+ transform: { translation: [0, 0, 4] }
+ primary: 0
+ geometry:
+ - material: { virtual: }
plane:
clip:
- - operation: AND
- vertices:
- - [-20.0, -20.0]
- - [-20.0, 20.0]
- - [ 20.0, 20.0]
- - [ 20.0, -20.0]
- children:
- - name: "pivot"
- transform: { translation: [0, 0, 4], rotation: [0, 0, 90] }
- x_pivot:
- target: { sun: *sun }
- children:
- - name: "parabol"
- primary: 1
- geometry:
- - material: *specular
- parabol:
- focal: 4
- clip:
- - operation: AND
- circle: { radius: 5 }
- - name: "small_square"
- transform: { translation: [0, 0, 4] }
- primary: 0
- geometry:
- - material: { virtual: }
- plane:
- clip:
- - operation: AND
- vertices:
- - [-0.50, -0.50]
- - [-0.50, 0.50]
- - [0.50, 0.50]
- - [0.50, -0.50]
-
-
+ - operation: AND
+ vertices: [ [-0.50, -0.50], [-0.50, 0.50], [0.50, 0.50], [0.50, -0.50] ]
+
- entity:
name: "reflector"
transform: { rotation: [0, 0, 0], translation: [0, 0, 0] }
children: [ *self_oriented_parabol ]
-
diff --git a/yaml/test08_receiver.yaml b/yaml/test08_receiver.yaml
@@ -1 +1 @@
-- { name: "reflector.ground.pivot.small_square", side: BACK }
+- { name: "reflector.pivot.small_square", side: BACK }
