Record your screen, ship a demo. Free and open-source, GPU-accelerated, no watermarks, no subscriptions. Windows, macOS, Linux. Actively maintained.
TypeScript cross-platformelectronffmpegopen-sourceproduct-demorustscreen-capturescreen-recorderscreen-recordingscreen-studioscreencastspeech-to-texttypescriptvideo-editingvideo-editorwaylandwgpuwhisper
perf(compositor): group Prism Glow's triangles in bounding boxes
EtienneLescot7b51bfce2967
diff --git a/crates/compositor/src/compositor_linux.rs b/crates/compositor/src/compositor_linux.rsindex b99db602a..74538623b 100644--- a/crates/compositor/src/compositor_linux.rs+++ b/crates/compositor/src/compositor_linux.rs@@ -71,11 +71,12 @@ fn layer_bytes(cb: &LayerCB) -> &[u8] {unsafe { std::slice::from_raw_parts(cb as *const LayerCB as *const u8, LAYER_BYTES as usize) }}-/// Le maillage de Prism Glow tel que le lit le WGSL (`PrismMesh`) : les triangles, puis les-/// polygones, un point par vec4 (le pas d'un tableau uniform).+/// Le maillage de Prism Glow tel que le lit le WGSL (`PrismMesh`) : les triangles, les+/// polygones, un point par vec4 (le pas d'un tableau uniform), puis les boîtes.fn prism_mesh_bytes() -> Vec<u8> {- let points = crate::prism_mesh::POLYS.iter().map(|&[x, y]| [x, y, 0.0, 0.0]);- crate::prism_mesh::TRIS.iter().copied().chain(points).flatten().flat_map(f32::to_ne_bytes).collect()+ use crate::prism_mesh::{BOXES, POLYS, TRIS};+ let points = POLYS.iter().map(|&[x, y]| [x, y, 0.0, 0.0]);+ TRIS.iter().copied().chain(points).chain(BOXES).flatten().flat_map(f32::to_ne_bytes).collect()}/// Un calque de fond deja lie, en attente de son `draw`. `_buf`/`_tex`/`_view`diff --git a/crates/compositor/src/prism_mesh.rs b/crates/compositor/src/prism_mesh.rsindex 2be2df9a7..c045462b0 100644--- a/crates/compositor/src/prism_mesh.rs+++ b/crates/compositor/src/prism_mesh.rs@@ -7,7 +7,8 @@//! cristal tient en quatre float4 : (v0, drapeaux), (e1, r), (e2, g), (normale, b) ; drapeaux =//! paroi (1) + 2 × arêtes réelles (bit k : l'arête opposée au sommet k). Le fond plat, en//! z = -épaisseur, est laissé au shader. `POLYS` tient les silhouettes (bord extérieur du-//! serti) puis les contours du cristal (son bord intérieur).+//! serti) puis les contours du cristal (son bord intérieur). `BOXES` range les triangles+//! par voisinage : deux float4 par boîte, (coin bas, premier triangle), (coin haut, nombre)./// Un des deux modèles : ses triangles et sa silhouette dans les tables, sa boîte de dessin.pub struct PrismModel {@@ -17,6 +18,8 @@ pub struct PrismModel {pub sil_count: usize,pub out_start: usize,pub out_count: usize,+ pub box_start: usize,+ pub box_count: usize,/// Largeur de la boîte, hauteur 1 (le sprite), en unités du modèle.pub size: [f32; 2],/// Hotspot, fraction de la boîte.@@ -40,6 +43,8 @@ pub const MODELS: [PrismModel; 2] = [sil_count: 25,out_start: 67,out_count: 9,+ box_start: 0,+ box_count: 4,size: [0.63089, 1.0],hotspot: [0.022658, 0.064647],top: 0.0625,@@ -53,6 +58,8 @@ pub const MODELS: [PrismModel; 2] = [sil_count: 42,out_start: 76,out_count: 34,+ box_start: 4,+ box_count: 18,size: [0.797658, 1.0],hotspot: [0.343388, 0.063582],top: 0.0625,@@ -62,18 +69,38 @@ pub const MODELS: [PrismModel; 2] = [];pub const TRIS: [[f32; 4]; 644] = [- [0.035429, 0.482055, 0.0, 14.0],- [0.134202, -0.125614, 0.115951, 0.000305],- [-0.004294, -0.419785, 0.0, 0.938689],- [-0.650191, 0.006652, 0.759742, 0.854994],+ [0.252301, 0.266258, -0.042945, 11.0],+ [-0.221166, -0.203988, 0.0, 0.01033],+ [-0.221166, -0.203988, 0.042945, 0.045182],+ [0.677984, -0.735077, 0.0, 0.577584],+ [0.252301, 0.266258, -0.042945, 3.0],+ [-0.221166, -0.203988, 0.042945, 0.01033],+ [0.0, 0.0, 0.042945, 0.045182],+ [0.677984, -0.735077, 0.0, 0.577584],+ [0.031135, 0.06227, -0.042945, 7.0],+ [0.004294, 0.419785, 0.042945, 0.01033],+ [0.0, 0.0, 0.042945, 0.045182],+ [-0.999948, 0.01023, 0.0, 0.577584],[0.169632, 0.356442, 0.115951, 14.0],[0.082669, -0.090184, -0.115951, 0.590616],[-0.138497, -0.294172, -0.115951, 0.737911],[0.466385, -0.505659, 0.725806, 0.973449],+ [0.035429, 0.482055, 0.0, 14.0],+ [0.134202, -0.125614, 0.115951, 0.000305],+ [-0.004294, -0.419785, 0.0, 0.938689],+ [-0.650191, 0.006652, 0.759742, 0.854994],+ [0.031135, 0.06227, -0.042945, 9.0],+ [0.004294, 0.419785, 0.0, 0.01033],+ [0.004294, 0.419785, 0.042945, 0.045182],+ [-0.999948, 0.01023, 0.0, 0.577584],[0.169632, 0.356442, 0.115951, 14.0],[0.159969, 0.080521, -0.045092, 0.381323],[0.082669, -0.090184, -0.115951, 0.056123],[0.461407, -0.510214, 0.725799, 0.973449],+ [0.541104, 0.544325, -0.042945, 9.0],+ [-0.288804, -0.278068, 0.0, 0.01033],+ [-0.288804, -0.278068, 0.042945, 0.045182],+ [0.69359, -0.72037, 0.0, 0.577584],[0.329601, 0.436963, 0.070859, 14.0],[0.211503, 0.107362, -0.070859, 0.545724],[-0.077301, -0.170706, -0.070859, 0.064805],@@ -82,53 +109,77 @@ pub const TRIS: [[f32; 4]; 644] = [[0.061196, -0.096626, -0.010736, 0.000916],[-0.098773, -0.177147, 0.034356, 0.046662],[0.247834, 0.049458, 0.967539, 0.904662],+ [0.541104, 0.544325, -0.042945, 7.0],+ [-0.288804, -0.278068, 0.042945, 0.01033],+ [0.0, 0.0, 0.042945, 0.045182],+ [0.69359, -0.72037, 0.0, 0.577584],+ [0.199693, 0.595859, 0.0, 14.0],+ [0.068712, -0.06227, 0.081595, 0.0],+ [-0.030061, -0.239417, 0.115951, 0.01445],+ [-0.504461, 0.426837, 0.750553, 0.254154],[0.268405, 0.533589, 0.081595, 14.0],[0.272699, 0.010736, -0.081595, 0.0],[0.061196, -0.096626, -0.010736, 0.025193],[0.283244, 0.073137, 0.956255, 0.527108],+ [0.035429, 0.482055, 0.0, 14.0],+ [0.0, 0.258742, 0.0, 0.0],+ [0.134202, -0.125614, 0.115951, 0.473533],+ [-0.653777, 0.0, 0.756687, 0.964691],[0.359663, 0.559356, 0.0, 14.0],[0.181442, -0.015031, 0.0, 0.006043],[-0.091258, -0.025767, 0.081595, 0.076188],[0.076465, 0.923048, 0.37701, 0.964691],- [0.199693, 0.595859, 0.0, 14.0],- [0.068712, -0.06227, 0.081595, 0.0],- [-0.030061, -0.239417, 0.115951, 0.01445],- [-0.504461, 0.426837, 0.750553, 0.254154],+ [0.035429, 0.482055, -0.042945, 3.0],+ [0.0, 0.258742, 0.042945, 0.01033],+ [0.0, 0.0, 0.042945, 0.045182],+ [-1.0, 0.0, 0.0, 0.577584],+ [0.035429, 0.482055, -0.042945, 11.0],+ [0.0, 0.258742, 0.0, 0.01033],+ [0.0, 0.258742, 0.042945, 0.045182],+ [-1.0, 0.0, 0.0, 0.577584],+ [0.035429, 0.740798, -0.042945, 7.0],+ [0.164264, -0.144939, 0.042945, 0.01033],+ [0.0, 0.0, 0.042945, 0.045182],+ [0.661622, 0.749838, 0.0, 0.577584],[0.035429, 0.740798, 0.0, 14.0],[0.164264, -0.144939, 0.0, 0.0],[0.134202, -0.384356, 0.115951, 0.010956],[0.332572, 0.376915, 0.864483, 0.215854],- [0.035429, 0.482055, 0.0, 14.0],- [0.0, 0.258742, 0.0, 0.0],- [0.134202, -0.125614, 0.115951, 0.473533],- [-0.653777, 0.0, 0.756687, 0.964691],+ [0.035429, 0.740798, -0.042945, 11.0],+ [0.164264, -0.144939, 0.0, 0.01033],+ [0.164264, -0.144939, 0.042945, 0.045182],+ [0.661622, 0.749838, 0.0, 0.577584],+ [0.199693, 0.595859, -0.042945, 7.0],+ [0.105215, 0.22546, 0.042945, 0.01033],+ [0.0, 0.0, 0.042945, 0.045182],+ [-0.906183, 0.422886, 0.0, 0.577584],[0.199693, 0.595859, 0.0, 14.0],[0.105215, 0.22546, 0.0, 0.0],[0.068712, -0.06227, 0.081595, 0.015991],[-0.613882, 0.286478, 0.735581, 0.473533],+ [0.199693, 0.595859, -0.042945, 11.0],+ [0.105215, 0.22546, 0.0, 0.01033],+ [0.105215, 0.22546, 0.042945, 0.045182],+ [-0.906183, 0.422886, 0.0, 0.577584],[0.304908, 0.821319, 0.0, 14.0],[0.128834, -0.067638, 0.0, 0.0],[-0.036503, -0.28773, 0.081595, 0.254154],[0.133686, 0.254641, 0.957751, 0.973449],+ [0.304908, 0.821319, -0.042945, 7.0],+ [0.128834, -0.067638, 0.042945, 0.01033],+ [0.0, 0.0, 0.042945, 0.045182],+ [0.464834, 0.885398, 0.0, 0.577584],[0.433742, 0.753681, 0.0, 14.0],[-0.07408, -0.194325, 0.0, 0.0],[-0.165337, -0.220092, 0.081595, 0.964691],[0.683362, -0.260508, 0.682021, 0.964691],- [0.035429, 0.482055, -0.042945, 3.0],- [0.0, 0.258742, 0.042945, 0.01033],- [0.0, 0.0, 0.042945, 0.045182],- [-1.0, 0.0, 0.0, 0.577584],- [0.035429, 0.740798, -0.042945, 7.0],- [0.164264, -0.144939, 0.042945, 0.01033],- [0.0, 0.0, 0.042945, 0.045182],- [0.661622, 0.749838, 0.0, 0.577584],- [0.199693, 0.595859, -0.042945, 7.0],- [0.105215, 0.22546, 0.042945, 0.01033],- [0.0, 0.0, 0.042945, 0.045182],- [-0.906183, 0.422886, 0.0, 0.577584],- [0.304908, 0.821319, -0.042945, 7.0],- [0.128834, -0.067638, 0.042945, 0.01033],- [0.0, 0.0, 0.042945, 0.045182],+ [0.433742, 0.753681, -0.042945, 11.0],+ [-0.07408, -0.194325, 0.0, 0.01033],+ [-0.07408, -0.194325, 0.042945, 0.045182],+ [0.934406, -0.35621, 0.0, 0.577584],+ [0.304908, 0.821319, -0.042945, 11.0],+ [0.128834, -0.067638, 0.0, 0.01033],+ [0.128834, -0.067638, 0.042945, 0.045182],[0.464834, 0.885398, 0.0, 0.577584],[0.433742, 0.753681, -0.042945, 7.0],[-0.07408, -0.194325, 0.042945, 0.01033],@@ -138,70 +189,86 @@ pub const TRIS: [[f32; 4]; 644] = [[0.181442, -0.015031, 0.042945, 0.01033],[0.0, 0.0, 0.042945, 0.045182],[0.082557, 0.996586, 0.0, 0.577584],- [0.541104, 0.544325, -0.042945, 7.0],- [-0.288804, -0.278068, 0.042945, 0.01033],- [0.0, 0.0, 0.042945, 0.045182],- [0.69359, -0.72037, 0.0, 0.577584],- [0.252301, 0.266258, -0.042945, 3.0],- [-0.221166, -0.203988, 0.042945, 0.01033],- [0.0, 0.0, 0.042945, 0.045182],- [0.677984, -0.735077, 0.0, 0.577584],- [0.031135, 0.06227, -0.042945, 7.0],- [0.004294, 0.419785, 0.042945, 0.01033],- [0.0, 0.0, 0.042945, 0.045182],- [-0.999948, 0.01023, 0.0, 0.577584],- [0.035429, 0.482055, -0.042945, 11.0],- [0.0, 0.258742, 0.0, 0.01033],- [0.0, 0.258742, 0.042945, 0.045182],- [-1.0, 0.0, 0.0, 0.577584],- [0.035429, 0.740798, -0.042945, 11.0],- [0.164264, -0.144939, 0.0, 0.01033],- [0.164264, -0.144939, 0.042945, 0.045182],- [0.661622, 0.749838, 0.0, 0.577584],- [0.199693, 0.595859, -0.042945, 11.0],- [0.105215, 0.22546, 0.0, 0.01033],- [0.105215, 0.22546, 0.042945, 0.045182],- [-0.906183, 0.422886, 0.0, 0.577584],- [0.304908, 0.821319, -0.042945, 11.0],- [0.128834, -0.067638, 0.0, 0.01033],- [0.128834, -0.067638, 0.042945, 0.045182],- [0.464834, 0.885398, 0.0, 0.577584],- [0.433742, 0.753681, -0.042945, 11.0],- [-0.07408, -0.194325, 0.0, 0.01033],- [-0.07408, -0.194325, 0.042945, 0.045182],- [0.934406, -0.35621, 0.0, 0.577584],[0.359663, 0.559356, -0.042945, 11.0],[0.181442, -0.015031, 0.0, 0.01033],[0.181442, -0.015031, 0.042945, 0.045182],[0.082557, 0.996586, 0.0, 0.577584],- [0.541104, 0.544325, -0.042945, 9.0],- [-0.288804, -0.278068, 0.0, 0.01033],- [-0.288804, -0.278068, 0.042945, 0.045182],- [0.69359, -0.72037, 0.0, 0.577584],- [0.252301, 0.266258, -0.042945, 11.0],- [-0.221166, -0.203988, 0.0, 0.01033],- [-0.221166, -0.203988, 0.042945, 0.045182],- [0.677984, -0.735077, 0.0, 0.577584],- [0.031135, 0.06227, -0.042945, 9.0],- [0.004294, 0.419785, 0.0, 0.01033],- [0.004294, 0.419785, 0.042945, 0.045182],- [-0.999948, 0.01023, 0.0, 0.577584],- [-0.031366, 0.229295, 0.058405, 14.0],- [0.089771, -0.137361, -0.02055, 0.445197],- [0.035692, -0.155748, -0.008653, 0.973449],- [0.216369, -0.004654, 0.976301, 0.973449],- [0.044345, 0.043263, 0.0, 6.0],- [-0.040019, 0.030284, 0.049753, 0.000305],- [0.014061, 0.048671, 0.037855, 0.964691],- [0.365607, -0.634949, 0.680566, 0.973449],+ [0.044345, 0.043263, -0.043263, 11.0],+ [-0.043263, -0.005408, 0.0, 0.01033],+ [-0.043263, -0.005408, 0.043263, 0.045182],+ [0.124035, -0.992278, 0.0, 0.577584],+ [0.044345, 0.043263, -0.043263, 7.0],+ [-0.043263, -0.005408, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [0.124035, -0.992278, 0.0, 0.577584],+ [0.001082, 0.037855, -0.043263, 7.0],+ [-0.044345, 0.040019, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [-0.669964, -0.742393, 0.0, 0.577584],+ [0.044345, 0.043263, 0.0, 10.0],+ [-0.043263, -0.005408, 0.0, 0.000305],+ [-0.040019, 0.030284, 0.049753, 0.964691],+ [0.101434, -0.811469, 0.575525, 0.973449],[0.004326, 0.073548, 0.049753, 14.0],[-0.003245, -0.035692, -0.049753, 0.0],[-0.04759, 0.004326, -0.049753, 0.955978],[-0.580475, -0.643229, 0.499304, 0.896269],+ [0.001082, 0.037855, -0.043263, 11.0],+ [-0.044345, 0.040019, 0.0, 0.01033],+ [-0.044345, 0.040019, 0.043263, 0.045182],+ [-0.669964, -0.742393, 0.0, 0.577584],+ [-0.031366, 0.229295, 0.058405, 14.0],+ [0.035692, -0.155748, -0.008653, 0.000305],+ [-0.011897, -0.151422, -0.058405, 0.955978],+ [-0.716533, -0.20131, 0.667874, 0.904662],+ [-0.043263, 0.077874, -0.043263, 7.0],+ [-0.001082, 0.154666, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [-0.999976, -0.006993, 0.0, 0.577584],+ [-0.031366, 0.229295, 0.058405, 14.0],+ [0.089771, -0.137361, -0.02055, 0.445197],+ [0.035692, -0.155748, -0.008653, 0.973449],+ [0.216369, -0.004654, 0.976301, 0.973449],[-0.031366, 0.229295, 0.058405, 14.0],[-0.011897, -0.151422, -0.058405, 0.000305],[-0.012979, 0.003245, -0.058405, 0.955978],[-0.976245, -0.006827, 0.216564, 0.904662],+ [-0.043263, 0.077874, -0.043263, 9.0],+ [-0.001082, 0.154666, 0.0, 0.01033],+ [-0.001082, 0.154666, 0.043263, 0.045182],+ [-0.999976, -0.006993, 0.0, 0.577584],+ [-0.045426, 0.564586, 0.052998, 14.0],+ [0.014061, -0.335291, 0.005408, 0.520989],+ [0.001082, -0.332046, -0.052998, 0.088655],+ [-0.975941, -0.037462, 0.214794, 0.973449],+ [-0.044345, 0.23254, 0.0, 3.0],+ [0.0, 0.0, -0.043263, 0.01033],+ [-0.001082, 0.332046, -0.043263, 0.045182],+ [-0.999995, -0.003257, 0.0, 0.577584],+ [-0.163319, 0.380717, -0.043263, 7.0],+ [-0.060569, 0.02704, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [-0.407651, -0.913138, 0.0, 0.577584],+ [-0.094098, 0.431551, -0.043263, 11.0],+ [-0.069221, -0.050834, 0.0, 0.01033],+ [-0.069221, -0.050834, 0.043263, 0.045182],+ [0.591909, -0.806004, 0.0, 0.577584],+ [-0.163319, 0.380717, -0.043263, 11.0],+ [-0.060569, 0.02704, 0.0, 0.01033],+ [-0.060569, 0.02704, 0.043263, 0.045182],+ [-0.407651, -0.913138, 0.0, 0.577584],+ [0.075711, 0.08869, -0.043263, 11.0],+ [-0.031366, -0.045426, 0.0, 0.01033],+ [-0.031366, -0.045426, 0.043263, 0.045182],+ [0.822897, -0.568191, 0.0, 0.577584],+ [0.044345, 0.043263, 0.0, 6.0],+ [-0.040019, 0.030284, 0.049753, 0.000305],+ [0.014061, 0.048671, 0.037855, 0.964691],+ [0.365607, -0.634949, 0.680566, 0.973449],+ [0.075711, 0.08869, -0.043263, 7.0],+ [-0.031366, -0.045426, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [0.822897, -0.568191, 0.0, 0.577584],[0.058405, 0.091934, 0.037855, 14.0],[0.017305, -0.003245, -0.037855, 0.0],[-0.014061, -0.048671, -0.037855, 0.473533],@@ -210,310 +277,338 @@ pub const TRIS: [[f32; 4]; 644] = [[0.107077, -0.140606, -0.058405, 0.0],[0.089771, -0.137361, -0.02055, 0.376257],[0.812052, 0.481346, 0.329966, 0.830777],- [-0.045426, 0.564586, 0.052998, 14.0],- [0.014061, -0.335291, 0.005408, 0.520989],- [0.001082, -0.332046, -0.052998, 0.088655],- [-0.975941, -0.037462, 0.214794, 0.973449],- [0.10924, 0.439122, 0.0, 14.0],- [-0.031366, -0.031366, 0.0, 0.132876],- [-0.154666, 0.125464, 0.052998, 0.028428],- [0.182761, -0.182761, 0.966021, 0.955978],- [0.128708, 0.463999, 0.063813, 14.0],- [-0.019468, -0.024876, -0.063813, 0.168276],- [-0.174135, 0.100587, -0.010816, 0.038209],- [-0.469238, -0.764881, 0.441331, 0.955978],- [0.201174, 0.638133, 0.0822, 14.0],- [-0.072466, -0.174135, -0.018387, 0.18117],- [-0.246601, -0.073548, -0.029203, 0.082277],- [-0.098561, -0.063844, 0.993081, 0.973449],- [0.128708, 0.463999, 0.063813, 14.0],- [0.055161, -0.146014, -0.025958, 0.246204],- [0.016224, -0.156829, -0.014061, 0.964691],- [0.305397, -0.053644, 0.950713, 0.973449],- [0.183869, 0.317985, 0.037855, 6.0],- [-0.036774, -0.045426, -0.037855, 0.0],- [-0.038937, -0.010816, 0.011897, 0.806958],- [0.374433, -0.753477, 0.540438, 0.854994],- [0.144932, 0.307169, 0.049753, 14.0],- [0.002163, -0.034611, -0.049753, 0.0],- [-0.033529, 0.0, -0.049753, 0.9131],- [-0.630237, -0.649931, 0.424725, 0.904662],- [0.10924, 0.439122, 0.0, 6.0],- [0.035692, -0.131953, 0.049753, 0.18117],- [0.002163, -0.131953, 0.0, 0.955978],- [-0.82919, -0.013593, 0.558802, 0.964691],- [0.183869, 0.317985, 0.037855, 14.0],- [0.02704, -0.004326, -0.037855, 0.0],- [0.005408, -0.037855, -0.037855, 0.514916],- [0.70062, -0.452013, 0.552101, 0.846876],- [0.210908, 0.445612, 0.0, 10.0],- [0.0, -0.131953, 0.0, 0.0],+ [0.077874, 0.407756, -0.043263, 11.0],+ [-0.002163, -0.319067, 0.0, 0.01033],+ [-0.002163, -0.319067, 0.043263, 0.045182],+ [0.999977, -0.006779, 0.0, 0.577584],+ [-0.031366, 0.229295, 0.058405, 14.0],+ [0.10924, 0.178461, -0.058405, 0.0],+ [0.107077, -0.140606, -0.058405, 0.376257],+ [0.475583, -0.003224, 0.879665, 0.830777],+ [0.147095, 0.272559, -0.043263, 7.0],+ [-0.035692, 0.034611, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [-0.696146, -0.7179, 0.0, 0.577584],+ [0.147095, 0.272559, -0.043263, 11.0],+ [-0.035692, 0.034611, 0.0, 0.01033],+ [-0.035692, 0.034611, 0.043263, 0.045182],+ [-0.696146, -0.7179, 0.0, 0.577584],+ [0.144932, 0.307169, 0.049753, 14.0],+ [0.002163, -0.034611, -0.049753, 0.0],+ [-0.033529, 0.0, -0.049753, 0.9131],+ [-0.630237, -0.649931, 0.424725, 0.904662],+ [0.183869, 0.317985, 0.037855, 6.0],+ [-0.036774, -0.045426, -0.037855, 0.0],+ [-0.038937, -0.010816, 0.011897, 0.806958],+ [0.374433, -0.753477, 0.540438, 0.854994],+ [0.077874, 0.407756, -0.043263, 7.0],+ [-0.002163, -0.319067, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [0.999977, -0.006779, 0.0, 0.577584],+ [0.111403, 0.307169, -0.043263, 7.0],+ [-0.002163, 0.131953, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [-0.999866, -0.016391, 0.0, 0.577584],+ [0.10924, 0.439122, 0.0, 6.0],+ [0.035692, -0.131953, 0.049753, 0.18117],+ [0.002163, -0.131953, 0.0, 0.955978],+ [-0.82919, -0.013593, 0.558802, 0.964691],+ [0.128708, 0.463999, 0.063813, 14.0],+ [0.055161, -0.146014, -0.025958, 0.246204],+ [0.016224, -0.156829, -0.014061, 0.964691],+ [0.305397, -0.053644, 0.950713, 0.973449],+ [0.111403, 0.307169, -0.043263, 11.0],+ [-0.002163, 0.131953, 0.0, 0.01033],+ [-0.002163, 0.131953, 0.043263, 0.045182],+ [-0.999866, -0.016391, 0.0, 0.577584],+ [0.189277, 0.28013, -0.043263, 11.0],+ [-0.042182, -0.007571, 0.0, 0.01033],+ [-0.042182, -0.007571, 0.043263, 0.045182],+ [0.176664, -0.984271, 0.0, 0.577584],+ [0.183869, 0.317985, 0.037855, 10.0],+ [0.005408, -0.037855, -0.037855, 0.0],+ [-0.036774, -0.045426, -0.037855, 0.806958],+ [0.124328, -0.692684, 0.710445, 0.854994],+ [0.189277, 0.28013, -0.043263, 7.0],+ [-0.042182, -0.007571, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [0.176664, -0.984271, 0.0, 0.577584],+ [0.183869, 0.317985, 0.037855, 14.0],+ [0.02704, -0.004326, -0.037855, 0.0],+ [0.005408, -0.037855, -0.037855, 0.514916],+ [0.70062, -0.452013, 0.552101, 0.846876],+ [0.210908, 0.313659, -0.043263, 11.0],+ [-0.021632, -0.033529, 0.0, 0.01033],+ [-0.021632, -0.033529, 0.043263, 0.045182],+ [0.840297, -0.542127, 0.0, 0.577584],+ [0.210908, 0.445612, 0.0, 10.0],+ [0.0, -0.131953, 0.0, 0.0],[-0.02704, -0.127627, 0.037855, 0.439658],[0.813734, 0.0, 0.581238, 0.871366],+ [0.210908, 0.313659, -0.043263, 7.0],+ [-0.021632, -0.033529, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [0.840297, -0.542127, 0.0, 0.577584],+ [0.210908, 0.445612, -0.043263, 11.0],+ [0.0, -0.131953, 0.0, 0.01033],+ [0.0, -0.131953, 0.043263, 0.045182],+ [1.0, 0.0, 0.0, 0.577584],+ [0.241193, 0.343943, -0.043263, 7.0],+ [-0.002163, 0.107077, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [-0.999796, -0.020198, 0.0, 0.577584],+ [0.276885, 0.311496, -0.043263, 11.0],+ [-0.035692, 0.032447, 0.0, 0.01033],+ [-0.035692, 0.032447, 0.043263, 0.045182],+ [-0.672673, -0.73994, 0.0, 0.577584],+ [0.23903, 0.45102, 0.0, 14.0],+ [0.042182, -0.108158, 0.046508, 0.000305],+ [0.002163, -0.107077, 0.0, 0.846876],+ [-0.758098, -0.015315, 0.651961, 0.896269],+ [0.276885, 0.311496, -0.043263, 7.0],+ [-0.035692, 0.032447, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [-0.672673, -0.73994, 0.0, 0.577584],+ [0.281211, 0.342862, 0.046508, 14.0],+ [-0.004326, -0.031366, -0.046508, 0.0],+ [-0.040019, 0.001082, -0.046508, 0.752941],+ [-0.58651, -0.645161, 0.489667, 0.846876],[0.246601, 0.459672, 0.06165, 14.0],[0.070303, -0.101669, -0.024876, 0.262257],[0.034611, -0.116811, -0.015142, 0.973449],[0.27928, -0.041605, 0.959308, 0.973449],+ [0.319067, 0.319067, -0.043263, 11.0],+ [-0.042182, -0.007571, 0.0, 0.01033],+ [-0.042182, -0.007571, 0.043263, 0.045182],+ [0.176664, -0.984271, 0.0, 0.577584],+ [0.319067, 0.319067, 0.0, 10.0],+ [-0.042182, -0.007571, 0.0, 0.0],+ [-0.037855, 0.023795, 0.046508, 0.896269],+ [0.1483, -0.826245, 0.54344, 0.896269],+ [0.319067, 0.319067, -0.043263, 7.0],+ [-0.042182, -0.007571, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [0.176664, -0.984271, 0.0, 0.577584],[0.319067, 0.319067, 0.0, 6.0],[-0.037855, 0.023795, 0.046508, 0.0],[-0.002163, 0.038937, 0.036774, 0.896269],[0.437906, -0.604311, 0.665618, 0.896269],- [0.281211, 0.342862, 0.046508, 14.0],- [-0.004326, -0.031366, -0.046508, 0.0],- [-0.040019, 0.001082, -0.046508, 0.752941],- [-0.58651, -0.645161, 0.489667, 0.846876],- [0.23903, 0.45102, 0.0, 14.0],- [0.042182, -0.108158, 0.046508, 0.000305],- [0.002163, -0.107077, 0.0, 0.846876],- [-0.758098, -0.015315, 0.651961, 0.896269],[0.316904, 0.358004, 0.036774, 14.0],[0.024876, -0.004326, -0.036774, 0.0],[0.002163, -0.038937, -0.036774, 0.617212],[0.707338, -0.464191, 0.533104, 0.921584],+ [0.34178, 0.353677, -0.043263, 11.0],+ [-0.022713, -0.034611, 0.0, 0.01033],+ [-0.022713, -0.034611, 0.043263, 0.045182],+ [0.836048, -0.548657, 0.0, 0.577584],[0.340698, 0.474815, 0.0, 14.0],[0.001082, -0.121137, 0.0, 0.0],[-0.023795, -0.116811, 0.036774, 0.473533],[0.828664, 0.007399, 0.559697, 0.930114],- [0.375309, 0.488875, 0.0, 14.0],- [0.078955, -0.08869, 0.032447, 0.223224],- [0.036774, -0.105995, 0.043263, 0.964691],- [0.071225, 0.39802, 0.914608, 0.973449],- [0.45102, 0.359085, 0.0, 6.0],- [-0.038937, 0.023795, 0.043263, 0.000305],- [0.003245, 0.0411, 0.032447, 0.879622],- [0.417852, -0.583049, 0.696744, 0.9131],+ [0.34178, 0.353677, -0.043263, 7.0],+ [-0.022713, -0.034611, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [0.836048, -0.548657, 0.0, 0.577584],+ [0.340698, 0.474815, -0.043263, 11.0],+ [0.001082, -0.121137, 0.0, 0.01033],+ [0.001082, -0.121137, 0.043263, 0.045182],+ [0.99996, 0.008928, 0.0, 0.577584],+ [0.411001, 0.351514, -0.043263, 11.0],+ [-0.034611, 0.030284, 0.0, 0.01033],+ [-0.034611, 0.030284, 0.043263, 0.045182],+ [-0.658505, -0.752577, 0.0, 0.577584],+ [0.411001, 0.351514, -0.043263, 7.0],+ [-0.034611, 0.030284, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [-0.658505, -0.752577, 0.0, 0.577584],[0.412083, 0.38288, 0.043263, 14.0],[-0.001082, -0.031366, -0.043263, 0.0],[-0.035692, -0.001082, -0.043263, 0.745403],[-0.574039, -0.656045, 0.489984, 0.854994],- [0.375309, 0.488875, 0.0, 14.0],- [0.036774, -0.105995, 0.043263, 0.000305],- [0.001082, -0.107077, 0.0, 0.879622],- [-0.771254, -0.00779, 0.63648, 0.896269],+ [0.45102, 0.359085, -0.043263, 11.0],+ [-0.040019, -0.007571, 0.0, 0.01033],+ [-0.040019, -0.007571, 0.043263, 0.045182],+ [0.185892, -0.98257, 0.0, 0.577584],+ [0.45102, 0.359085, 0.0, 10.0],+ [-0.040019, -0.007571, 0.0, 0.000305],+ [-0.038937, 0.023795, 0.043263, 0.879622],+ [0.151736, -0.802035, 0.577682, 0.9131],+ [0.45102, 0.359085, -0.043263, 7.0],+ [-0.040019, -0.007571, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [0.185892, -0.98257, 0.0, 0.577584],+ [0.45102, 0.359085, 0.0, 6.0],+ [-0.038937, 0.023795, 0.043263, 0.000305],+ [0.003245, 0.0411, 0.032447, 0.879622],+ [0.417852, -0.583049, 0.696744, 0.9131],+ [0.473733, 0.391533, -0.043263, 11.0],+ [-0.022713, -0.032447, 0.0, 0.01033],+ [-0.022713, -0.032447, 0.043263, 0.045182],+ [0.819232, -0.573462, 0.0, 0.577584],[0.454264, 0.400185, 0.032447, 14.0],[0.019468, -0.008653, -0.032447, 0.0],[-0.003245, -0.0411, -0.032447, 0.527108],[0.688617, -0.482032, 0.541712, 0.887922],- [0.473733, 0.603523, 0.0, 14.0],- [0.0, -0.21199, 0.0, 0.158953],- [-0.019468, -0.203337, 0.032447, 0.030716],- [0.857493, 0.0, 0.514496, 0.964691],- [0.179543, 0.466162, 0.058405, 10.0],- [-0.050834, -0.002163, 0.005408, 0.000305],- [0.021632, 0.171972, 0.023795, 0.022171],- [0.110896, -0.149888, 0.982464, 0.381323],- [0.326638, 0.830655, 0.0, 14.0],- [0.048671, -0.34178, 0.0, 0.007492],- [-0.125464, -0.192522, 0.0822, 0.054475],- [0.472493, 0.067285, 0.878762, 0.964691],- [0.326638, 0.830655, 0.0, 14.0],- [0.139524, -0.21199, 0.0, 0.0],- [0.048671, -0.34178, 0.0, 0.015213],- [0.0, 0.0, 1.0, 0.428687],- [-0.012979, 0.832818, 0.0, 14.0],- [0.339617, -0.002163, 0.0, 0.0],- [0.214153, -0.194685, 0.0822, 0.027314],- [0.002492, 0.391296, 0.920261, 0.49102],- [-0.012979, 0.832818, 0.0, 14.0],- [0.214153, -0.194685, 0.0822, 0.000305],- [-0.032447, -0.268232, 0.052998, 0.930114],- [-0.176863, 0.211325, 0.961281, 0.973449],- [-0.221724, 0.475896, 0.0, 14.0],- [0.139524, 0.055161, 0.043263, 0.520989],- [0.054079, -0.059487, 0.046508, 0.973449],- [-0.39307, 0.317373, 0.863001, 0.973449],+ [0.473733, 0.391533, -0.043263, 7.0],+ [-0.022713, -0.032447, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [0.819232, -0.573462, 0.0, 0.577584],+ [-0.223888, 0.407756, -0.043263, 7.0],+ [0.002163, 0.06814, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [-0.999496, 0.03173, 0.0, 0.577584],+ [-0.223888, 0.407756, -0.043263, 11.0],+ [0.002163, 0.06814, 0.0, 0.01033],+ [0.002163, 0.06814, 0.043263, 0.045182],+ [-0.999496, 0.03173, 0.0, 0.577584],[-0.167645, 0.416409, 0.046508, 14.0],[-0.056242, -0.008653, -0.046508, 0.000305],[-0.054079, 0.059487, -0.046508, 0.955978],[-0.638985, 0.020285, 0.768952, 0.973449],+ [-0.167645, 0.416409, 0.046508, 14.0],+ [0.004326, -0.035692, -0.046508, 0.000305],+ [-0.056242, -0.008653, -0.046508, 0.955978],+ [-0.339782, -0.761112, 0.552501, 0.973449],+ [-0.221724, 0.475896, 0.0, 14.0],+ [0.139524, 0.055161, 0.043263, 0.520989],+ [0.054079, -0.059487, 0.046508, 0.973449],+ [-0.39307, 0.317373, 0.863001, 0.973449],[-0.167645, 0.416409, 0.046508, 6.0],[0.073548, 0.015142, -0.046508, 0.0],[0.004326, -0.035692, -0.046508, 0.768154],[0.490917, -0.668482, 0.558688, 0.871366],- [-0.099506, 0.68356, 0.0, 14.0],- [0.017305, -0.152503, 0.043263, 0.0],- [-0.122219, -0.207664, 0.0, 0.723049],- [-0.365879, 0.215335, 0.905408, 0.854994],- [-0.099506, 0.68356, 0.0, 14.0],- [0.054079, -0.118974, 0.052998, 0.0],- [0.017305, -0.152503, 0.043263, 0.514916],- [-0.41958, 0.203352, 0.884647, 0.863157],- [-0.099506, 0.68356, 0.0, 14.0],- [0.086527, 0.149258, 0.0, 0.0],- [0.054079, -0.118974, 0.052998, 0.262257],- [-0.385563, 0.223515, 0.8952, 0.9131],- [-0.044345, 0.23254, 0.0, 7.0],- [-0.001082, 0.332046, -0.043263, 0.01033],- [-0.001082, 0.332046, 0.052998, 0.045182],- [-0.999995, -0.003257, 0.0, 0.577584],- [-0.045426, 0.564586, -0.043263, 7.0],- [-0.036774, -0.033529, 0.086527, 0.01033],- [0.0, 0.0, 0.096261, 0.045182],- [0.673754, -0.738956, 0.0, 0.577584],- [-0.0822, 0.531057, -0.043263, 7.0],- [-0.011897, -0.099506, 0.043263, 0.01033],- [0.0, 0.0, 0.086527, 0.045182],- [0.992928, -0.11872, 0.0, 0.577584],[-0.094098, 0.431551, -0.043263, 7.0],[-0.069221, -0.050834, 0.043263, 0.01033],[0.0, 0.0, 0.043263, 0.045182],[0.591909, -0.806004, 0.0, 0.577584],- [-0.163319, 0.380717, -0.043263, 7.0],- [-0.060569, 0.02704, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [-0.407651, -0.913138, 0.0, 0.577584],- [-0.223888, 0.407756, -0.043263, 7.0],- [0.002163, 0.06814, 0.043263, 0.01033],+ [-0.167645, 0.416409, 0.046508, 10.0],+ [0.085445, 0.114648, -0.003245, 0.0],+ [0.073548, 0.015142, -0.046508, 0.768154],+ [0.548356, -0.38771, 0.740936, 0.871366],+ [-0.0822, 0.531057, -0.043263, 11.0],+ [-0.011897, -0.099506, 0.0, 0.01033],+ [-0.011897, -0.099506, 0.043263, 0.045182],+ [0.992928, -0.11872, 0.0, 0.577584],+ [-0.044345, 0.23254, 0.0, 7.0],+ [-0.001082, 0.332046, -0.043263, 0.01033],+ [-0.001082, 0.332046, 0.052998, 0.045182],+ [-0.999995, -0.003257, 0.0, 0.577584],+ [-0.045426, 0.564586, 0.052998, 14.0],+ [0.1233, -0.156829, -0.052998, 0.520989],+ [0.014061, -0.335291, 0.005408, 0.088655],+ [0.429355, 0.032562, 0.902549, 0.973449],+ [0.10924, 0.439122, 0.0, 14.0],+ [-0.031366, -0.031366, 0.0, 0.132876],+ [-0.154666, 0.125464, 0.052998, 0.028428],+ [0.182761, -0.182761, 0.966021, 0.955978],+ [0.10924, 0.439122, -0.043263, 11.0],+ [-0.031366, -0.031366, 0.0, 0.01033],+ [-0.031366, -0.031366, 0.043263, 0.045182],+ [0.707107, -0.707107, 0.0, 0.577584],+ [0.10924, 0.439122, -0.043263, 7.0],+ [-0.031366, -0.031366, 0.043263, 0.01033],[0.0, 0.0, 0.043263, 0.045182],- [-0.999496, 0.03173, 0.0, 0.577584],+ [0.707107, -0.707107, 0.0, 0.577584],+ [0.10924, 0.439122, 0.0, 10.0],+ [0.019468, 0.024876, 0.063813, 0.18117],+ [0.035692, -0.131953, 0.049753, 0.955978],+ [-0.933936, -0.126584, 0.334276, 0.964691],+ [0.128708, 0.463999, 0.063813, 14.0],+ [0.050834, 0.002163, -0.005408, 0.0],+ [0.0822, -0.018387, -0.063813, 0.439658],+ [0.07859, -0.92643, 0.368172, 0.871366],[-0.221724, 0.475896, -0.043263, 7.0],[0.122219, 0.207664, 0.043263, 0.01033],[0.0, 0.0, 0.043263, 0.045182],[-0.861819, 0.507216, 0.0, 0.577584],+ [-0.221724, 0.475896, -0.043263, 9.0],+ [0.122219, 0.207664, 0.0, 0.01033],+ [0.122219, 0.207664, 0.043263, 0.045182],+ [-0.861819, 0.507216, 0.0, 0.577584],+ [-0.099506, 0.68356, 0.0, 14.0],+ [0.017305, -0.152503, 0.043263, 0.0],+ [-0.122219, -0.207664, 0.0, 0.723049],+ [-0.365879, 0.215335, 0.905408, 0.854994],+ [-0.0822, 0.531057, -0.043263, 7.0],+ [-0.011897, -0.099506, 0.043263, 0.01033],+ [0.0, 0.0, 0.086527, 0.045182],+ [0.992928, -0.11872, 0.0, 0.577584],+ [-0.099506, 0.68356, 0.0, 14.0],+ [0.054079, -0.118974, 0.052998, 0.0],+ [0.017305, -0.152503, 0.043263, 0.514916],+ [-0.41958, 0.203352, 0.884647, 0.863157],[-0.099506, 0.68356, -0.043263, 3.0],[0.086527, 0.149258, 0.043263, 0.01033],[0.0, 0.0, 0.043263, 0.045182],[-0.86514, 0.501531, 0.0, 0.577584],+ [-0.045426, 0.564586, -0.043263, 11.0],+ [-0.036774, -0.033529, 0.0, 0.01033],+ [-0.036774, -0.033529, 0.086527, 0.045182],+ [0.673754, -0.738956, 0.0, 0.577584],+ [-0.045426, 0.564586, -0.043263, 7.0],+ [-0.036774, -0.033529, 0.086527, 0.01033],+ [0.0, 0.0, 0.096261, 0.045182],+ [0.673754, -0.738956, 0.0, 0.577584],+ [-0.099506, 0.68356, 0.0, 14.0],+ [0.086527, 0.149258, 0.0, 0.0],+ [0.054079, -0.118974, 0.052998, 0.262257],+ [-0.385563, 0.223515, 0.8952, 0.9131],+ [-0.099506, 0.68356, -0.043263, 11.0],+ [0.086527, 0.149258, 0.0, 0.01033],+ [0.086527, 0.149258, 0.043263, 0.045182],+ [-0.86514, 0.501531, 0.0, 0.577584],+ [-0.012979, 0.832818, 0.0, 14.0],+ [0.214153, -0.194685, 0.0822, 0.000305],+ [-0.032447, -0.268232, 0.052998, 0.930114],+ [-0.176863, 0.211325, 0.961281, 0.973449],+ [0.128708, 0.463999, 0.063813, 14.0],+ [-0.019468, -0.024876, -0.063813, 0.168276],+ [-0.174135, 0.100587, -0.010816, 0.038209],+ [-0.469238, -0.764881, 0.441331, 0.955978],+ [0.201174, 0.638133, 0.0822, 14.0],+ [-0.072466, -0.174135, -0.018387, 0.18117],+ [-0.246601, -0.073548, -0.029203, 0.082277],+ [-0.098561, -0.063844, 0.993081, 0.973449],[-0.012979, 0.832818, -0.043263, 7.0],[0.339617, -0.002163, 0.043263, 0.01033],[0.0, 0.0, 0.043263, 0.045182],[0.006369, 0.99998, 0.0, 0.577584],- [0.326638, 0.830655, -0.043263, 7.0],- [0.139524, -0.21199, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [0.835314, 0.549773, 0.0, 0.577584],- [0.466162, 0.618665, -0.043263, 3.0],- [0.007571, -0.015142, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [0.894427, 0.447214, 0.0, 0.577584],- [0.473733, 0.603523, -0.043263, 7.0],- [0.0, -0.21199, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [1.0, 0.0, 0.0, 0.577584],- [0.473733, 0.391533, -0.043263, 7.0],- [-0.022713, -0.032447, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [0.819232, -0.573462, 0.0, 0.577584],- [0.45102, 0.359085, -0.043263, 7.0],- [-0.040019, -0.007571, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [0.185892, -0.98257, 0.0, 0.577584],- [0.411001, 0.351514, -0.043263, 7.0],- [-0.034611, 0.030284, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [-0.658505, -0.752577, 0.0, 0.577584],- [0.376391, 0.381799, -0.043263, 7.0],- [-0.001082, 0.107077, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [-0.999949, -0.0101, 0.0, 0.577584],- [0.375309, 0.488875, -0.043263, 7.0],- [-0.034611, -0.014061, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [0.376377, -0.926467, 0.0, 0.577584],- [0.340698, 0.474815, -0.043263, 7.0],- [0.001082, -0.121137, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [0.99996, 0.008928, 0.0, 0.577584],- [0.34178, 0.353677, -0.043263, 7.0],- [-0.022713, -0.034611, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [0.836048, -0.548657, 0.0, 0.577584],- [0.319067, 0.319067, -0.043263, 7.0],- [-0.042182, -0.007571, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [0.176664, -0.984271, 0.0, 0.577584],- [0.276885, 0.311496, -0.043263, 7.0],- [-0.035692, 0.032447, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [-0.672673, -0.73994, 0.0, 0.577584],- [0.241193, 0.343943, -0.043263, 7.0],- [-0.002163, 0.107077, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [-0.999796, -0.020198, 0.0, 0.577584],- [0.23903, 0.45102, -0.043263, 7.0],- [-0.028121, -0.005408, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [0.188847, -0.982006, 0.0, 0.577584],- [0.210908, 0.445612, -0.043263, 7.0],- [0.0, -0.131953, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [1.0, 0.0, 0.0, 0.577584],- [0.210908, 0.313659, -0.043263, 7.0],- [-0.021632, -0.033529, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [0.840297, -0.542127, 0.0, 0.577584],- [0.189277, 0.28013, -0.043263, 7.0],- [-0.042182, -0.007571, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [0.176664, -0.984271, 0.0, 0.577584],- [0.147095, 0.272559, -0.043263, 7.0],- [-0.035692, 0.034611, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [-0.696146, -0.7179, 0.0, 0.577584],- [0.111403, 0.307169, -0.043263, 7.0],- [-0.002163, 0.131953, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [-0.999866, -0.016391, 0.0, 0.577584],- [0.10924, 0.439122, -0.043263, 7.0],- [-0.031366, -0.031366, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [0.707107, -0.707107, 0.0, 0.577584],- [0.077874, 0.407756, -0.043263, 7.0],- [-0.002163, -0.319067, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [0.999977, -0.006779, 0.0, 0.577584],- [0.075711, 0.08869, -0.043263, 7.0],- [-0.031366, -0.045426, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [0.822897, -0.568191, 0.0, 0.577584],- [0.044345, 0.043263, -0.043263, 7.0],- [-0.043263, -0.005408, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [0.124035, -0.992278, 0.0, 0.577584],- [0.001082, 0.037855, -0.043263, 7.0],- [-0.044345, 0.040019, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [-0.669964, -0.742393, 0.0, 0.577584],- [-0.043263, 0.077874, -0.043263, 7.0],- [-0.001082, 0.154666, 0.043263, 0.01033],- [0.0, 0.0, 0.043263, 0.045182],- [-0.999976, -0.006993, 0.0, 0.577584],- [0.044345, 0.043263, 0.0, 10.0],- [-0.043263, -0.005408, 0.0, 0.000305],- [-0.040019, 0.030284, 0.049753, 0.964691],- [0.101434, -0.811469, 0.575525, 0.973449],- [-0.031366, 0.229295, 0.058405, 14.0],- [0.035692, -0.155748, -0.008653, 0.000305],- [-0.011897, -0.151422, -0.058405, 0.955978],- [-0.716533, -0.20131, 0.667874, 0.904662],- [-0.031366, 0.229295, 0.058405, 14.0],- [0.10924, 0.178461, -0.058405, 0.0],- [0.107077, -0.140606, -0.058405, 0.376257],- [0.475583, -0.003224, 0.879665, 0.830777],- [-0.045426, 0.564586, 0.052998, 14.0],- [0.1233, -0.156829, -0.052998, 0.520989],- [0.014061, -0.335291, 0.005408, 0.088655],- [0.429355, 0.032562, 0.902549, 0.973449],- [0.183869, 0.317985, 0.037855, 10.0],- [0.005408, -0.037855, -0.037855, 0.0],- [-0.036774, -0.045426, -0.037855, 0.806958],- [0.124328, -0.692684, 0.710445, 0.854994],- [0.10924, 0.439122, 0.0, 10.0],- [0.019468, 0.024876, 0.063813, 0.18117],- [0.035692, -0.131953, 0.049753, 0.955978],- [-0.933936, -0.126584, 0.334276, 0.964691],+ [0.179543, 0.466162, 0.058405, 10.0],+ [-0.050834, -0.002163, 0.005408, 0.000305],+ [0.021632, 0.171972, 0.023795, 0.022171],+ [0.110896, -0.149888, 0.982464, 0.381323],+ [-0.012979, 0.832818, 0.0, 14.0],+ [0.339617, -0.002163, 0.0, 0.0],+ [0.214153, -0.194685, 0.0822, 0.027314],+ [0.002492, 0.391296, 0.920261, 0.49102],[0.183869, 0.317985, 0.037855, 10.0],[-0.055161, 0.146014, 0.025958, 0.0],[0.02704, 0.127627, -0.037855, 0.439658],[0.623841, 0.097823, 0.775405, 0.871366],- [0.128708, 0.463999, 0.063813, 14.0],- [0.050834, 0.002163, -0.005408, 0.0],- [0.0822, -0.018387, -0.063813, 0.439658],- [0.07859, -0.92643, 0.368172, 0.871366],- [0.319067, 0.319067, 0.0, 10.0],- [-0.042182, -0.007571, 0.0, 0.0],- [-0.037855, 0.023795, 0.046508, 0.896269],- [0.1483, -0.826245, 0.54344, 0.896269],+ [0.210908, 0.445612, -0.043263, 7.0],+ [0.0, -0.131953, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [1.0, 0.0, 0.0, 0.577584],+ [0.210908, 0.445612, 0.0, 10.0],+ [-0.031366, 0.02055, 0.058405, 0.000305],+ [0.035692, 0.014061, 0.06165, 0.022171],+ [-0.105864, -0.954447, 0.278971, 0.381323],+ [0.23903, 0.45102, -0.043263, 11.0],+ [-0.028121, -0.005408, 0.0, 0.01033],+ [-0.028121, -0.005408, 0.043263, 0.045182],+ [0.188847, -0.982006, 0.0, 0.577584],+ [0.23903, 0.45102, -0.043263, 7.0],+ [-0.028121, -0.005408, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [0.188847, -0.982006, 0.0, 0.577584],+ [0.246601, 0.459672, 0.06165, 11.0],+ [-0.007571, -0.008653, -0.06165, 0.000305],+ [-0.035692, -0.014061, -0.06165, 0.022171],+ [0.187618, -0.975617, 0.113888, 0.381323],+ [0.241193, 0.343943, -0.043263, 11.0],+ [-0.002163, 0.107077, 0.0, 0.01033],+ [-0.002163, 0.107077, 0.043263, 0.045182],+ [-0.999796, -0.020198, 0.0, 0.577584],[0.23903, 0.45102, 0.0, 15.0],[0.007571, 0.008653, 0.06165, 0.000305],[0.042182, -0.108158, 0.046508, 0.846876],@@ -522,190 +617,102 @@ pub const TRIS: [[f32; 4]; 644] = [[-0.070303, 0.101669, 0.024876, 0.0],[0.023795, 0.116811, -0.036774, 0.473533],[0.523424, 0.157027, 0.837478, 0.930114],+ [0.340698, 0.474815, -0.043263, 7.0],+ [0.001082, -0.121137, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [0.99996, 0.008928, 0.0, 0.577584],+ [0.376391, 0.381799, -0.043263, 11.0],+ [-0.001082, 0.107077, 0.0, 0.01033],+ [-0.001082, 0.107077, 0.043263, 0.045182],+ [-0.999949, -0.0101, 0.0, 0.577584],+ [0.376391, 0.381799, -0.043263, 7.0],+ [-0.001082, 0.107077, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [-0.999949, -0.0101, 0.0, 0.577584],+ [0.375309, 0.488875, 0.0, 14.0],+ [0.036774, -0.105995, 0.043263, 0.000305],+ [0.001082, -0.107077, 0.0, 0.879622],+ [-0.771254, -0.00779, 0.63648, 0.896269],+ [0.375309, 0.488875, 0.0, 14.0],+ [0.078955, -0.08869, 0.032447, 0.223224],+ [0.036774, -0.105995, 0.043263, 0.964691],+ [0.071225, 0.39802, 0.914608, 0.973449],+ [0.473733, 0.603523, 0.0, 14.0],+ [0.0, -0.21199, 0.0, 0.158953],+ [-0.019468, -0.203337, 0.032447, 0.030716],+ [0.857493, 0.0, 0.514496, 0.964691],+ [0.473733, 0.603523, -0.043263, 11.0],+ [0.0, -0.21199, 0.0, 0.01033],+ [0.0, -0.21199, 0.043263, 0.045182],+ [1.0, 0.0, 0.0, 0.577584],+ [0.276885, 0.484549, 0.058405, 10.0],+ [-0.030284, -0.024876, 0.003245, 0.000305],+ [-0.097342, -0.018387, 0.0, 0.022171],+ [-0.03153, 0.166923, 0.985466, 0.381323],[0.246601, 0.459672, 0.06165, 14.0],[0.030284, 0.024876, -0.003245, 0.0],[0.094098, 0.015142, -0.06165, 0.473533],[0.518869, -0.545855, 0.657888, 0.930114],- [0.45102, 0.359085, 0.0, 10.0],- [-0.040019, -0.007571, 0.0, 0.000305],- [-0.038937, 0.023795, 0.043263, 0.879622],- [0.151736, -0.802035, 0.577682, 0.9131],- [0.454264, 0.400185, 0.032447, 12.0],- [-0.078955, 0.08869, -0.032447, 0.158953],- [0.019468, 0.203337, -0.032447, 0.030716],- [-0.201684, 0.173144, 0.964025, 0.964691],- [0.375309, 0.488875, 0.0, 10.0],- [0.090853, 0.12979, 0.0, 0.158953],- [0.098424, 0.114648, 0.0, 0.030716],- [0.0, 0.0, 1.0, 0.964691],+ [0.375309, 0.488875, -0.043263, 11.0],+ [-0.034611, -0.014061, 0.0, 0.01033],+ [-0.034611, -0.014061, 0.043263, 0.045182],+ [0.376377, -0.926467, 0.0, 0.577584],[0.340698, 0.474815, 0.0, 14.0],[-0.063813, 0.009734, 0.058405, 0.000305],[0.034611, 0.014061, 0.0, 0.022171],[0.3276, -0.806402, 0.492334, 0.381323],- [0.276885, 0.484549, 0.058405, 10.0],- [-0.030284, -0.024876, 0.003245, 0.000305],- [-0.097342, -0.018387, 0.0, 0.022171],- [-0.03153, 0.166923, 0.985466, 0.381323],+ [0.375309, 0.488875, -0.043263, 7.0],+ [-0.034611, -0.014061, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [0.376377, -0.926467, 0.0, 0.577584],+ [0.454264, 0.400185, 0.032447, 12.0],+ [-0.078955, 0.08869, -0.032447, 0.158953],+ [0.019468, 0.203337, -0.032447, 0.030716],+ [-0.201684, 0.173144, 0.964025, 0.964691],[0.201174, 0.638133, 0.0822, 8.0],[0.075711, -0.153585, -0.023795, 0.000305],[-0.021632, -0.171972, -0.023795, 0.022171],[0.026497, -0.140281, 0.989757, 0.381323],+ [0.473733, 0.603523, -0.043263, 7.0],+ [0.0, -0.21199, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [1.0, 0.0, 0.0, 0.577584],[0.276885, 0.484549, 0.058405, 14.0],[-0.075711, 0.153585, 0.023795, 0.000305],[0.098424, 0.004326, -0.058405, 0.022171],[0.50316, 0.115345, 0.856461, 0.381323],- [0.246601, 0.459672, 0.06165, 11.0],- [-0.007571, -0.008653, -0.06165, 0.000305],- [-0.035692, -0.014061, -0.06165, 0.022171],- [0.187618, -0.975617, 0.113888, 0.381323],- [0.210908, 0.445612, 0.0, 10.0],- [-0.031366, 0.02055, 0.058405, 0.000305],- [0.035692, 0.014061, 0.06165, 0.022171],- [-0.105864, -0.954447, 0.278971, 0.381323],- [-0.167645, 0.416409, 0.046508, 14.0],- [0.004326, -0.035692, -0.046508, 0.000305],- [-0.056242, -0.008653, -0.046508, 0.955978],- [-0.339782, -0.761112, 0.552501, 0.973449],- [-0.167645, 0.416409, 0.046508, 10.0],- [0.085445, 0.114648, -0.003245, 0.0],- [0.073548, 0.015142, -0.046508, 0.768154],- [0.548356, -0.38771, 0.740936, 0.871366],- [-0.044345, 0.23254, 0.0, 3.0],- [0.0, 0.0, -0.043263, 0.01033],- [-0.001082, 0.332046, -0.043263, 0.045182],- [-0.999995, -0.003257, 0.0, 0.577584],- [-0.045426, 0.564586, -0.043263, 11.0],- [-0.036774, -0.033529, 0.0, 0.01033],- [-0.036774, -0.033529, 0.086527, 0.045182],- [0.673754, -0.738956, 0.0, 0.577584],- [-0.0822, 0.531057, -0.043263, 11.0],- [-0.011897, -0.099506, 0.0, 0.01033],- [-0.011897, -0.099506, 0.043263, 0.045182],- [0.992928, -0.11872, 0.0, 0.577584],- [-0.094098, 0.431551, -0.043263, 11.0],- [-0.069221, -0.050834, 0.0, 0.01033],- [-0.069221, -0.050834, 0.043263, 0.045182],- [0.591909, -0.806004, 0.0, 0.577584],- [-0.163319, 0.380717, -0.043263, 11.0],- [-0.060569, 0.02704, 0.0, 0.01033],- [-0.060569, 0.02704, 0.043263, 0.045182],- [-0.407651, -0.913138, 0.0, 0.577584],- [-0.223888, 0.407756, -0.043263, 11.0],- [0.002163, 0.06814, 0.0, 0.01033],- [0.002163, 0.06814, 0.043263, 0.045182],- [-0.999496, 0.03173, 0.0, 0.577584],- [-0.221724, 0.475896, -0.043263, 9.0],- [0.122219, 0.207664, 0.0, 0.01033],- [0.122219, 0.207664, 0.043263, 0.045182],- [-0.861819, 0.507216, 0.0, 0.577584],- [-0.099506, 0.68356, -0.043263, 11.0],- [0.086527, 0.149258, 0.0, 0.01033],- [0.086527, 0.149258, 0.043263, 0.045182],- [-0.86514, 0.501531, 0.0, 0.577584],- [-0.012979, 0.832818, -0.043263, 11.0],- [0.339617, -0.002163, 0.0, 0.01033],- [0.339617, -0.002163, 0.043263, 0.045182],- [0.006369, 0.99998, 0.0, 0.577584],- [0.326638, 0.830655, -0.043263, 9.0],- [0.139524, -0.21199, 0.0, 0.01033],- [0.139524, -0.21199, 0.043263, 0.045182],- [0.835314, 0.549773, 0.0, 0.577584],+ [0.375309, 0.488875, 0.0, 10.0],+ [0.090853, 0.12979, 0.0, 0.158953],+ [0.098424, 0.114648, 0.0, 0.030716],+ [0.0, 0.0, 1.0, 0.964691],[0.466162, 0.618665, -0.043263, 11.0],[0.007571, -0.015142, 0.0, 0.01033],[0.007571, -0.015142, 0.043263, 0.045182],[0.894427, 0.447214, 0.0, 0.577584],- [0.473733, 0.603523, -0.043263, 11.0],- [0.0, -0.21199, 0.0, 0.01033],- [0.0, -0.21199, 0.043263, 0.045182],- [1.0, 0.0, 0.0, 0.577584],- [0.473733, 0.391533, -0.043263, 11.0],- [-0.022713, -0.032447, 0.0, 0.01033],- [-0.022713, -0.032447, 0.043263, 0.045182],- [0.819232, -0.573462, 0.0, 0.577584],- [0.45102, 0.359085, -0.043263, 11.0],- [-0.040019, -0.007571, 0.0, 0.01033],- [-0.040019, -0.007571, 0.043263, 0.045182],- [0.185892, -0.98257, 0.0, 0.577584],- [0.411001, 0.351514, -0.043263, 11.0],- [-0.034611, 0.030284, 0.0, 0.01033],- [-0.034611, 0.030284, 0.043263, 0.045182],- [-0.658505, -0.752577, 0.0, 0.577584],- [0.376391, 0.381799, -0.043263, 11.0],- [-0.001082, 0.107077, 0.0, 0.01033],- [-0.001082, 0.107077, 0.043263, 0.045182],- [-0.999949, -0.0101, 0.0, 0.577584],- [0.375309, 0.488875, -0.043263, 11.0],- [-0.034611, -0.014061, 0.0, 0.01033],- [-0.034611, -0.014061, 0.043263, 0.045182],- [0.376377, -0.926467, 0.0, 0.577584],- [0.340698, 0.474815, -0.043263, 11.0],- [0.001082, -0.121137, 0.0, 0.01033],- [0.001082, -0.121137, 0.043263, 0.045182],- [0.99996, 0.008928, 0.0, 0.577584],- [0.34178, 0.353677, -0.043263, 11.0],- [-0.022713, -0.034611, 0.0, 0.01033],- [-0.022713, -0.034611, 0.043263, 0.045182],- [0.836048, -0.548657, 0.0, 0.577584],- [0.319067, 0.319067, -0.043263, 11.0],- [-0.042182, -0.007571, 0.0, 0.01033],- [-0.042182, -0.007571, 0.043263, 0.045182],- [0.176664, -0.984271, 0.0, 0.577584],- [0.276885, 0.311496, -0.043263, 11.0],- [-0.035692, 0.032447, 0.0, 0.01033],- [-0.035692, 0.032447, 0.043263, 0.045182],- [-0.672673, -0.73994, 0.0, 0.577584],- [0.241193, 0.343943, -0.043263, 11.0],- [-0.002163, 0.107077, 0.0, 0.01033],- [-0.002163, 0.107077, 0.043263, 0.045182],- [-0.999796, -0.020198, 0.0, 0.577584],- [0.23903, 0.45102, -0.043263, 11.0],- [-0.028121, -0.005408, 0.0, 0.01033],- [-0.028121, -0.005408, 0.043263, 0.045182],- [0.188847, -0.982006, 0.0, 0.577584],- [0.210908, 0.445612, -0.043263, 11.0],- [0.0, -0.131953, 0.0, 0.01033],- [0.0, -0.131953, 0.043263, 0.045182],- [1.0, 0.0, 0.0, 0.577584],- [0.210908, 0.313659, -0.043263, 11.0],- [-0.021632, -0.033529, 0.0, 0.01033],- [-0.021632, -0.033529, 0.043263, 0.045182],- [0.840297, -0.542127, 0.0, 0.577584],- [0.189277, 0.28013, -0.043263, 11.0],- [-0.042182, -0.007571, 0.0, 0.01033],- [-0.042182, -0.007571, 0.043263, 0.045182],- [0.176664, -0.984271, 0.0, 0.577584],- [0.147095, 0.272559, -0.043263, 11.0],- [-0.035692, 0.034611, 0.0, 0.01033],- [-0.035692, 0.034611, 0.043263, 0.045182],- [-0.696146, -0.7179, 0.0, 0.577584],- [0.111403, 0.307169, -0.043263, 11.0],- [-0.002163, 0.131953, 0.0, 0.01033],- [-0.002163, 0.131953, 0.043263, 0.045182],- [-0.999866, -0.016391, 0.0, 0.577584],- [0.10924, 0.439122, -0.043263, 11.0],- [-0.031366, -0.031366, 0.0, 0.01033],- [-0.031366, -0.031366, 0.043263, 0.045182],- [0.707107, -0.707107, 0.0, 0.577584],- [0.077874, 0.407756, -0.043263, 11.0],- [-0.002163, -0.319067, 0.0, 0.01033],- [-0.002163, -0.319067, 0.043263, 0.045182],- [0.999977, -0.006779, 0.0, 0.577584],- [0.075711, 0.08869, -0.043263, 11.0],- [-0.031366, -0.045426, 0.0, 0.01033],- [-0.031366, -0.045426, 0.043263, 0.045182],- [0.822897, -0.568191, 0.0, 0.577584],- [0.044345, 0.043263, -0.043263, 11.0],- [-0.043263, -0.005408, 0.0, 0.01033],- [-0.043263, -0.005408, 0.043263, 0.045182],- [0.124035, -0.992278, 0.0, 0.577584],- [0.001082, 0.037855, -0.043263, 11.0],- [-0.044345, 0.040019, 0.0, 0.01033],- [-0.044345, 0.040019, 0.043263, 0.045182],- [-0.669964, -0.742393, 0.0, 0.577584],- [-0.043263, 0.077874, -0.043263, 9.0],- [-0.001082, 0.154666, 0.0, 0.01033],- [-0.001082, 0.154666, 0.043263, 0.045182],- [-0.999976, -0.006993, 0.0, 0.577584],+ [0.466162, 0.618665, -0.043263, 3.0],+ [0.007571, -0.015142, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [0.894427, 0.447214, 0.0, 0.577584],+ [0.326638, 0.830655, 0.0, 14.0],+ [0.139524, -0.21199, 0.0, 0.0],+ [0.048671, -0.34178, 0.0, 0.015213],+ [0.0, 0.0, 1.0, 0.428687],+ [0.326638, 0.830655, 0.0, 14.0],+ [0.048671, -0.34178, 0.0, 0.007492],+ [-0.125464, -0.192522, 0.0822, 0.054475],+ [0.472493, 0.067285, 0.878762, 0.964691],+ [0.326638, 0.830655, -0.043263, 9.0],+ [0.139524, -0.21199, 0.0, 0.01033],+ [0.139524, -0.21199, 0.043263, 0.045182],+ [0.835314, 0.549773, 0.0, 0.577584],+ [0.326638, 0.830655, -0.043263, 7.0],+ [0.139524, -0.21199, 0.043263, 0.01033],+ [0.0, 0.0, 0.043263, 0.045182],+ [0.835314, 0.549773, 0.0, 0.577584],+ [-0.012979, 0.832818, -0.043263, 11.0],+ [0.339617, -0.002163, 0.0, 0.01033],+ [0.339617, -0.002163, 0.043263, 0.045182],+ [0.006369, 0.99998, 0.0, 0.577584],];pub const POLYS: [[f32; 2]; 110] = [@@ -820,3 +827,50 @@ pub const POLYS: [[f32; 2]; 110] = [[-0.045426, 0.564586],[-0.044345, 0.23254],];++pub const BOXES: [[f32; 4]; 44] = [+ [0.030135, 0.06127, -0.043945, 0.0],+ [0.330601, 0.483055, 0.116951, 7.0],+ [0.034429, 0.265258, -0.043945, 7.0],+ [0.542104, 0.741798, 0.116951, 8.0],+ [0.034429, 0.355442, -0.043945, 15.0],+ [0.305908, 0.822319, 0.116951, 8.0],+ [0.267405, 0.532589, -0.043945, 23.0],+ [0.542104, 0.822319, 0.082595, 8.0],+ [-0.045345, 0.036855, -0.044263, 31.0],+ [0.045345, 0.23354, 0.059405, 8.0],+ [-0.224888, 0.072548, -0.044263, 39.0],+ [0.059405, 0.565586, 0.059405, 8.0],+ [-0.032366, 0.042263, -0.044263, 47.0],+ [0.148095, 0.408756, 0.059405, 8.0],+ [0.074711, 0.08769, -0.044263, 55.0],+ [0.184869, 0.464999, 0.064813, 8.0],+ [0.146095, 0.271559, -0.044263, 63.0],+ [0.211908, 0.446612, 0.038855, 8.0],+ [0.23803, 0.310496, -0.044263, 71.0],+ [0.320067, 0.460672, 0.06265, 8.0],+ [0.275885, 0.310496, -0.044263, 79.0],+ [0.412001, 0.475815, 0.047508, 8.0],+ [0.375391, 0.350514, -0.044263, 87.0],+ [0.45202, 0.38388, 0.044263, 4.0],+ [0.410001, 0.350514, -0.044263, 91.0],+ [0.474733, 0.401185, 0.044263, 5.0],+ [-0.224888, 0.379717, -0.044263, 96.0],+ [-0.0812, 0.532057, 0.047508, 8.0],+ [-0.095098, 0.228295, -0.044263, 104.0],+ [0.211908, 0.565586, 0.064813, 8.0],+ [-0.222724, 0.430551, -0.044263, 112.0],+ [-0.011979, 0.833818, 0.053998, 8.0],+ [-0.100506, 0.438122, -0.044263, 120.0],+ [0.327638, 0.833818, 0.0832, 8.0],+ [0.127708, 0.312659, -0.044263, 128.0],+ [0.282211, 0.467162, 0.064813, 8.0],+ [0.245601, 0.352677, -0.044263, 136.0],+ [0.474733, 0.604523, 0.06265, 8.0],+ [0.178543, 0.390533, -0.044263, 144.0],+ [0.474733, 0.639133, 0.0832, 8.0],+ [0.200174, 0.483549, -0.044263, 152.0],+ [0.474733, 0.639133, 0.0832, 4.0],+ [-0.013979, 0.487875, -0.044263, 156.0],+ [0.467162, 0.833818, 0.0832, 5.0],+];diff --git a/crates/compositor/src/sculpt.rs b/crates/compositor/src/sculpt.rsindex 551f43776..5d3cdba2f 100644--- a/crates/compositor/src/sculpt.rs+++ b/crates/compositor/src/sculpt.rs@@ -1,7 +1,7 @@//! Curseurs sculptés : la flèche et la main des thèmes d'origine, modelées en volumes dans les//! shaders (mode 15, `sculpt_proto`) au lieu d'extruder leur PNG — voxels (Pixel Candy), pièces//! cerclées du trait de leur dessin (Studio Ink, Pop Coral, Star Sprout). Prism Glow est à part :-//! un MAILLAGE tracé sur son dessin à facettes, un cristal lancé de rayons triangle par triangle+//! un MAILLAGE tracé sur son dessin à facettes, un cristal lancé de rayons boîte par boîte//! dans son serti marine (`prism_mesh`). Ce module en tient ce que la géométrie doit savoir côté//! CPU : l'identifiant que lit le shader, et la boîte du modèle (`SpriteShape`) qui pose le//! hotspot, règle la garde au sol et borne la boîte de dessin.@@ -254,17 +254,20 @@ mod tests {}}- /// Les trois shaders portent le maillage de `prism_mesh.rs` tel quel : triangles, polygones,- /// et les débuts et longueurs de chaque modèle dans ces tables. Le WGSL lit triangles et- /// polygones dans un uniform rempli de `prism_mesh.rs` (`compositor_linux.rs`) : il n'en- /// déclare que la taille.+ /// Les trois shaders portent le maillage de `prism_mesh.rs` tel quel : triangles, boîtes,+ /// polygones, et les débuts et longueurs de chaque modèle dans ces tables. Le WGSL lit+ /// triangles, polygones et boîtes dans un uniform rempli de `prism_mesh.rs`+ /// (`compositor_linux.rs`) : il n'en déclare que la taille.#[test]fn the_shaders_carry_the_prism_mesh() {- use crate::prism_mesh::{PrismModel, MODELS, POLYS, TRIS};+ use crate::prism_mesh::{PrismModel, BOXES, MODELS, POLYS, TRIS};let per_model = |f: fn(&PrismModel) -> usize| MODELS.iter().map(|m| f(m) as f32).collect::<Vec<f32>>();- let want: [(&str, Vec<f32>); 8] = [+ let want: [(&str, Vec<f32>); 11] = [("PRISM_TRIS", TRIS.iter().flatten().copied().collect()),("PRISM_POLY", POLYS.iter().flatten().copied().collect()),+ ("PRISM_BOXES", BOXES.iter().flatten().copied().collect()),+ ("PRISM_BOX_START", per_model(|m| m.box_start)),+ ("PRISM_BOX_COUNT", per_model(|m| m.box_count)),("PRISM_TRI_START", per_model(|m| m.tri_start)),("PRISM_TRI_COUNT", per_model(|m| m.tri_count)),("PRISM_SIL_START", per_model(|m| m.sil_start)),@@ -273,13 +276,17 @@ mod tests {("PRISM_OUT_COUNT", per_model(|m| m.out_count)),];let wgsl = include_str!("vk_shaders/layer.wgsl");- for field in [format!("tris: array<vec4<f32>, {}>", TRIS.len()), format!("poly: array<vec4<f32>, {}>", POLYS.len())] {+ for field in [+ format!("tris: array<vec4<f32>, {}>", TRIS.len()),+ format!("poly: array<vec4<f32>, {}>", POLYS.len()),+ format!("boxes: array<vec4<f32>, {}>", BOXES.len()),+ ] {assert!(wgsl.contains(&field), "vk_shaders/layer.wgsl : `{field}` attendu dans PrismMesh");}for (file, src, tables) in [("shaders.hlsl", include_str!("shaders.hlsl"), &want[..]),("shaders.metal", include_str!("shaders.metal"), &want[..]),- ("vk_shaders/layer.wgsl", wgsl, &want[2..]),+ ("vk_shaders/layer.wgsl", wgsl, &want[3..]),] {for (name, values) in tables {let got = table(src, name);@@ -290,4 +297,28 @@ mod tests {}}}++ /// Chaque triangle du cristal est dans une boîte et une seule, qui le contient : le shader ne+ /// teste les triangles d'une boîte que si le rayon la touche, un triangle hors de sa boîte+ /// disparaîtrait par endroits.+ #[test]+ fn each_crystal_triangle_sits_in_its_box() {+ use crate::prism_mesh::{BOXES, MODELS, TRIS};+ for (k, m) in MODELS.iter().enumerate() {+ let mut next = m.tri_start;+ for b in m.box_start..m.box_start + m.box_count {+ let (lo, hi) = (BOXES[2 * b], BOXES[2 * b + 1]);+ let (first, count) = (lo[3] as usize, hi[3] as usize);+ assert_eq!(first, next, "modèle {k}, boîte {b} : triangles non contigus");+ next += count;+ for t in TRIS[4 * first..4 * (first + count)].chunks(4) {+ for e in [[0.0; 3], [t[1][0], t[1][1], t[1][2]], [t[2][0], t[2][1], t[2][2]]] {+ let v = [t[0][0] + e[0], t[0][1] + e[1], t[0][2] + e[2]];+ assert!((0..3).all(|a| v[a] >= lo[a] && v[a] <= hi[a]), "modèle {k}, boîte {b} : sommet {v:?} dehors");+ }+ }+ }+ assert_eq!(next, m.tri_start + m.tri_count, "modèle {k} : triangles hors des boîtes");+ }+ }}diff --git a/crates/compositor/src/shaders.hlsl b/crates/compositor/src/shaders.hlslindex 3d149ab64..96c9a4971 100644--- a/crates/compositor/src/shaders.hlsl+++ b/crates/compositor/src/shaders.hlsl@@ -1053,11 +1053,12 @@ float s_pixel_outline(float2 p, int shape)// le repère du MODÈLE lui-même (unité = côté du sprite 128 px, origine au hotspot, y vers le bas,// dessus du serti en z = 0). Le serti marine est la silhouette de l'art extrudée sous z = 0, un// champ de distance comme les autres sculptés : il donne la couverture, l'ombre portée et l'ombre-// de contact. Le cristal est lancé de rayons triangle par triangle : réfraction par canal+// de contact. Le cristal est lancé de rayons, triangles rangés par boîtes : réfraction par canal// (dispersion), réflexions totales internes, sortie par son fond plat vers l'enregistrement, lu// sous le curseur (t0/t1, `trail_b`). Tables : miroir de `prism_mesh.rs` ; un triangle = quatre// float4 (v0, drapeaux), (e1, r), (e2, g), (normale sortante, b) ; drapeaux = paroi (1) + 2 ×-// arêtes réelles (bit k : l'arête opposée au sommet k).+// arêtes réelles (bit k : l'arête opposée au sommet k) ; une boîte = deux float4 (coin bas,+// premier triangle), (coin haut, nombre de triangles).// prism mesh: generated by design/cursors/prism-glow/model/export_compositor.pystatic const int PRISM_TRI_START[2] = { 0, 31 };static const int PRISM_TRI_COUNT[2] = { 31, 130 };@@ -1065,19 +1066,41 @@ static const int PRISM_SIL_START[2] = { 0, 25 };static const int PRISM_SIL_COUNT[2] = { 25, 42 };static const int PRISM_OUT_START[2] = { 67, 76 };static const int PRISM_OUT_COUNT[2] = { 9, 34 };+static const int PRISM_BOX_START[2] = { 0, 4 };+static const int PRISM_BOX_COUNT[2] = { 4, 18 };static const float4 PRISM_TRIS[644] = {- float4(0.035429, 0.482055, 0.0, 14.0),- float4(0.134202, -0.125614, 0.115951, 0.000305),- float4(-0.004294, -0.419785, 0.0, 0.938689),- float4(-0.650191, 0.006652, 0.759742, 0.854994),+ float4(0.252301, 0.266258, -0.042945, 11.0),+ float4(-0.221166, -0.203988, 0.0, 0.01033),+ float4(-0.221166, -0.203988, 0.042945, 0.045182),+ float4(0.677984, -0.735077, 0.0, 0.577584),+ float4(0.252301, 0.266258, -0.042945, 3.0),+ float4(-0.221166, -0.203988, 0.042945, 0.01033),+ float4(0.0, 0.0, 0.042945, 0.045182),+ float4(0.677984, -0.735077, 0.0, 0.577584),+ float4(0.031135, 0.06227, -0.042945, 7.0),+ float4(0.004294, 0.419785, 0.042945, 0.01033),+ float4(0.0, 0.0, 0.042945, 0.045182),+ float4(-0.999948, 0.01023, 0.0, 0.577584),float4(0.169632, 0.356442, 0.115951, 14.0),float4(0.082669, -0.090184, -0.115951, 0.590616),float4(-0.138497, -0.294172, -0.115951, 0.737911),float4(0.466385, -0.505659, 0.725806, 0.973449),+ float4(0.035429, 0.482055, 0.0, 14.0),+ float4(0.134202, -0.125614, 0.115951, 0.000305),+ float4(-0.004294, -0.419785, 0.0, 0.938689),+ float4(-0.650191, 0.006652, 0.759742, 0.854994),+ float4(0.031135, 0.06227, -0.042945, 9.0),+ float4(0.004294, 0.419785, 0.0, 0.01033),+ float4(0.004294, 0.419785, 0.042945, 0.045182),+ float4(-0.999948, 0.01023, 0.0, 0.577584),float4(0.169632, 0.356442, 0.115951, 14.0),float4(0.159969, 0.080521, -0.045092, 0.381323),float4(0.082669, -0.090184, -0.115951, 0.056123),float4(0.461407, -0.510214, 0.725799, 0.973449),+ float4(0.541104, 0.544325, -0.042945, 9.0),+ float4(-0.288804, -0.278068, 0.0, 0.01033),+ float4(-0.288804, -0.278068, 0.042945, 0.045182),+ float4(0.69359, -0.72037, 0.0, 0.577584),float4(0.329601, 0.436963, 0.070859, 14.0),float4(0.211503, 0.107362, -0.070859, 0.545724),float4(-0.077301, -0.170706, -0.070859, 0.064805),@@ -1086,53 +1109,77 @@ static const float4 PRISM_TRIS[644] = {float4(0.061196, -0.096626, -0.010736, 0.000916),float4(-0.098773, -0.177147, 0.034356, 0.046662),float4(0.247834, 0.049458, 0.967539, 0.904662),+ float4(0.541104, 0.544325, -0.042945, 7.0),+ float4(-0.288804, -0.278068, 0.042945, 0.01033),+ float4(0.0, 0.0, 0.042945, 0.045182),+ float4(0.69359, -0.72037, 0.0, 0.577584),+ float4(0.199693, 0.595859, 0.0, 14.0),+ float4(0.068712, -0.06227, 0.081595, 0.0),+ float4(-0.030061, -0.239417, 0.115951, 0.01445),+ float4(-0.504461, 0.426837, 0.750553, 0.254154),float4(0.268405, 0.533589, 0.081595, 14.0),float4(0.272699, 0.010736, -0.081595, 0.0),float4(0.061196, -0.096626, -0.010736, 0.025193),float4(0.283244, 0.073137, 0.956255, 0.527108),+ float4(0.035429, 0.482055, 0.0, 14.0),+ float4(0.0, 0.258742, 0.0, 0.0),+ float4(0.134202, -0.125614, 0.115951, 0.473533),+ float4(-0.653777, 0.0, 0.756687, 0.964691),float4(0.359663, 0.559356, 0.0, 14.0),float4(0.181442, -0.015031, 0.0, 0.006043),float4(-0.091258, -0.025767, 0.081595, 0.076188),float4(0.076465, 0.923048, 0.37701, 0.964691),- float4(0.199693, 0.595859, 0.0, 14.0),- float4(0.068712, -0.06227, 0.081595, 0.0),- float4(-0.030061, -0.239417, 0.115951, 0.01445),- float4(-0.504461, 0.426837, 0.750553, 0.254154),+ float4(0.035429, 0.482055, -0.042945, 3.0),+ float4(0.0, 0.258742, 0.042945, 0.01033),+ float4(0.0, 0.0, 0.042945, 0.045182),+ float4(-1.0, 0.0, 0.0, 0.577584),+ float4(0.035429, 0.482055, -0.042945, 11.0),+ float4(0.0, 0.258742, 0.0, 0.01033),+ float4(0.0, 0.258742, 0.042945, 0.045182),+ float4(-1.0, 0.0, 0.0, 0.577584),+ float4(0.035429, 0.740798, -0.042945, 7.0),+ float4(0.164264, -0.144939, 0.042945, 0.01033),+ float4(0.0, 0.0, 0.042945, 0.045182),+ float4(0.661622, 0.749838, 0.0, 0.577584),float4(0.035429, 0.740798, 0.0, 14.0),float4(0.164264, -0.144939, 0.0, 0.0),float4(0.134202, -0.384356, 0.115951, 0.010956),float4(0.332572, 0.376915, 0.864483, 0.215854),- float4(0.035429, 0.482055, 0.0, 14.0),- float4(0.0, 0.258742, 0.0, 0.0),- float4(0.134202, -0.125614, 0.115951, 0.473533),- float4(-0.653777, 0.0, 0.756687, 0.964691),+ float4(0.035429, 0.740798, -0.042945, 11.0),+ float4(0.164264, -0.144939, 0.0, 0.01033),+ float4(0.164264, -0.144939, 0.042945, 0.045182),+ float4(0.661622, 0.749838, 0.0, 0.577584),+ float4(0.199693, 0.595859, -0.042945, 7.0),+ float4(0.105215, 0.22546, 0.042945, 0.01033),+ float4(0.0, 0.0, 0.042945, 0.045182),+ float4(-0.906183, 0.422886, 0.0, 0.577584),float4(0.199693, 0.595859, 0.0, 14.0),float4(0.105215, 0.22546, 0.0, 0.0),float4(0.068712, -0.06227, 0.081595, 0.015991),float4(-0.613882, 0.286478, 0.735581, 0.473533),+ float4(0.199693, 0.595859, -0.042945, 11.0),+ float4(0.105215, 0.22546, 0.0, 0.01033),+ float4(0.105215, 0.22546, 0.042945, 0.045182),+ float4(-0.906183, 0.422886, 0.0, 0.577584),float4(0.304908, 0.821319, 0.0, 14.0),float4(0.128834, -0.067638, 0.0, 0.0),float4(-0.036503, -0.28773, 0.081595, 0.254154),float4(0.133686, 0.254641, 0.957751, 0.973449),+ float4(0.304908, 0.821319, -0.042945, 7.0),+ float4(0.128834, -0.067638, 0.042945, 0.01033),+ float4(0.0, 0.0, 0.042945, 0.045182),+ float4(0.464834, 0.885398, 0.0, 0.577584),float4(0.433742, 0.753681, 0.0, 14.0),float4(-0.07408, -0.194325, 0.0, 0.0),float4(-0.165337, -0.220092, 0.081595, 0.964691),float4(0.683362, -0.260508, 0.682021, 0.964691),- float4(0.035429, 0.482055, -0.042945, 3.0),- float4(0.0, 0.258742, 0.042945, 0.01033),- float4(0.0, 0.0, 0.042945, 0.045182),- float4(-1.0, 0.0, 0.0, 0.577584),- float4(0.035429, 0.740798, -0.042945, 7.0),- float4(0.164264, -0.144939, 0.042945, 0.01033),- float4(0.0, 0.0, 0.042945, 0.045182),- float4(0.661622, 0.749838, 0.0, 0.577584),- float4(0.199693, 0.595859, -0.042945, 7.0),- float4(0.105215, 0.22546, 0.042945, 0.01033),- float4(0.0, 0.0, 0.042945, 0.045182),- float4(-0.906183, 0.422886, 0.0, 0.577584),- float4(0.304908, 0.821319, -0.042945, 7.0),- float4(0.128834, -0.067638, 0.042945, 0.01033),- float4(0.0, 0.0, 0.042945, 0.045182),+ float4(0.433742, 0.753681, -0.042945, 11.0),+ float4(-0.07408, -0.194325, 0.0, 0.01033),+ float4(-0.07408, -0.194325, 0.042945, 0.045182),+ float4(0.934406, -0.35621, 0.0, 0.577584),+ float4(0.304908, 0.821319, -0.042945, 11.0),+ float4(0.128834, -0.067638, 0.0, 0.01033),+ float4(0.128834, -0.067638, 0.042945, 0.045182),float4(0.464834, 0.885398, 0.0, 0.577584),float4(0.433742, 0.753681, -0.042945, 7.0),float4(-0.07408, -0.194325, 0.042945, 0.01033),@@ -1142,70 +1189,86 @@ static const float4 PRISM_TRIS[644] = {float4(0.181442, -0.015031, 0.042945, 0.01033),float4(0.0, 0.0, 0.042945, 0.045182),float4(0.082557, 0.996586, 0.0, 0.577584),- float4(0.541104, 0.544325, -0.042945, 7.0),- float4(-0.288804, -0.278068, 0.042945, 0.01033),- float4(0.0, 0.0, 0.042945, 0.045182),- float4(0.69359, -0.72037, 0.0, 0.577584),- float4(0.252301, 0.266258, -0.042945, 3.0),- float4(-0.221166, -0.203988, 0.042945, 0.01033),- float4(0.0, 0.0, 0.042945, 0.045182),- float4(0.677984, -0.735077, 0.0, 0.577584),- float4(0.031135, 0.06227, -0.042945, 7.0),- float4(0.004294, 0.419785, 0.042945, 0.01033),- float4(0.0, 0.0, 0.042945, 0.045182),- float4(-0.999948, 0.01023, 0.0, 0.577584),- float4(0.035429, 0.482055, -0.042945, 11.0),- float4(0.0, 0.258742, 0.0, 0.01033),- float4(0.0, 0.258742, 0.042945, 0.045182),- float4(-1.0, 0.0, 0.0, 0.577584),- float4(0.035429, 0.740798, -0.042945, 11.0),- float4(0.164264, -0.144939, 0.0, 0.01033),- float4(0.164264, -0.144939, 0.042945, 0.045182),- float4(0.661622, 0.749838, 0.0, 0.577584),- float4(0.199693, 0.595859, -0.042945, 11.0),- float4(0.105215, 0.22546, 0.0, 0.01033),- float4(0.105215, 0.22546, 0.042945, 0.045182),- float4(-0.906183, 0.422886, 0.0, 0.577584),- float4(0.304908, 0.821319, -0.042945, 11.0),- float4(0.128834, -0.067638, 0.0, 0.01033),- float4(0.128834, -0.067638, 0.042945, 0.045182),- float4(0.464834, 0.885398, 0.0, 0.577584),- float4(0.433742, 0.753681, -0.042945, 11.0),- float4(-0.07408, -0.194325, 0.0, 0.01033),- float4(-0.07408, -0.194325, 0.042945, 0.045182),- float4(0.934406, -0.35621, 0.0, 0.577584),float4(0.359663, 0.559356, -0.042945, 11.0),float4(0.181442, -0.015031, 0.0, 0.01033),float4(0.181442, -0.015031, 0.042945, 0.045182),float4(0.082557, 0.996586, 0.0, 0.577584),- float4(0.541104, 0.544325, -0.042945, 9.0),- float4(-0.288804, -0.278068, 0.0, 0.01033),- float4(-0.288804, -0.278068, 0.042945, 0.045182),- float4(0.69359, -0.72037, 0.0, 0.577584),- float4(0.252301, 0.266258, -0.042945, 11.0),- float4(-0.221166, -0.203988, 0.0, 0.01033),- float4(-0.221166, -0.203988, 0.042945, 0.045182),- float4(0.677984, -0.735077, 0.0, 0.577584),- float4(0.031135, 0.06227, -0.042945, 9.0),- float4(0.004294, 0.419785, 0.0, 0.01033),- float4(0.004294, 0.419785, 0.042945, 0.045182),- float4(-0.999948, 0.01023, 0.0, 0.577584),- float4(-0.031366, 0.229295, 0.058405, 14.0),- float4(0.089771, -0.137361, -0.02055, 0.445197),- float4(0.035692, -0.155748, -0.008653, 0.973449),- float4(0.216369, -0.004654, 0.976301, 0.973449),- float4(0.044345, 0.043263, 0.0, 6.0),- float4(-0.040019, 0.030284, 0.049753, 0.000305),- float4(0.014061, 0.048671, 0.037855, 0.964691),- float4(0.365607, -0.634949, 0.680566, 0.973449),+ float4(0.044345, 0.043263, -0.043263, 11.0),+ float4(-0.043263, -0.005408, 0.0, 0.01033),+ float4(-0.043263, -0.005408, 0.043263, 0.045182),+ float4(0.124035, -0.992278, 0.0, 0.577584),+ float4(0.044345, 0.043263, -0.043263, 7.0),+ float4(-0.043263, -0.005408, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.124035, -0.992278, 0.0, 0.577584),+ float4(0.001082, 0.037855, -0.043263, 7.0),+ float4(-0.044345, 0.040019, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(-0.669964, -0.742393, 0.0, 0.577584),+ float4(0.044345, 0.043263, 0.0, 10.0),+ float4(-0.043263, -0.005408, 0.0, 0.000305),+ float4(-0.040019, 0.030284, 0.049753, 0.964691),+ float4(0.101434, -0.811469, 0.575525, 0.973449),float4(0.004326, 0.073548, 0.049753, 14.0),float4(-0.003245, -0.035692, -0.049753, 0.0),float4(-0.04759, 0.004326, -0.049753, 0.955978),float4(-0.580475, -0.643229, 0.499304, 0.896269),+ float4(0.001082, 0.037855, -0.043263, 11.0),+ float4(-0.044345, 0.040019, 0.0, 0.01033),+ float4(-0.044345, 0.040019, 0.043263, 0.045182),+ float4(-0.669964, -0.742393, 0.0, 0.577584),+ float4(-0.031366, 0.229295, 0.058405, 14.0),+ float4(0.035692, -0.155748, -0.008653, 0.000305),+ float4(-0.011897, -0.151422, -0.058405, 0.955978),+ float4(-0.716533, -0.20131, 0.667874, 0.904662),+ float4(-0.043263, 0.077874, -0.043263, 7.0),+ float4(-0.001082, 0.154666, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(-0.999976, -0.006993, 0.0, 0.577584),+ float4(-0.031366, 0.229295, 0.058405, 14.0),+ float4(0.089771, -0.137361, -0.02055, 0.445197),+ float4(0.035692, -0.155748, -0.008653, 0.973449),+ float4(0.216369, -0.004654, 0.976301, 0.973449),float4(-0.031366, 0.229295, 0.058405, 14.0),float4(-0.011897, -0.151422, -0.058405, 0.000305),float4(-0.012979, 0.003245, -0.058405, 0.955978),float4(-0.976245, -0.006827, 0.216564, 0.904662),+ float4(-0.043263, 0.077874, -0.043263, 9.0),+ float4(-0.001082, 0.154666, 0.0, 0.01033),+ float4(-0.001082, 0.154666, 0.043263, 0.045182),+ float4(-0.999976, -0.006993, 0.0, 0.577584),+ float4(-0.045426, 0.564586, 0.052998, 14.0),+ float4(0.014061, -0.335291, 0.005408, 0.520989),+ float4(0.001082, -0.332046, -0.052998, 0.088655),+ float4(-0.975941, -0.037462, 0.214794, 0.973449),+ float4(-0.044345, 0.23254, 0.0, 3.0),+ float4(0.0, 0.0, -0.043263, 0.01033),+ float4(-0.001082, 0.332046, -0.043263, 0.045182),+ float4(-0.999995, -0.003257, 0.0, 0.577584),+ float4(-0.163319, 0.380717, -0.043263, 7.0),+ float4(-0.060569, 0.02704, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(-0.407651, -0.913138, 0.0, 0.577584),+ float4(-0.094098, 0.431551, -0.043263, 11.0),+ float4(-0.069221, -0.050834, 0.0, 0.01033),+ float4(-0.069221, -0.050834, 0.043263, 0.045182),+ float4(0.591909, -0.806004, 0.0, 0.577584),+ float4(-0.163319, 0.380717, -0.043263, 11.0),+ float4(-0.060569, 0.02704, 0.0, 0.01033),+ float4(-0.060569, 0.02704, 0.043263, 0.045182),+ float4(-0.407651, -0.913138, 0.0, 0.577584),+ float4(0.075711, 0.08869, -0.043263, 11.0),+ float4(-0.031366, -0.045426, 0.0, 0.01033),+ float4(-0.031366, -0.045426, 0.043263, 0.045182),+ float4(0.822897, -0.568191, 0.0, 0.577584),+ float4(0.044345, 0.043263, 0.0, 6.0),+ float4(-0.040019, 0.030284, 0.049753, 0.000305),+ float4(0.014061, 0.048671, 0.037855, 0.964691),+ float4(0.365607, -0.634949, 0.680566, 0.973449),+ float4(0.075711, 0.08869, -0.043263, 7.0),+ float4(-0.031366, -0.045426, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.822897, -0.568191, 0.0, 0.577584),float4(0.058405, 0.091934, 0.037855, 14.0),float4(0.017305, -0.003245, -0.037855, 0.0),float4(-0.014061, -0.048671, -0.037855, 0.473533),@@ -1214,310 +1277,338 @@ static const float4 PRISM_TRIS[644] = {float4(0.107077, -0.140606, -0.058405, 0.0),float4(0.089771, -0.137361, -0.02055, 0.376257),float4(0.812052, 0.481346, 0.329966, 0.830777),- float4(-0.045426, 0.564586, 0.052998, 14.0),- float4(0.014061, -0.335291, 0.005408, 0.520989),- float4(0.001082, -0.332046, -0.052998, 0.088655),- float4(-0.975941, -0.037462, 0.214794, 0.973449),- float4(0.10924, 0.439122, 0.0, 14.0),- float4(-0.031366, -0.031366, 0.0, 0.132876),- float4(-0.154666, 0.125464, 0.052998, 0.028428),- float4(0.182761, -0.182761, 0.966021, 0.955978),- float4(0.128708, 0.463999, 0.063813, 14.0),- float4(-0.019468, -0.024876, -0.063813, 0.168276),- float4(-0.174135, 0.100587, -0.010816, 0.038209),- float4(-0.469238, -0.764881, 0.441331, 0.955978),- float4(0.201174, 0.638133, 0.0822, 14.0),- float4(-0.072466, -0.174135, -0.018387, 0.18117),- float4(-0.246601, -0.073548, -0.029203, 0.082277),- float4(-0.098561, -0.063844, 0.993081, 0.973449),- float4(0.128708, 0.463999, 0.063813, 14.0),- float4(0.055161, -0.146014, -0.025958, 0.246204),- float4(0.016224, -0.156829, -0.014061, 0.964691),- float4(0.305397, -0.053644, 0.950713, 0.973449),- float4(0.183869, 0.317985, 0.037855, 6.0),- float4(-0.036774, -0.045426, -0.037855, 0.0),- float4(-0.038937, -0.010816, 0.011897, 0.806958),- float4(0.374433, -0.753477, 0.540438, 0.854994),- float4(0.144932, 0.307169, 0.049753, 14.0),- float4(0.002163, -0.034611, -0.049753, 0.0),- float4(-0.033529, 0.0, -0.049753, 0.9131),- float4(-0.630237, -0.649931, 0.424725, 0.904662),- float4(0.10924, 0.439122, 0.0, 6.0),- float4(0.035692, -0.131953, 0.049753, 0.18117),- float4(0.002163, -0.131953, 0.0, 0.955978),- float4(-0.82919, -0.013593, 0.558802, 0.964691),- float4(0.183869, 0.317985, 0.037855, 14.0),- float4(0.02704, -0.004326, -0.037855, 0.0),- float4(0.005408, -0.037855, -0.037855, 0.514916),- float4(0.70062, -0.452013, 0.552101, 0.846876),- float4(0.210908, 0.445612, 0.0, 10.0),- float4(0.0, -0.131953, 0.0, 0.0),+ float4(0.077874, 0.407756, -0.043263, 11.0),+ float4(-0.002163, -0.319067, 0.0, 0.01033),+ float4(-0.002163, -0.319067, 0.043263, 0.045182),+ float4(0.999977, -0.006779, 0.0, 0.577584),+ float4(-0.031366, 0.229295, 0.058405, 14.0),+ float4(0.10924, 0.178461, -0.058405, 0.0),+ float4(0.107077, -0.140606, -0.058405, 0.376257),+ float4(0.475583, -0.003224, 0.879665, 0.830777),+ float4(0.147095, 0.272559, -0.043263, 7.0),+ float4(-0.035692, 0.034611, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(-0.696146, -0.7179, 0.0, 0.577584),+ float4(0.147095, 0.272559, -0.043263, 11.0),+ float4(-0.035692, 0.034611, 0.0, 0.01033),+ float4(-0.035692, 0.034611, 0.043263, 0.045182),+ float4(-0.696146, -0.7179, 0.0, 0.577584),+ float4(0.144932, 0.307169, 0.049753, 14.0),+ float4(0.002163, -0.034611, -0.049753, 0.0),+ float4(-0.033529, 0.0, -0.049753, 0.9131),+ float4(-0.630237, -0.649931, 0.424725, 0.904662),+ float4(0.183869, 0.317985, 0.037855, 6.0),+ float4(-0.036774, -0.045426, -0.037855, 0.0),+ float4(-0.038937, -0.010816, 0.011897, 0.806958),+ float4(0.374433, -0.753477, 0.540438, 0.854994),+ float4(0.077874, 0.407756, -0.043263, 7.0),+ float4(-0.002163, -0.319067, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.999977, -0.006779, 0.0, 0.577584),+ float4(0.111403, 0.307169, -0.043263, 7.0),+ float4(-0.002163, 0.131953, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(-0.999866, -0.016391, 0.0, 0.577584),+ float4(0.10924, 0.439122, 0.0, 6.0),+ float4(0.035692, -0.131953, 0.049753, 0.18117),+ float4(0.002163, -0.131953, 0.0, 0.955978),+ float4(-0.82919, -0.013593, 0.558802, 0.964691),+ float4(0.128708, 0.463999, 0.063813, 14.0),+ float4(0.055161, -0.146014, -0.025958, 0.246204),+ float4(0.016224, -0.156829, -0.014061, 0.964691),+ float4(0.305397, -0.053644, 0.950713, 0.973449),+ float4(0.111403, 0.307169, -0.043263, 11.0),+ float4(-0.002163, 0.131953, 0.0, 0.01033),+ float4(-0.002163, 0.131953, 0.043263, 0.045182),+ float4(-0.999866, -0.016391, 0.0, 0.577584),+ float4(0.189277, 0.28013, -0.043263, 11.0),+ float4(-0.042182, -0.007571, 0.0, 0.01033),+ float4(-0.042182, -0.007571, 0.043263, 0.045182),+ float4(0.176664, -0.984271, 0.0, 0.577584),+ float4(0.183869, 0.317985, 0.037855, 10.0),+ float4(0.005408, -0.037855, -0.037855, 0.0),+ float4(-0.036774, -0.045426, -0.037855, 0.806958),+ float4(0.124328, -0.692684, 0.710445, 0.854994),+ float4(0.189277, 0.28013, -0.043263, 7.0),+ float4(-0.042182, -0.007571, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.176664, -0.984271, 0.0, 0.577584),+ float4(0.183869, 0.317985, 0.037855, 14.0),+ float4(0.02704, -0.004326, -0.037855, 0.0),+ float4(0.005408, -0.037855, -0.037855, 0.514916),+ float4(0.70062, -0.452013, 0.552101, 0.846876),+ float4(0.210908, 0.313659, -0.043263, 11.0),+ float4(-0.021632, -0.033529, 0.0, 0.01033),+ float4(-0.021632, -0.033529, 0.043263, 0.045182),+ float4(0.840297, -0.542127, 0.0, 0.577584),+ float4(0.210908, 0.445612, 0.0, 10.0),+ float4(0.0, -0.131953, 0.0, 0.0),float4(-0.02704, -0.127627, 0.037855, 0.439658),float4(0.813734, 0.0, 0.581238, 0.871366),+ float4(0.210908, 0.313659, -0.043263, 7.0),+ float4(-0.021632, -0.033529, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.840297, -0.542127, 0.0, 0.577584),+ float4(0.210908, 0.445612, -0.043263, 11.0),+ float4(0.0, -0.131953, 0.0, 0.01033),+ float4(0.0, -0.131953, 0.043263, 0.045182),+ float4(1.0, 0.0, 0.0, 0.577584),+ float4(0.241193, 0.343943, -0.043263, 7.0),+ float4(-0.002163, 0.107077, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(-0.999796, -0.020198, 0.0, 0.577584),+ float4(0.276885, 0.311496, -0.043263, 11.0),+ float4(-0.035692, 0.032447, 0.0, 0.01033),+ float4(-0.035692, 0.032447, 0.043263, 0.045182),+ float4(-0.672673, -0.73994, 0.0, 0.577584),+ float4(0.23903, 0.45102, 0.0, 14.0),+ float4(0.042182, -0.108158, 0.046508, 0.000305),+ float4(0.002163, -0.107077, 0.0, 0.846876),+ float4(-0.758098, -0.015315, 0.651961, 0.896269),+ float4(0.276885, 0.311496, -0.043263, 7.0),+ float4(-0.035692, 0.032447, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(-0.672673, -0.73994, 0.0, 0.577584),+ float4(0.281211, 0.342862, 0.046508, 14.0),+ float4(-0.004326, -0.031366, -0.046508, 0.0),+ float4(-0.040019, 0.001082, -0.046508, 0.752941),+ float4(-0.58651, -0.645161, 0.489667, 0.846876),float4(0.246601, 0.459672, 0.06165, 14.0),float4(0.070303, -0.101669, -0.024876, 0.262257),float4(0.034611, -0.116811, -0.015142, 0.973449),float4(0.27928, -0.041605, 0.959308, 0.973449),+ float4(0.319067, 0.319067, -0.043263, 11.0),+ float4(-0.042182, -0.007571, 0.0, 0.01033),+ float4(-0.042182, -0.007571, 0.043263, 0.045182),+ float4(0.176664, -0.984271, 0.0, 0.577584),+ float4(0.319067, 0.319067, 0.0, 10.0),+ float4(-0.042182, -0.007571, 0.0, 0.0),+ float4(-0.037855, 0.023795, 0.046508, 0.896269),+ float4(0.1483, -0.826245, 0.54344, 0.896269),+ float4(0.319067, 0.319067, -0.043263, 7.0),+ float4(-0.042182, -0.007571, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.176664, -0.984271, 0.0, 0.577584),float4(0.319067, 0.319067, 0.0, 6.0),float4(-0.037855, 0.023795, 0.046508, 0.0),float4(-0.002163, 0.038937, 0.036774, 0.896269),float4(0.437906, -0.604311, 0.665618, 0.896269),- float4(0.281211, 0.342862, 0.046508, 14.0),- float4(-0.004326, -0.031366, -0.046508, 0.0),- float4(-0.040019, 0.001082, -0.046508, 0.752941),- float4(-0.58651, -0.645161, 0.489667, 0.846876),- float4(0.23903, 0.45102, 0.0, 14.0),- float4(0.042182, -0.108158, 0.046508, 0.000305),- float4(0.002163, -0.107077, 0.0, 0.846876),- float4(-0.758098, -0.015315, 0.651961, 0.896269),float4(0.316904, 0.358004, 0.036774, 14.0),float4(0.024876, -0.004326, -0.036774, 0.0),float4(0.002163, -0.038937, -0.036774, 0.617212),float4(0.707338, -0.464191, 0.533104, 0.921584),+ float4(0.34178, 0.353677, -0.043263, 11.0),+ float4(-0.022713, -0.034611, 0.0, 0.01033),+ float4(-0.022713, -0.034611, 0.043263, 0.045182),+ float4(0.836048, -0.548657, 0.0, 0.577584),float4(0.340698, 0.474815, 0.0, 14.0),float4(0.001082, -0.121137, 0.0, 0.0),float4(-0.023795, -0.116811, 0.036774, 0.473533),float4(0.828664, 0.007399, 0.559697, 0.930114),- float4(0.375309, 0.488875, 0.0, 14.0),- float4(0.078955, -0.08869, 0.032447, 0.223224),- float4(0.036774, -0.105995, 0.043263, 0.964691),- float4(0.071225, 0.39802, 0.914608, 0.973449),- float4(0.45102, 0.359085, 0.0, 6.0),- float4(-0.038937, 0.023795, 0.043263, 0.000305),- float4(0.003245, 0.0411, 0.032447, 0.879622),- float4(0.417852, -0.583049, 0.696744, 0.9131),+ float4(0.34178, 0.353677, -0.043263, 7.0),+ float4(-0.022713, -0.034611, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.836048, -0.548657, 0.0, 0.577584),+ float4(0.340698, 0.474815, -0.043263, 11.0),+ float4(0.001082, -0.121137, 0.0, 0.01033),+ float4(0.001082, -0.121137, 0.043263, 0.045182),+ float4(0.99996, 0.008928, 0.0, 0.577584),+ float4(0.411001, 0.351514, -0.043263, 11.0),+ float4(-0.034611, 0.030284, 0.0, 0.01033),+ float4(-0.034611, 0.030284, 0.043263, 0.045182),+ float4(-0.658505, -0.752577, 0.0, 0.577584),+ float4(0.411001, 0.351514, -0.043263, 7.0),+ float4(-0.034611, 0.030284, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(-0.658505, -0.752577, 0.0, 0.577584),float4(0.412083, 0.38288, 0.043263, 14.0),float4(-0.001082, -0.031366, -0.043263, 0.0),float4(-0.035692, -0.001082, -0.043263, 0.745403),float4(-0.574039, -0.656045, 0.489984, 0.854994),- float4(0.375309, 0.488875, 0.0, 14.0),- float4(0.036774, -0.105995, 0.043263, 0.000305),- float4(0.001082, -0.107077, 0.0, 0.879622),- float4(-0.771254, -0.00779, 0.63648, 0.896269),+ float4(0.45102, 0.359085, -0.043263, 11.0),+ float4(-0.040019, -0.007571, 0.0, 0.01033),+ float4(-0.040019, -0.007571, 0.043263, 0.045182),+ float4(0.185892, -0.98257, 0.0, 0.577584),+ float4(0.45102, 0.359085, 0.0, 10.0),+ float4(-0.040019, -0.007571, 0.0, 0.000305),+ float4(-0.038937, 0.023795, 0.043263, 0.879622),+ float4(0.151736, -0.802035, 0.577682, 0.9131),+ float4(0.45102, 0.359085, -0.043263, 7.0),+ float4(-0.040019, -0.007571, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.185892, -0.98257, 0.0, 0.577584),+ float4(0.45102, 0.359085, 0.0, 6.0),+ float4(-0.038937, 0.023795, 0.043263, 0.000305),+ float4(0.003245, 0.0411, 0.032447, 0.879622),+ float4(0.417852, -0.583049, 0.696744, 0.9131),+ float4(0.473733, 0.391533, -0.043263, 11.0),+ float4(-0.022713, -0.032447, 0.0, 0.01033),+ float4(-0.022713, -0.032447, 0.043263, 0.045182),+ float4(0.819232, -0.573462, 0.0, 0.577584),float4(0.454264, 0.400185, 0.032447, 14.0),float4(0.019468, -0.008653, -0.032447, 0.0),float4(-0.003245, -0.0411, -0.032447, 0.527108),float4(0.688617, -0.482032, 0.541712, 0.887922),- float4(0.473733, 0.603523, 0.0, 14.0),- float4(0.0, -0.21199, 0.0, 0.158953),- float4(-0.019468, -0.203337, 0.032447, 0.030716),- float4(0.857493, 0.0, 0.514496, 0.964691),- float4(0.179543, 0.466162, 0.058405, 10.0),- float4(-0.050834, -0.002163, 0.005408, 0.000305),- float4(0.021632, 0.171972, 0.023795, 0.022171),- float4(0.110896, -0.149888, 0.982464, 0.381323),- float4(0.326638, 0.830655, 0.0, 14.0),- float4(0.048671, -0.34178, 0.0, 0.007492),- float4(-0.125464, -0.192522, 0.0822, 0.054475),- float4(0.472493, 0.067285, 0.878762, 0.964691),- float4(0.326638, 0.830655, 0.0, 14.0),- float4(0.139524, -0.21199, 0.0, 0.0),- float4(0.048671, -0.34178, 0.0, 0.015213),- float4(0.0, 0.0, 1.0, 0.428687),- float4(-0.012979, 0.832818, 0.0, 14.0),- float4(0.339617, -0.002163, 0.0, 0.0),- float4(0.214153, -0.194685, 0.0822, 0.027314),- float4(0.002492, 0.391296, 0.920261, 0.49102),- float4(-0.012979, 0.832818, 0.0, 14.0),- float4(0.214153, -0.194685, 0.0822, 0.000305),- float4(-0.032447, -0.268232, 0.052998, 0.930114),- float4(-0.176863, 0.211325, 0.961281, 0.973449),- float4(-0.221724, 0.475896, 0.0, 14.0),- float4(0.139524, 0.055161, 0.043263, 0.520989),- float4(0.054079, -0.059487, 0.046508, 0.973449),- float4(-0.39307, 0.317373, 0.863001, 0.973449),+ float4(0.473733, 0.391533, -0.043263, 7.0),+ float4(-0.022713, -0.032447, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.819232, -0.573462, 0.0, 0.577584),+ float4(-0.223888, 0.407756, -0.043263, 7.0),+ float4(0.002163, 0.06814, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(-0.999496, 0.03173, 0.0, 0.577584),+ float4(-0.223888, 0.407756, -0.043263, 11.0),+ float4(0.002163, 0.06814, 0.0, 0.01033),+ float4(0.002163, 0.06814, 0.043263, 0.045182),+ float4(-0.999496, 0.03173, 0.0, 0.577584),float4(-0.167645, 0.416409, 0.046508, 14.0),float4(-0.056242, -0.008653, -0.046508, 0.000305),float4(-0.054079, 0.059487, -0.046508, 0.955978),float4(-0.638985, 0.020285, 0.768952, 0.973449),+ float4(-0.167645, 0.416409, 0.046508, 14.0),+ float4(0.004326, -0.035692, -0.046508, 0.000305),+ float4(-0.056242, -0.008653, -0.046508, 0.955978),+ float4(-0.339782, -0.761112, 0.552501, 0.973449),+ float4(-0.221724, 0.475896, 0.0, 14.0),+ float4(0.139524, 0.055161, 0.043263, 0.520989),+ float4(0.054079, -0.059487, 0.046508, 0.973449),+ float4(-0.39307, 0.317373, 0.863001, 0.973449),float4(-0.167645, 0.416409, 0.046508, 6.0),float4(0.073548, 0.015142, -0.046508, 0.0),float4(0.004326, -0.035692, -0.046508, 0.768154),float4(0.490917, -0.668482, 0.558688, 0.871366),- float4(-0.099506, 0.68356, 0.0, 14.0),- float4(0.017305, -0.152503, 0.043263, 0.0),- float4(-0.122219, -0.207664, 0.0, 0.723049),- float4(-0.365879, 0.215335, 0.905408, 0.854994),- float4(-0.099506, 0.68356, 0.0, 14.0),- float4(0.054079, -0.118974, 0.052998, 0.0),- float4(0.017305, -0.152503, 0.043263, 0.514916),- float4(-0.41958, 0.203352, 0.884647, 0.863157),- float4(-0.099506, 0.68356, 0.0, 14.0),- float4(0.086527, 0.149258, 0.0, 0.0),- float4(0.054079, -0.118974, 0.052998, 0.262257),- float4(-0.385563, 0.223515, 0.8952, 0.9131),- float4(-0.044345, 0.23254, 0.0, 7.0),- float4(-0.001082, 0.332046, -0.043263, 0.01033),- float4(-0.001082, 0.332046, 0.052998, 0.045182),- float4(-0.999995, -0.003257, 0.0, 0.577584),- float4(-0.045426, 0.564586, -0.043263, 7.0),- float4(-0.036774, -0.033529, 0.086527, 0.01033),- float4(0.0, 0.0, 0.096261, 0.045182),- float4(0.673754, -0.738956, 0.0, 0.577584),- float4(-0.0822, 0.531057, -0.043263, 7.0),- float4(-0.011897, -0.099506, 0.043263, 0.01033),- float4(0.0, 0.0, 0.086527, 0.045182),- float4(0.992928, -0.11872, 0.0, 0.577584),float4(-0.094098, 0.431551, -0.043263, 7.0),float4(-0.069221, -0.050834, 0.043263, 0.01033),float4(0.0, 0.0, 0.043263, 0.045182),float4(0.591909, -0.806004, 0.0, 0.577584),- float4(-0.163319, 0.380717, -0.043263, 7.0),- float4(-0.060569, 0.02704, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(-0.407651, -0.913138, 0.0, 0.577584),- float4(-0.223888, 0.407756, -0.043263, 7.0),- float4(0.002163, 0.06814, 0.043263, 0.01033),+ float4(-0.167645, 0.416409, 0.046508, 10.0),+ float4(0.085445, 0.114648, -0.003245, 0.0),+ float4(0.073548, 0.015142, -0.046508, 0.768154),+ float4(0.548356, -0.38771, 0.740936, 0.871366),+ float4(-0.0822, 0.531057, -0.043263, 11.0),+ float4(-0.011897, -0.099506, 0.0, 0.01033),+ float4(-0.011897, -0.099506, 0.043263, 0.045182),+ float4(0.992928, -0.11872, 0.0, 0.577584),+ float4(-0.044345, 0.23254, 0.0, 7.0),+ float4(-0.001082, 0.332046, -0.043263, 0.01033),+ float4(-0.001082, 0.332046, 0.052998, 0.045182),+ float4(-0.999995, -0.003257, 0.0, 0.577584),+ float4(-0.045426, 0.564586, 0.052998, 14.0),+ float4(0.1233, -0.156829, -0.052998, 0.520989),+ float4(0.014061, -0.335291, 0.005408, 0.088655),+ float4(0.429355, 0.032562, 0.902549, 0.973449),+ float4(0.10924, 0.439122, 0.0, 14.0),+ float4(-0.031366, -0.031366, 0.0, 0.132876),+ float4(-0.154666, 0.125464, 0.052998, 0.028428),+ float4(0.182761, -0.182761, 0.966021, 0.955978),+ float4(0.10924, 0.439122, -0.043263, 11.0),+ float4(-0.031366, -0.031366, 0.0, 0.01033),+ float4(-0.031366, -0.031366, 0.043263, 0.045182),+ float4(0.707107, -0.707107, 0.0, 0.577584),+ float4(0.10924, 0.439122, -0.043263, 7.0),+ float4(-0.031366, -0.031366, 0.043263, 0.01033),float4(0.0, 0.0, 0.043263, 0.045182),- float4(-0.999496, 0.03173, 0.0, 0.577584),+ float4(0.707107, -0.707107, 0.0, 0.577584),+ float4(0.10924, 0.439122, 0.0, 10.0),+ float4(0.019468, 0.024876, 0.063813, 0.18117),+ float4(0.035692, -0.131953, 0.049753, 0.955978),+ float4(-0.933936, -0.126584, 0.334276, 0.964691),+ float4(0.128708, 0.463999, 0.063813, 14.0),+ float4(0.050834, 0.002163, -0.005408, 0.0),+ float4(0.0822, -0.018387, -0.063813, 0.439658),+ float4(0.07859, -0.92643, 0.368172, 0.871366),float4(-0.221724, 0.475896, -0.043263, 7.0),float4(0.122219, 0.207664, 0.043263, 0.01033),float4(0.0, 0.0, 0.043263, 0.045182),float4(-0.861819, 0.507216, 0.0, 0.577584),+ float4(-0.221724, 0.475896, -0.043263, 9.0),+ float4(0.122219, 0.207664, 0.0, 0.01033),+ float4(0.122219, 0.207664, 0.043263, 0.045182),+ float4(-0.861819, 0.507216, 0.0, 0.577584),+ float4(-0.099506, 0.68356, 0.0, 14.0),+ float4(0.017305, -0.152503, 0.043263, 0.0),+ float4(-0.122219, -0.207664, 0.0, 0.723049),+ float4(-0.365879, 0.215335, 0.905408, 0.854994),+ float4(-0.0822, 0.531057, -0.043263, 7.0),+ float4(-0.011897, -0.099506, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.086527, 0.045182),+ float4(0.992928, -0.11872, 0.0, 0.577584),+ float4(-0.099506, 0.68356, 0.0, 14.0),+ float4(0.054079, -0.118974, 0.052998, 0.0),+ float4(0.017305, -0.152503, 0.043263, 0.514916),+ float4(-0.41958, 0.203352, 0.884647, 0.863157),float4(-0.099506, 0.68356, -0.043263, 3.0),float4(0.086527, 0.149258, 0.043263, 0.01033),float4(0.0, 0.0, 0.043263, 0.045182),float4(-0.86514, 0.501531, 0.0, 0.577584),+ float4(-0.045426, 0.564586, -0.043263, 11.0),+ float4(-0.036774, -0.033529, 0.0, 0.01033),+ float4(-0.036774, -0.033529, 0.086527, 0.045182),+ float4(0.673754, -0.738956, 0.0, 0.577584),+ float4(-0.045426, 0.564586, -0.043263, 7.0),+ float4(-0.036774, -0.033529, 0.086527, 0.01033),+ float4(0.0, 0.0, 0.096261, 0.045182),+ float4(0.673754, -0.738956, 0.0, 0.577584),+ float4(-0.099506, 0.68356, 0.0, 14.0),+ float4(0.086527, 0.149258, 0.0, 0.0),+ float4(0.054079, -0.118974, 0.052998, 0.262257),+ float4(-0.385563, 0.223515, 0.8952, 0.9131),+ float4(-0.099506, 0.68356, -0.043263, 11.0),+ float4(0.086527, 0.149258, 0.0, 0.01033),+ float4(0.086527, 0.149258, 0.043263, 0.045182),+ float4(-0.86514, 0.501531, 0.0, 0.577584),+ float4(-0.012979, 0.832818, 0.0, 14.0),+ float4(0.214153, -0.194685, 0.0822, 0.000305),+ float4(-0.032447, -0.268232, 0.052998, 0.930114),+ float4(-0.176863, 0.211325, 0.961281, 0.973449),+ float4(0.128708, 0.463999, 0.063813, 14.0),+ float4(-0.019468, -0.024876, -0.063813, 0.168276),+ float4(-0.174135, 0.100587, -0.010816, 0.038209),+ float4(-0.469238, -0.764881, 0.441331, 0.955978),+ float4(0.201174, 0.638133, 0.0822, 14.0),+ float4(-0.072466, -0.174135, -0.018387, 0.18117),+ float4(-0.246601, -0.073548, -0.029203, 0.082277),+ float4(-0.098561, -0.063844, 0.993081, 0.973449),float4(-0.012979, 0.832818, -0.043263, 7.0),float4(0.339617, -0.002163, 0.043263, 0.01033),float4(0.0, 0.0, 0.043263, 0.045182),float4(0.006369, 0.99998, 0.0, 0.577584),- float4(0.326638, 0.830655, -0.043263, 7.0),- float4(0.139524, -0.21199, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.835314, 0.549773, 0.0, 0.577584),- float4(0.466162, 0.618665, -0.043263, 3.0),- float4(0.007571, -0.015142, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.894427, 0.447214, 0.0, 0.577584),- float4(0.473733, 0.603523, -0.043263, 7.0),- float4(0.0, -0.21199, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(1.0, 0.0, 0.0, 0.577584),- float4(0.473733, 0.391533, -0.043263, 7.0),- float4(-0.022713, -0.032447, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.819232, -0.573462, 0.0, 0.577584),- float4(0.45102, 0.359085, -0.043263, 7.0),- float4(-0.040019, -0.007571, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.185892, -0.98257, 0.0, 0.577584),- float4(0.411001, 0.351514, -0.043263, 7.0),- float4(-0.034611, 0.030284, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(-0.658505, -0.752577, 0.0, 0.577584),- float4(0.376391, 0.381799, -0.043263, 7.0),- float4(-0.001082, 0.107077, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(-0.999949, -0.0101, 0.0, 0.577584),- float4(0.375309, 0.488875, -0.043263, 7.0),- float4(-0.034611, -0.014061, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.376377, -0.926467, 0.0, 0.577584),- float4(0.340698, 0.474815, -0.043263, 7.0),- float4(0.001082, -0.121137, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.99996, 0.008928, 0.0, 0.577584),- float4(0.34178, 0.353677, -0.043263, 7.0),- float4(-0.022713, -0.034611, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.836048, -0.548657, 0.0, 0.577584),- float4(0.319067, 0.319067, -0.043263, 7.0),- float4(-0.042182, -0.007571, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.176664, -0.984271, 0.0, 0.577584),- float4(0.276885, 0.311496, -0.043263, 7.0),- float4(-0.035692, 0.032447, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(-0.672673, -0.73994, 0.0, 0.577584),- float4(0.241193, 0.343943, -0.043263, 7.0),- float4(-0.002163, 0.107077, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(-0.999796, -0.020198, 0.0, 0.577584),- float4(0.23903, 0.45102, -0.043263, 7.0),- float4(-0.028121, -0.005408, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.188847, -0.982006, 0.0, 0.577584),- float4(0.210908, 0.445612, -0.043263, 7.0),- float4(0.0, -0.131953, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(1.0, 0.0, 0.0, 0.577584),- float4(0.210908, 0.313659, -0.043263, 7.0),- float4(-0.021632, -0.033529, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.840297, -0.542127, 0.0, 0.577584),- float4(0.189277, 0.28013, -0.043263, 7.0),- float4(-0.042182, -0.007571, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.176664, -0.984271, 0.0, 0.577584),- float4(0.147095, 0.272559, -0.043263, 7.0),- float4(-0.035692, 0.034611, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(-0.696146, -0.7179, 0.0, 0.577584),- float4(0.111403, 0.307169, -0.043263, 7.0),- float4(-0.002163, 0.131953, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(-0.999866, -0.016391, 0.0, 0.577584),- float4(0.10924, 0.439122, -0.043263, 7.0),- float4(-0.031366, -0.031366, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.707107, -0.707107, 0.0, 0.577584),- float4(0.077874, 0.407756, -0.043263, 7.0),- float4(-0.002163, -0.319067, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.999977, -0.006779, 0.0, 0.577584),- float4(0.075711, 0.08869, -0.043263, 7.0),- float4(-0.031366, -0.045426, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.822897, -0.568191, 0.0, 0.577584),- float4(0.044345, 0.043263, -0.043263, 7.0),- float4(-0.043263, -0.005408, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.124035, -0.992278, 0.0, 0.577584),- float4(0.001082, 0.037855, -0.043263, 7.0),- float4(-0.044345, 0.040019, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(-0.669964, -0.742393, 0.0, 0.577584),- float4(-0.043263, 0.077874, -0.043263, 7.0),- float4(-0.001082, 0.154666, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(-0.999976, -0.006993, 0.0, 0.577584),- float4(0.044345, 0.043263, 0.0, 10.0),- float4(-0.043263, -0.005408, 0.0, 0.000305),- float4(-0.040019, 0.030284, 0.049753, 0.964691),- float4(0.101434, -0.811469, 0.575525, 0.973449),- float4(-0.031366, 0.229295, 0.058405, 14.0),- float4(0.035692, -0.155748, -0.008653, 0.000305),- float4(-0.011897, -0.151422, -0.058405, 0.955978),- float4(-0.716533, -0.20131, 0.667874, 0.904662),- float4(-0.031366, 0.229295, 0.058405, 14.0),- float4(0.10924, 0.178461, -0.058405, 0.0),- float4(0.107077, -0.140606, -0.058405, 0.376257),- float4(0.475583, -0.003224, 0.879665, 0.830777),- float4(-0.045426, 0.564586, 0.052998, 14.0),- float4(0.1233, -0.156829, -0.052998, 0.520989),- float4(0.014061, -0.335291, 0.005408, 0.088655),- float4(0.429355, 0.032562, 0.902549, 0.973449),- float4(0.183869, 0.317985, 0.037855, 10.0),- float4(0.005408, -0.037855, -0.037855, 0.0),- float4(-0.036774, -0.045426, -0.037855, 0.806958),- float4(0.124328, -0.692684, 0.710445, 0.854994),- float4(0.10924, 0.439122, 0.0, 10.0),- float4(0.019468, 0.024876, 0.063813, 0.18117),- float4(0.035692, -0.131953, 0.049753, 0.955978),- float4(-0.933936, -0.126584, 0.334276, 0.964691),+ float4(0.179543, 0.466162, 0.058405, 10.0),+ float4(-0.050834, -0.002163, 0.005408, 0.000305),+ float4(0.021632, 0.171972, 0.023795, 0.022171),+ float4(0.110896, -0.149888, 0.982464, 0.381323),+ float4(-0.012979, 0.832818, 0.0, 14.0),+ float4(0.339617, -0.002163, 0.0, 0.0),+ float4(0.214153, -0.194685, 0.0822, 0.027314),+ float4(0.002492, 0.391296, 0.920261, 0.49102),float4(0.183869, 0.317985, 0.037855, 10.0),float4(-0.055161, 0.146014, 0.025958, 0.0),float4(0.02704, 0.127627, -0.037855, 0.439658),float4(0.623841, 0.097823, 0.775405, 0.871366),- float4(0.128708, 0.463999, 0.063813, 14.0),- float4(0.050834, 0.002163, -0.005408, 0.0),- float4(0.0822, -0.018387, -0.063813, 0.439658),- float4(0.07859, -0.92643, 0.368172, 0.871366),- float4(0.319067, 0.319067, 0.0, 10.0),- float4(-0.042182, -0.007571, 0.0, 0.0),- float4(-0.037855, 0.023795, 0.046508, 0.896269),- float4(0.1483, -0.826245, 0.54344, 0.896269),+ float4(0.210908, 0.445612, -0.043263, 7.0),+ float4(0.0, -0.131953, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(1.0, 0.0, 0.0, 0.577584),+ float4(0.210908, 0.445612, 0.0, 10.0),+ float4(-0.031366, 0.02055, 0.058405, 0.000305),+ float4(0.035692, 0.014061, 0.06165, 0.022171),+ float4(-0.105864, -0.954447, 0.278971, 0.381323),+ float4(0.23903, 0.45102, -0.043263, 11.0),+ float4(-0.028121, -0.005408, 0.0, 0.01033),+ float4(-0.028121, -0.005408, 0.043263, 0.045182),+ float4(0.188847, -0.982006, 0.0, 0.577584),+ float4(0.23903, 0.45102, -0.043263, 7.0),+ float4(-0.028121, -0.005408, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.188847, -0.982006, 0.0, 0.577584),+ float4(0.246601, 0.459672, 0.06165, 11.0),+ float4(-0.007571, -0.008653, -0.06165, 0.000305),+ float4(-0.035692, -0.014061, -0.06165, 0.022171),+ float4(0.187618, -0.975617, 0.113888, 0.381323),+ float4(0.241193, 0.343943, -0.043263, 11.0),+ float4(-0.002163, 0.107077, 0.0, 0.01033),+ float4(-0.002163, 0.107077, 0.043263, 0.045182),+ float4(-0.999796, -0.020198, 0.0, 0.577584),float4(0.23903, 0.45102, 0.0, 15.0),float4(0.007571, 0.008653, 0.06165, 0.000305),float4(0.042182, -0.108158, 0.046508, 0.846876),@@ -1526,190 +1617,148 @@ static const float4 PRISM_TRIS[644] = {float4(-0.070303, 0.101669, 0.024876, 0.0),float4(0.023795, 0.116811, -0.036774, 0.473533),float4(0.523424, 0.157027, 0.837478, 0.930114),+ float4(0.340698, 0.474815, -0.043263, 7.0),+ float4(0.001082, -0.121137, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.99996, 0.008928, 0.0, 0.577584),+ float4(0.376391, 0.381799, -0.043263, 11.0),+ float4(-0.001082, 0.107077, 0.0, 0.01033),+ float4(-0.001082, 0.107077, 0.043263, 0.045182),+ float4(-0.999949, -0.0101, 0.0, 0.577584),+ float4(0.376391, 0.381799, -0.043263, 7.0),+ float4(-0.001082, 0.107077, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(-0.999949, -0.0101, 0.0, 0.577584),+ float4(0.375309, 0.488875, 0.0, 14.0),+ float4(0.036774, -0.105995, 0.043263, 0.000305),+ float4(0.001082, -0.107077, 0.0, 0.879622),+ float4(-0.771254, -0.00779, 0.63648, 0.896269),+ float4(0.375309, 0.488875, 0.0, 14.0),+ float4(0.078955, -0.08869, 0.032447, 0.223224),+ float4(0.036774, -0.105995, 0.043263, 0.964691),+ float4(0.071225, 0.39802, 0.914608, 0.973449),+ float4(0.473733, 0.603523, 0.0, 14.0),+ float4(0.0, -0.21199, 0.0, 0.158953),+ float4(-0.019468, -0.203337, 0.032447, 0.030716),+ float4(0.857493, 0.0, 0.514496, 0.964691),+ float4(0.473733, 0.603523, -0.043263, 11.0),+ float4(0.0, -0.21199, 0.0, 0.01033),+ float4(0.0, -0.21199, 0.043263, 0.045182),+ float4(1.0, 0.0, 0.0, 0.577584),+ float4(0.276885, 0.484549, 0.058405, 10.0),+ float4(-0.030284, -0.024876, 0.003245, 0.000305),+ float4(-0.097342, -0.018387, 0.0, 0.022171),+ float4(-0.03153, 0.166923, 0.985466, 0.381323),float4(0.246601, 0.459672, 0.06165, 14.0),float4(0.030284, 0.024876, -0.003245, 0.0),float4(0.094098, 0.015142, -0.06165, 0.473533),float4(0.518869, -0.545855, 0.657888, 0.930114),- float4(0.45102, 0.359085, 0.0, 10.0),- float4(-0.040019, -0.007571, 0.0, 0.000305),- float4(-0.038937, 0.023795, 0.043263, 0.879622),- float4(0.151736, -0.802035, 0.577682, 0.9131),- float4(0.454264, 0.400185, 0.032447, 12.0),- float4(-0.078955, 0.08869, -0.032447, 0.158953),- float4(0.019468, 0.203337, -0.032447, 0.030716),- float4(-0.201684, 0.173144, 0.964025, 0.964691),- float4(0.375309, 0.488875, 0.0, 10.0),- float4(0.090853, 0.12979, 0.0, 0.158953),- float4(0.098424, 0.114648, 0.0, 0.030716),- float4(0.0, 0.0, 1.0, 0.964691),+ float4(0.375309, 0.488875, -0.043263, 11.0),+ float4(-0.034611, -0.014061, 0.0, 0.01033),+ float4(-0.034611, -0.014061, 0.043263, 0.045182),+ float4(0.376377, -0.926467, 0.0, 0.577584),float4(0.340698, 0.474815, 0.0, 14.0),float4(-0.063813, 0.009734, 0.058405, 0.000305),float4(0.034611, 0.014061, 0.0, 0.022171),float4(0.3276, -0.806402, 0.492334, 0.381323),- float4(0.276885, 0.484549, 0.058405, 10.0),- float4(-0.030284, -0.024876, 0.003245, 0.000305),- float4(-0.097342, -0.018387, 0.0, 0.022171),- float4(-0.03153, 0.166923, 0.985466, 0.381323),+ float4(0.375309, 0.488875, -0.043263, 7.0),+ float4(-0.034611, -0.014061, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.376377, -0.926467, 0.0, 0.577584),+ float4(0.454264, 0.400185, 0.032447, 12.0),+ float4(-0.078955, 0.08869, -0.032447, 0.158953),+ float4(0.019468, 0.203337, -0.032447, 0.030716),+ float4(-0.201684, 0.173144, 0.964025, 0.964691),float4(0.201174, 0.638133, 0.0822, 8.0),float4(0.075711, -0.153585, -0.023795, 0.000305),float4(-0.021632, -0.171972, -0.023795, 0.022171),float4(0.026497, -0.140281, 0.989757, 0.381323),+ float4(0.473733, 0.603523, -0.043263, 7.0),+ float4(0.0, -0.21199, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(1.0, 0.0, 0.0, 0.577584),float4(0.276885, 0.484549, 0.058405, 14.0),float4(-0.075711, 0.153585, 0.023795, 0.000305),float4(0.098424, 0.004326, -0.058405, 0.022171),float4(0.50316, 0.115345, 0.856461, 0.381323),- float4(0.246601, 0.459672, 0.06165, 11.0),- float4(-0.007571, -0.008653, -0.06165, 0.000305),- float4(-0.035692, -0.014061, -0.06165, 0.022171),- float4(0.187618, -0.975617, 0.113888, 0.381323),- float4(0.210908, 0.445612, 0.0, 10.0),- float4(-0.031366, 0.02055, 0.058405, 0.000305),- float4(0.035692, 0.014061, 0.06165, 0.022171),- float4(-0.105864, -0.954447, 0.278971, 0.381323),- float4(-0.167645, 0.416409, 0.046508, 14.0),- float4(0.004326, -0.035692, -0.046508, 0.000305),- float4(-0.056242, -0.008653, -0.046508, 0.955978),- float4(-0.339782, -0.761112, 0.552501, 0.973449),- float4(-0.167645, 0.416409, 0.046508, 10.0),- float4(0.085445, 0.114648, -0.003245, 0.0),- float4(0.073548, 0.015142, -0.046508, 0.768154),- float4(0.548356, -0.38771, 0.740936, 0.871366),- float4(-0.044345, 0.23254, 0.0, 3.0),- float4(0.0, 0.0, -0.043263, 0.01033),- float4(-0.001082, 0.332046, -0.043263, 0.045182),- float4(-0.999995, -0.003257, 0.0, 0.577584),- float4(-0.045426, 0.564586, -0.043263, 11.0),- float4(-0.036774, -0.033529, 0.0, 0.01033),- float4(-0.036774, -0.033529, 0.086527, 0.045182),- float4(0.673754, -0.738956, 0.0, 0.577584),- float4(-0.0822, 0.531057, -0.043263, 11.0),- float4(-0.011897, -0.099506, 0.0, 0.01033),- float4(-0.011897, -0.099506, 0.043263, 0.045182),- float4(0.992928, -0.11872, 0.0, 0.577584),- float4(-0.094098, 0.431551, -0.043263, 11.0),- float4(-0.069221, -0.050834, 0.0, 0.01033),- float4(-0.069221, -0.050834, 0.043263, 0.045182),- float4(0.591909, -0.806004, 0.0, 0.577584),- float4(-0.163319, 0.380717, -0.043263, 11.0),- float4(-0.060569, 0.02704, 0.0, 0.01033),- float4(-0.060569, 0.02704, 0.043263, 0.045182),- float4(-0.407651, -0.913138, 0.0, 0.577584),- float4(-0.223888, 0.407756, -0.043263, 11.0),- float4(0.002163, 0.06814, 0.0, 0.01033),- float4(0.002163, 0.06814, 0.043263, 0.045182),- float4(-0.999496, 0.03173, 0.0, 0.577584),- float4(-0.221724, 0.475896, -0.043263, 9.0),- float4(0.122219, 0.207664, 0.0, 0.01033),- float4(0.122219, 0.207664, 0.043263, 0.045182),- float4(-0.861819, 0.507216, 0.0, 0.577584),- float4(-0.099506, 0.68356, -0.043263, 11.0),- float4(0.086527, 0.149258, 0.0, 0.01033),- float4(0.086527, 0.149258, 0.043263, 0.045182),- float4(-0.86514, 0.501531, 0.0, 0.577584),- float4(-0.012979, 0.832818, -0.043263, 11.0),- float4(0.339617, -0.002163, 0.0, 0.01033),- float4(0.339617, -0.002163, 0.043263, 0.045182),- float4(0.006369, 0.99998, 0.0, 0.577584),- float4(0.326638, 0.830655, -0.043263, 9.0),- float4(0.139524, -0.21199, 0.0, 0.01033),- float4(0.139524, -0.21199, 0.043263, 0.045182),- float4(0.835314, 0.549773, 0.0, 0.577584),+ float4(0.375309, 0.488875, 0.0, 10.0),+ float4(0.090853, 0.12979, 0.0, 0.158953),+ float4(0.098424, 0.114648, 0.0, 0.030716),+ float4(0.0, 0.0, 1.0, 0.964691),float4(0.466162, 0.618665, -0.043263, 11.0),float4(0.007571, -0.015142, 0.0, 0.01033),float4(0.007571, -0.015142, 0.043263, 0.045182),float4(0.894427, 0.447214, 0.0, 0.577584),- float4(0.473733, 0.603523, -0.043263, 11.0),- float4(0.0, -0.21199, 0.0, 0.01033),- float4(0.0, -0.21199, 0.043263, 0.045182),- float4(1.0, 0.0, 0.0, 0.577584),- float4(0.473733, 0.391533, -0.043263, 11.0),- float4(-0.022713, -0.032447, 0.0, 0.01033),- float4(-0.022713, -0.032447, 0.043263, 0.045182),- float4(0.819232, -0.573462, 0.0, 0.577584),- float4(0.45102, 0.359085, -0.043263, 11.0),- float4(-0.040019, -0.007571, 0.0, 0.01033),- float4(-0.040019, -0.007571, 0.043263, 0.045182),- float4(0.185892, -0.98257, 0.0, 0.577584),- float4(0.411001, 0.351514, -0.043263, 11.0),- float4(-0.034611, 0.030284, 0.0, 0.01033),- float4(-0.034611, 0.030284, 0.043263, 0.045182),- float4(-0.658505, -0.752577, 0.0, 0.577584),- float4(0.376391, 0.381799, -0.043263, 11.0),- float4(-0.001082, 0.107077, 0.0, 0.01033),- float4(-0.001082, 0.107077, 0.043263, 0.045182),- float4(-0.999949, -0.0101, 0.0, 0.577584),- float4(0.375309, 0.488875, -0.043263, 11.0),- float4(-0.034611, -0.014061, 0.0, 0.01033),- float4(-0.034611, -0.014061, 0.043263, 0.045182),- float4(0.376377, -0.926467, 0.0, 0.577584),- float4(0.340698, 0.474815, -0.043263, 11.0),- float4(0.001082, -0.121137, 0.0, 0.01033),- float4(0.001082, -0.121137, 0.043263, 0.045182),- float4(0.99996, 0.008928, 0.0, 0.577584),- float4(0.34178, 0.353677, -0.043263, 11.0),- float4(-0.022713, -0.034611, 0.0, 0.01033),- float4(-0.022713, -0.034611, 0.043263, 0.045182),- float4(0.836048, -0.548657, 0.0, 0.577584),- float4(0.319067, 0.319067, -0.043263, 11.0),- float4(-0.042182, -0.007571, 0.0, 0.01033),- float4(-0.042182, -0.007571, 0.043263, 0.045182),- float4(0.176664, -0.984271, 0.0, 0.577584),- float4(0.276885, 0.311496, -0.043263, 11.0),- float4(-0.035692, 0.032447, 0.0, 0.01033),- float4(-0.035692, 0.032447, 0.043263, 0.045182),- float4(-0.672673, -0.73994, 0.0, 0.577584),- float4(0.241193, 0.343943, -0.043263, 11.0),- float4(-0.002163, 0.107077, 0.0, 0.01033),- float4(-0.002163, 0.107077, 0.043263, 0.045182),- float4(-0.999796, -0.020198, 0.0, 0.577584),- float4(0.23903, 0.45102, -0.043263, 11.0),- float4(-0.028121, -0.005408, 0.0, 0.01033),- float4(-0.028121, -0.005408, 0.043263, 0.045182),- float4(0.188847, -0.982006, 0.0, 0.577584),- float4(0.210908, 0.445612, -0.043263, 11.0),- float4(0.0, -0.131953, 0.0, 0.01033),- float4(0.0, -0.131953, 0.043263, 0.045182),- float4(1.0, 0.0, 0.0, 0.577584),- float4(0.210908, 0.313659, -0.043263, 11.0),- float4(-0.021632, -0.033529, 0.0, 0.01033),- float4(-0.021632, -0.033529, 0.043263, 0.045182),- float4(0.840297, -0.542127, 0.0, 0.577584),- float4(0.189277, 0.28013, -0.043263, 11.0),- float4(-0.042182, -0.007571, 0.0, 0.01033),- float4(-0.042182, -0.007571, 0.043263, 0.045182),- float4(0.176664, -0.984271, 0.0, 0.577584),- float4(0.147095, 0.272559, -0.043263, 11.0),- float4(-0.035692, 0.034611, 0.0, 0.01033),- float4(-0.035692, 0.034611, 0.043263, 0.045182),- float4(-0.696146, -0.7179, 0.0, 0.577584),- float4(0.111403, 0.307169, -0.043263, 11.0),- float4(-0.002163, 0.131953, 0.0, 0.01033),- float4(-0.002163, 0.131953, 0.043263, 0.045182),- float4(-0.999866, -0.016391, 0.0, 0.577584),- float4(0.10924, 0.439122, -0.043263, 11.0),- float4(-0.031366, -0.031366, 0.0, 0.01033),- float4(-0.031366, -0.031366, 0.043263, 0.045182),- float4(0.707107, -0.707107, 0.0, 0.577584),- float4(0.077874, 0.407756, -0.043263, 11.0),- float4(-0.002163, -0.319067, 0.0, 0.01033),- float4(-0.002163, -0.319067, 0.043263, 0.045182),- float4(0.999977, -0.006779, 0.0, 0.577584),- float4(0.075711, 0.08869, -0.043263, 11.0),- float4(-0.031366, -0.045426, 0.0, 0.01033),- float4(-0.031366, -0.045426, 0.043263, 0.045182),- float4(0.822897, -0.568191, 0.0, 0.577584),- float4(0.044345, 0.043263, -0.043263, 11.0),- float4(-0.043263, -0.005408, 0.0, 0.01033),- float4(-0.043263, -0.005408, 0.043263, 0.045182),- float4(0.124035, -0.992278, 0.0, 0.577584),- float4(0.001082, 0.037855, -0.043263, 11.0),- float4(-0.044345, 0.040019, 0.0, 0.01033),- float4(-0.044345, 0.040019, 0.043263, 0.045182),- float4(-0.669964, -0.742393, 0.0, 0.577584),- float4(-0.043263, 0.077874, -0.043263, 9.0),- float4(-0.001082, 0.154666, 0.0, 0.01033),- float4(-0.001082, 0.154666, 0.043263, 0.045182),- float4(-0.999976, -0.006993, 0.0, 0.577584)+ float4(0.466162, 0.618665, -0.043263, 3.0),+ float4(0.007571, -0.015142, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.894427, 0.447214, 0.0, 0.577584),+ float4(0.326638, 0.830655, 0.0, 14.0),+ float4(0.139524, -0.21199, 0.0, 0.0),+ float4(0.048671, -0.34178, 0.0, 0.015213),+ float4(0.0, 0.0, 1.0, 0.428687),+ float4(0.326638, 0.830655, 0.0, 14.0),+ float4(0.048671, -0.34178, 0.0, 0.007492),+ float4(-0.125464, -0.192522, 0.0822, 0.054475),+ float4(0.472493, 0.067285, 0.878762, 0.964691),+ float4(0.326638, 0.830655, -0.043263, 9.0),+ float4(0.139524, -0.21199, 0.0, 0.01033),+ float4(0.139524, -0.21199, 0.043263, 0.045182),+ float4(0.835314, 0.549773, 0.0, 0.577584),+ float4(0.326638, 0.830655, -0.043263, 7.0),+ float4(0.139524, -0.21199, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.835314, 0.549773, 0.0, 0.577584),+ float4(-0.012979, 0.832818, -0.043263, 11.0),+ float4(0.339617, -0.002163, 0.0, 0.01033),+ float4(0.339617, -0.002163, 0.043263, 0.045182),+ float4(0.006369, 0.99998, 0.0, 0.577584)+};+static const float4 PRISM_BOXES[44] = {+ float4(0.030135, 0.06127, -0.043945, 0.0),+ float4(0.330601, 0.483055, 0.116951, 7.0),+ float4(0.034429, 0.265258, -0.043945, 7.0),+ float4(0.542104, 0.741798, 0.116951, 8.0),+ float4(0.034429, 0.355442, -0.043945, 15.0),+ float4(0.305908, 0.822319, 0.116951, 8.0),+ float4(0.267405, 0.532589, -0.043945, 23.0),+ float4(0.542104, 0.822319, 0.082595, 8.0),+ float4(-0.045345, 0.036855, -0.044263, 31.0),+ float4(0.045345, 0.23354, 0.059405, 8.0),+ float4(-0.224888, 0.072548, -0.044263, 39.0),+ float4(0.059405, 0.565586, 0.059405, 8.0),+ float4(-0.032366, 0.042263, -0.044263, 47.0),+ float4(0.148095, 0.408756, 0.059405, 8.0),+ float4(0.074711, 0.08769, -0.044263, 55.0),+ float4(0.184869, 0.464999, 0.064813, 8.0),+ float4(0.146095, 0.271559, -0.044263, 63.0),+ float4(0.211908, 0.446612, 0.038855, 8.0),+ float4(0.23803, 0.310496, -0.044263, 71.0),+ float4(0.320067, 0.460672, 0.06265, 8.0),+ float4(0.275885, 0.310496, -0.044263, 79.0),+ float4(0.412001, 0.475815, 0.047508, 8.0),+ float4(0.375391, 0.350514, -0.044263, 87.0),+ float4(0.45202, 0.38388, 0.044263, 4.0),+ float4(0.410001, 0.350514, -0.044263, 91.0),+ float4(0.474733, 0.401185, 0.044263, 5.0),+ float4(-0.224888, 0.379717, -0.044263, 96.0),+ float4(-0.0812, 0.532057, 0.047508, 8.0),+ float4(-0.095098, 0.228295, -0.044263, 104.0),+ float4(0.211908, 0.565586, 0.064813, 8.0),+ float4(-0.222724, 0.430551, -0.044263, 112.0),+ float4(-0.011979, 0.833818, 0.053998, 8.0),+ float4(-0.100506, 0.438122, -0.044263, 120.0),+ float4(0.327638, 0.833818, 0.0832, 8.0),+ float4(0.127708, 0.312659, -0.044263, 128.0),+ float4(0.282211, 0.467162, 0.064813, 8.0),+ float4(0.245601, 0.352677, -0.044263, 136.0),+ float4(0.474733, 0.604523, 0.06265, 8.0),+ float4(0.178543, 0.390533, -0.044263, 144.0),+ float4(0.474733, 0.639133, 0.0832, 8.0),+ float4(0.200174, 0.483549, -0.044263, 152.0),+ float4(0.474733, 0.639133, 0.0832, 4.0),+ float4(-0.013979, 0.487875, -0.044263, 156.0),+ float4(0.467162, 0.833818, 0.0832, 5.0)};static const float2 PRISM_POLY[110] = {float2(0.006442, -0.002147),@@ -1903,20 +1952,40 @@ float prism_tri(float3 ro, float3 rd, int k)}// Le triangle du cristal `shape` le plus proche devant (ro, rd) : sa distance (1e9 si aucun), son-// indice dans `hit` (-1 si aucun).+// indice dans `hit` (-1 si aucun). Les triangles sont rangés par voisinage, une boîte englobante+// par groupe (PRISM_BOXES) : un rayon qui rate une boîte, ou n'y entre qu'au-delà du meilleur+// point, saute tous ses triangles. L'inverse de la direction sert à toutes les boîtes.float prism_trace(float3 ro, float3 rd, int shape, out int hit){- int k0 = PRISM_TRI_START[shape];- int n = PRISM_TRI_COUNT[shape];+ float3 inv = 1.0 / (abs(rd) > 1e-6 ? rd : 1e-6);+ int b0 = PRISM_BOX_START[shape];+ int nb = PRISM_BOX_COUNT[shape];float best = 1e9;hit = -1;- [loop] for (int i = 0; i < n; i++)+ [loop] for (int j = b0; j < b0 + nb; j++){- float t = prism_tri(ro, rd, k0 + i);- if (t > 1e-5 && t < best)+ float4 lo = PRISM_BOXES[2 * j];+ float4 hi = PRISM_BOXES[2 * j + 1];+ float3 t0 = (lo.xyz - ro) * inv;+ float3 t1 = (hi.xyz - ro) * inv;+ float3 tn = min(t0, t1);+ float3 tf = max(t0, t1);+ float tmin = max(max(tn.x, tn.y), tn.z);+ float tmax = min(min(tf.x, tf.y), tf.z);+ if (tmax < max(tmin, 1e-5) || tmin > best)+ {+ continue;+ }+ int k0 = (int)lo.w;+ int n = (int)hi.w;+ [loop] for (int i = k0; i < k0 + n; i++){- best = t;- hit = k0 + i;+ float t = prism_tri(ro, rd, i);+ if (t > 1e-5 && t < best)+ {+ best = t;+ hit = i;+ }}}return best;@@ -2436,7 +2505,7 @@ float4 cursor_model(float2 local)float3 ray = rd;float2 tb = ray_box(ro, ray, lo - 0.02, hi + 0.02);int stage = tb.x < tb.y && tb.y > 0.0 ? STAGE_MARCH : STAGE_DONE;- // Prism Glow : le cristal est tracé triangle par triangle au départ de chaque rayon ; `tc` est+ // Prism Glow : le cristal est tracé au départ de chaque rayon ; `tc` est// son point touché (1e9 : raté), `hc` sa facette. La marche du serti s'arrête à lui.bool need_tc = stage == STAGE_MARCH;float tc = 1e9;diff --git a/crates/compositor/src/shaders.metal b/crates/compositor/src/shaders.metalindex 1baa306cc..34f0be51d 100644--- a/crates/compositor/src/shaders.metal+++ b/crates/compositor/src/shaders.metal@@ -990,19 +990,41 @@ constant int PRISM_SIL_START[2] = { 0, 25 };constant int PRISM_SIL_COUNT[2] = { 25, 42 };constant int PRISM_OUT_START[2] = { 67, 76 };constant int PRISM_OUT_COUNT[2] = { 9, 34 };+constant int PRISM_BOX_START[2] = { 0, 4 };+constant int PRISM_BOX_COUNT[2] = { 4, 18 };constant float4 PRISM_TRIS[644] = {- float4(0.035429, 0.482055, 0.0, 14.0),- float4(0.134202, -0.125614, 0.115951, 0.000305),- float4(-0.004294, -0.419785, 0.0, 0.938689),- float4(-0.650191, 0.006652, 0.759742, 0.854994),+ float4(0.252301, 0.266258, -0.042945, 11.0),+ float4(-0.221166, -0.203988, 0.0, 0.01033),+ float4(-0.221166, -0.203988, 0.042945, 0.045182),+ float4(0.677984, -0.735077, 0.0, 0.577584),+ float4(0.252301, 0.266258, -0.042945, 3.0),+ float4(-0.221166, -0.203988, 0.042945, 0.01033),+ float4(0.0, 0.0, 0.042945, 0.045182),+ float4(0.677984, -0.735077, 0.0, 0.577584),+ float4(0.031135, 0.06227, -0.042945, 7.0),+ float4(0.004294, 0.419785, 0.042945, 0.01033),+ float4(0.0, 0.0, 0.042945, 0.045182),+ float4(-0.999948, 0.01023, 0.0, 0.577584),float4(0.169632, 0.356442, 0.115951, 14.0),float4(0.082669, -0.090184, -0.115951, 0.590616),float4(-0.138497, -0.294172, -0.115951, 0.737911),float4(0.466385, -0.505659, 0.725806, 0.973449),+ float4(0.035429, 0.482055, 0.0, 14.0),+ float4(0.134202, -0.125614, 0.115951, 0.000305),+ float4(-0.004294, -0.419785, 0.0, 0.938689),+ float4(-0.650191, 0.006652, 0.759742, 0.854994),+ float4(0.031135, 0.06227, -0.042945, 9.0),+ float4(0.004294, 0.419785, 0.0, 0.01033),+ float4(0.004294, 0.419785, 0.042945, 0.045182),+ float4(-0.999948, 0.01023, 0.0, 0.577584),float4(0.169632, 0.356442, 0.115951, 14.0),float4(0.159969, 0.080521, -0.045092, 0.381323),float4(0.082669, -0.090184, -0.115951, 0.056123),float4(0.461407, -0.510214, 0.725799, 0.973449),+ float4(0.541104, 0.544325, -0.042945, 9.0),+ float4(-0.288804, -0.278068, 0.0, 0.01033),+ float4(-0.288804, -0.278068, 0.042945, 0.045182),+ float4(0.69359, -0.72037, 0.0, 0.577584),float4(0.329601, 0.436963, 0.070859, 14.0),float4(0.211503, 0.107362, -0.070859, 0.545724),float4(-0.077301, -0.170706, -0.070859, 0.064805),@@ -1011,53 +1033,77 @@ constant float4 PRISM_TRIS[644] = {float4(0.061196, -0.096626, -0.010736, 0.000916),float4(-0.098773, -0.177147, 0.034356, 0.046662),float4(0.247834, 0.049458, 0.967539, 0.904662),+ float4(0.541104, 0.544325, -0.042945, 7.0),+ float4(-0.288804, -0.278068, 0.042945, 0.01033),+ float4(0.0, 0.0, 0.042945, 0.045182),+ float4(0.69359, -0.72037, 0.0, 0.577584),+ float4(0.199693, 0.595859, 0.0, 14.0),+ float4(0.068712, -0.06227, 0.081595, 0.0),+ float4(-0.030061, -0.239417, 0.115951, 0.01445),+ float4(-0.504461, 0.426837, 0.750553, 0.254154),float4(0.268405, 0.533589, 0.081595, 14.0),float4(0.272699, 0.010736, -0.081595, 0.0),float4(0.061196, -0.096626, -0.010736, 0.025193),float4(0.283244, 0.073137, 0.956255, 0.527108),+ float4(0.035429, 0.482055, 0.0, 14.0),+ float4(0.0, 0.258742, 0.0, 0.0),+ float4(0.134202, -0.125614, 0.115951, 0.473533),+ float4(-0.653777, 0.0, 0.756687, 0.964691),float4(0.359663, 0.559356, 0.0, 14.0),float4(0.181442, -0.015031, 0.0, 0.006043),float4(-0.091258, -0.025767, 0.081595, 0.076188),float4(0.076465, 0.923048, 0.37701, 0.964691),- float4(0.199693, 0.595859, 0.0, 14.0),- float4(0.068712, -0.06227, 0.081595, 0.0),- float4(-0.030061, -0.239417, 0.115951, 0.01445),- float4(-0.504461, 0.426837, 0.750553, 0.254154),+ float4(0.035429, 0.482055, -0.042945, 3.0),+ float4(0.0, 0.258742, 0.042945, 0.01033),+ float4(0.0, 0.0, 0.042945, 0.045182),+ float4(-1.0, 0.0, 0.0, 0.577584),+ float4(0.035429, 0.482055, -0.042945, 11.0),+ float4(0.0, 0.258742, 0.0, 0.01033),+ float4(0.0, 0.258742, 0.042945, 0.045182),+ float4(-1.0, 0.0, 0.0, 0.577584),+ float4(0.035429, 0.740798, -0.042945, 7.0),+ float4(0.164264, -0.144939, 0.042945, 0.01033),+ float4(0.0, 0.0, 0.042945, 0.045182),+ float4(0.661622, 0.749838, 0.0, 0.577584),float4(0.035429, 0.740798, 0.0, 14.0),float4(0.164264, -0.144939, 0.0, 0.0),float4(0.134202, -0.384356, 0.115951, 0.010956),float4(0.332572, 0.376915, 0.864483, 0.215854),- float4(0.035429, 0.482055, 0.0, 14.0),- float4(0.0, 0.258742, 0.0, 0.0),- float4(0.134202, -0.125614, 0.115951, 0.473533),- float4(-0.653777, 0.0, 0.756687, 0.964691),+ float4(0.035429, 0.740798, -0.042945, 11.0),+ float4(0.164264, -0.144939, 0.0, 0.01033),+ float4(0.164264, -0.144939, 0.042945, 0.045182),+ float4(0.661622, 0.749838, 0.0, 0.577584),+ float4(0.199693, 0.595859, -0.042945, 7.0),+ float4(0.105215, 0.22546, 0.042945, 0.01033),+ float4(0.0, 0.0, 0.042945, 0.045182),+ float4(-0.906183, 0.422886, 0.0, 0.577584),float4(0.199693, 0.595859, 0.0, 14.0),float4(0.105215, 0.22546, 0.0, 0.0),float4(0.068712, -0.06227, 0.081595, 0.015991),float4(-0.613882, 0.286478, 0.735581, 0.473533),+ float4(0.199693, 0.595859, -0.042945, 11.0),+ float4(0.105215, 0.22546, 0.0, 0.01033),+ float4(0.105215, 0.22546, 0.042945, 0.045182),+ float4(-0.906183, 0.422886, 0.0, 0.577584),float4(0.304908, 0.821319, 0.0, 14.0),float4(0.128834, -0.067638, 0.0, 0.0),float4(-0.036503, -0.28773, 0.081595, 0.254154),float4(0.133686, 0.254641, 0.957751, 0.973449),+ float4(0.304908, 0.821319, -0.042945, 7.0),+ float4(0.128834, -0.067638, 0.042945, 0.01033),+ float4(0.0, 0.0, 0.042945, 0.045182),+ float4(0.464834, 0.885398, 0.0, 0.577584),float4(0.433742, 0.753681, 0.0, 14.0),float4(-0.07408, -0.194325, 0.0, 0.0),float4(-0.165337, -0.220092, 0.081595, 0.964691),float4(0.683362, -0.260508, 0.682021, 0.964691),- float4(0.035429, 0.482055, -0.042945, 3.0),- float4(0.0, 0.258742, 0.042945, 0.01033),- float4(0.0, 0.0, 0.042945, 0.045182),- float4(-1.0, 0.0, 0.0, 0.577584),- float4(0.035429, 0.740798, -0.042945, 7.0),- float4(0.164264, -0.144939, 0.042945, 0.01033),- float4(0.0, 0.0, 0.042945, 0.045182),- float4(0.661622, 0.749838, 0.0, 0.577584),- float4(0.199693, 0.595859, -0.042945, 7.0),- float4(0.105215, 0.22546, 0.042945, 0.01033),- float4(0.0, 0.0, 0.042945, 0.045182),- float4(-0.906183, 0.422886, 0.0, 0.577584),- float4(0.304908, 0.821319, -0.042945, 7.0),- float4(0.128834, -0.067638, 0.042945, 0.01033),- float4(0.0, 0.0, 0.042945, 0.045182),+ float4(0.433742, 0.753681, -0.042945, 11.0),+ float4(-0.07408, -0.194325, 0.0, 0.01033),+ float4(-0.07408, -0.194325, 0.042945, 0.045182),+ float4(0.934406, -0.35621, 0.0, 0.577584),+ float4(0.304908, 0.821319, -0.042945, 11.0),+ float4(0.128834, -0.067638, 0.0, 0.01033),+ float4(0.128834, -0.067638, 0.042945, 0.045182),float4(0.464834, 0.885398, 0.0, 0.577584),float4(0.433742, 0.753681, -0.042945, 7.0),float4(-0.07408, -0.194325, 0.042945, 0.01033),@@ -1067,70 +1113,86 @@ constant float4 PRISM_TRIS[644] = {float4(0.181442, -0.015031, 0.042945, 0.01033),float4(0.0, 0.0, 0.042945, 0.045182),float4(0.082557, 0.996586, 0.0, 0.577584),- float4(0.541104, 0.544325, -0.042945, 7.0),- float4(-0.288804, -0.278068, 0.042945, 0.01033),- float4(0.0, 0.0, 0.042945, 0.045182),- float4(0.69359, -0.72037, 0.0, 0.577584),- float4(0.252301, 0.266258, -0.042945, 3.0),- float4(-0.221166, -0.203988, 0.042945, 0.01033),- float4(0.0, 0.0, 0.042945, 0.045182),- float4(0.677984, -0.735077, 0.0, 0.577584),- float4(0.031135, 0.06227, -0.042945, 7.0),- float4(0.004294, 0.419785, 0.042945, 0.01033),- float4(0.0, 0.0, 0.042945, 0.045182),- float4(-0.999948, 0.01023, 0.0, 0.577584),- float4(0.035429, 0.482055, -0.042945, 11.0),- float4(0.0, 0.258742, 0.0, 0.01033),- float4(0.0, 0.258742, 0.042945, 0.045182),- float4(-1.0, 0.0, 0.0, 0.577584),- float4(0.035429, 0.740798, -0.042945, 11.0),- float4(0.164264, -0.144939, 0.0, 0.01033),- float4(0.164264, -0.144939, 0.042945, 0.045182),- float4(0.661622, 0.749838, 0.0, 0.577584),- float4(0.199693, 0.595859, -0.042945, 11.0),- float4(0.105215, 0.22546, 0.0, 0.01033),- float4(0.105215, 0.22546, 0.042945, 0.045182),- float4(-0.906183, 0.422886, 0.0, 0.577584),- float4(0.304908, 0.821319, -0.042945, 11.0),- float4(0.128834, -0.067638, 0.0, 0.01033),- float4(0.128834, -0.067638, 0.042945, 0.045182),- float4(0.464834, 0.885398, 0.0, 0.577584),- float4(0.433742, 0.753681, -0.042945, 11.0),- float4(-0.07408, -0.194325, 0.0, 0.01033),- float4(-0.07408, -0.194325, 0.042945, 0.045182),- float4(0.934406, -0.35621, 0.0, 0.577584),float4(0.359663, 0.559356, -0.042945, 11.0),float4(0.181442, -0.015031, 0.0, 0.01033),float4(0.181442, -0.015031, 0.042945, 0.045182),float4(0.082557, 0.996586, 0.0, 0.577584),- float4(0.541104, 0.544325, -0.042945, 9.0),- float4(-0.288804, -0.278068, 0.0, 0.01033),- float4(-0.288804, -0.278068, 0.042945, 0.045182),- float4(0.69359, -0.72037, 0.0, 0.577584),- float4(0.252301, 0.266258, -0.042945, 11.0),- float4(-0.221166, -0.203988, 0.0, 0.01033),- float4(-0.221166, -0.203988, 0.042945, 0.045182),- float4(0.677984, -0.735077, 0.0, 0.577584),- float4(0.031135, 0.06227, -0.042945, 9.0),- float4(0.004294, 0.419785, 0.0, 0.01033),- float4(0.004294, 0.419785, 0.042945, 0.045182),- float4(-0.999948, 0.01023, 0.0, 0.577584),- float4(-0.031366, 0.229295, 0.058405, 14.0),- float4(0.089771, -0.137361, -0.02055, 0.445197),- float4(0.035692, -0.155748, -0.008653, 0.973449),- float4(0.216369, -0.004654, 0.976301, 0.973449),- float4(0.044345, 0.043263, 0.0, 6.0),- float4(-0.040019, 0.030284, 0.049753, 0.000305),- float4(0.014061, 0.048671, 0.037855, 0.964691),- float4(0.365607, -0.634949, 0.680566, 0.973449),+ float4(0.044345, 0.043263, -0.043263, 11.0),+ float4(-0.043263, -0.005408, 0.0, 0.01033),+ float4(-0.043263, -0.005408, 0.043263, 0.045182),+ float4(0.124035, -0.992278, 0.0, 0.577584),+ float4(0.044345, 0.043263, -0.043263, 7.0),+ float4(-0.043263, -0.005408, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.124035, -0.992278, 0.0, 0.577584),+ float4(0.001082, 0.037855, -0.043263, 7.0),+ float4(-0.044345, 0.040019, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(-0.669964, -0.742393, 0.0, 0.577584),+ float4(0.044345, 0.043263, 0.0, 10.0),+ float4(-0.043263, -0.005408, 0.0, 0.000305),+ float4(-0.040019, 0.030284, 0.049753, 0.964691),+ float4(0.101434, -0.811469, 0.575525, 0.973449),float4(0.004326, 0.073548, 0.049753, 14.0),float4(-0.003245, -0.035692, -0.049753, 0.0),float4(-0.04759, 0.004326, -0.049753, 0.955978),float4(-0.580475, -0.643229, 0.499304, 0.896269),+ float4(0.001082, 0.037855, -0.043263, 11.0),+ float4(-0.044345, 0.040019, 0.0, 0.01033),+ float4(-0.044345, 0.040019, 0.043263, 0.045182),+ float4(-0.669964, -0.742393, 0.0, 0.577584),+ float4(-0.031366, 0.229295, 0.058405, 14.0),+ float4(0.035692, -0.155748, -0.008653, 0.000305),+ float4(-0.011897, -0.151422, -0.058405, 0.955978),+ float4(-0.716533, -0.20131, 0.667874, 0.904662),+ float4(-0.043263, 0.077874, -0.043263, 7.0),+ float4(-0.001082, 0.154666, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(-0.999976, -0.006993, 0.0, 0.577584),+ float4(-0.031366, 0.229295, 0.058405, 14.0),+ float4(0.089771, -0.137361, -0.02055, 0.445197),+ float4(0.035692, -0.155748, -0.008653, 0.973449),+ float4(0.216369, -0.004654, 0.976301, 0.973449),float4(-0.031366, 0.229295, 0.058405, 14.0),float4(-0.011897, -0.151422, -0.058405, 0.000305),float4(-0.012979, 0.003245, -0.058405, 0.955978),float4(-0.976245, -0.006827, 0.216564, 0.904662),+ float4(-0.043263, 0.077874, -0.043263, 9.0),+ float4(-0.001082, 0.154666, 0.0, 0.01033),+ float4(-0.001082, 0.154666, 0.043263, 0.045182),+ float4(-0.999976, -0.006993, 0.0, 0.577584),+ float4(-0.045426, 0.564586, 0.052998, 14.0),+ float4(0.014061, -0.335291, 0.005408, 0.520989),+ float4(0.001082, -0.332046, -0.052998, 0.088655),+ float4(-0.975941, -0.037462, 0.214794, 0.973449),+ float4(-0.044345, 0.23254, 0.0, 3.0),+ float4(0.0, 0.0, -0.043263, 0.01033),+ float4(-0.001082, 0.332046, -0.043263, 0.045182),+ float4(-0.999995, -0.003257, 0.0, 0.577584),+ float4(-0.163319, 0.380717, -0.043263, 7.0),+ float4(-0.060569, 0.02704, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(-0.407651, -0.913138, 0.0, 0.577584),+ float4(-0.094098, 0.431551, -0.043263, 11.0),+ float4(-0.069221, -0.050834, 0.0, 0.01033),+ float4(-0.069221, -0.050834, 0.043263, 0.045182),+ float4(0.591909, -0.806004, 0.0, 0.577584),+ float4(-0.163319, 0.380717, -0.043263, 11.0),+ float4(-0.060569, 0.02704, 0.0, 0.01033),+ float4(-0.060569, 0.02704, 0.043263, 0.045182),+ float4(-0.407651, -0.913138, 0.0, 0.577584),+ float4(0.075711, 0.08869, -0.043263, 11.0),+ float4(-0.031366, -0.045426, 0.0, 0.01033),+ float4(-0.031366, -0.045426, 0.043263, 0.045182),+ float4(0.822897, -0.568191, 0.0, 0.577584),+ float4(0.044345, 0.043263, 0.0, 6.0),+ float4(-0.040019, 0.030284, 0.049753, 0.000305),+ float4(0.014061, 0.048671, 0.037855, 0.964691),+ float4(0.365607, -0.634949, 0.680566, 0.973449),+ float4(0.075711, 0.08869, -0.043263, 7.0),+ float4(-0.031366, -0.045426, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.822897, -0.568191, 0.0, 0.577584),float4(0.058405, 0.091934, 0.037855, 14.0),float4(0.017305, -0.003245, -0.037855, 0.0),float4(-0.014061, -0.048671, -0.037855, 0.473533),@@ -1139,310 +1201,338 @@ constant float4 PRISM_TRIS[644] = {float4(0.107077, -0.140606, -0.058405, 0.0),float4(0.089771, -0.137361, -0.02055, 0.376257),float4(0.812052, 0.481346, 0.329966, 0.830777),- float4(-0.045426, 0.564586, 0.052998, 14.0),- float4(0.014061, -0.335291, 0.005408, 0.520989),- float4(0.001082, -0.332046, -0.052998, 0.088655),- float4(-0.975941, -0.037462, 0.214794, 0.973449),- float4(0.10924, 0.439122, 0.0, 14.0),- float4(-0.031366, -0.031366, 0.0, 0.132876),- float4(-0.154666, 0.125464, 0.052998, 0.028428),- float4(0.182761, -0.182761, 0.966021, 0.955978),- float4(0.128708, 0.463999, 0.063813, 14.0),- float4(-0.019468, -0.024876, -0.063813, 0.168276),- float4(-0.174135, 0.100587, -0.010816, 0.038209),- float4(-0.469238, -0.764881, 0.441331, 0.955978),- float4(0.201174, 0.638133, 0.0822, 14.0),- float4(-0.072466, -0.174135, -0.018387, 0.18117),- float4(-0.246601, -0.073548, -0.029203, 0.082277),- float4(-0.098561, -0.063844, 0.993081, 0.973449),- float4(0.128708, 0.463999, 0.063813, 14.0),- float4(0.055161, -0.146014, -0.025958, 0.246204),- float4(0.016224, -0.156829, -0.014061, 0.964691),- float4(0.305397, -0.053644, 0.950713, 0.973449),- float4(0.183869, 0.317985, 0.037855, 6.0),- float4(-0.036774, -0.045426, -0.037855, 0.0),- float4(-0.038937, -0.010816, 0.011897, 0.806958),- float4(0.374433, -0.753477, 0.540438, 0.854994),- float4(0.144932, 0.307169, 0.049753, 14.0),- float4(0.002163, -0.034611, -0.049753, 0.0),- float4(-0.033529, 0.0, -0.049753, 0.9131),- float4(-0.630237, -0.649931, 0.424725, 0.904662),- float4(0.10924, 0.439122, 0.0, 6.0),- float4(0.035692, -0.131953, 0.049753, 0.18117),- float4(0.002163, -0.131953, 0.0, 0.955978),- float4(-0.82919, -0.013593, 0.558802, 0.964691),- float4(0.183869, 0.317985, 0.037855, 14.0),- float4(0.02704, -0.004326, -0.037855, 0.0),- float4(0.005408, -0.037855, -0.037855, 0.514916),- float4(0.70062, -0.452013, 0.552101, 0.846876),- float4(0.210908, 0.445612, 0.0, 10.0),- float4(0.0, -0.131953, 0.0, 0.0),+ float4(0.077874, 0.407756, -0.043263, 11.0),+ float4(-0.002163, -0.319067, 0.0, 0.01033),+ float4(-0.002163, -0.319067, 0.043263, 0.045182),+ float4(0.999977, -0.006779, 0.0, 0.577584),+ float4(-0.031366, 0.229295, 0.058405, 14.0),+ float4(0.10924, 0.178461, -0.058405, 0.0),+ float4(0.107077, -0.140606, -0.058405, 0.376257),+ float4(0.475583, -0.003224, 0.879665, 0.830777),+ float4(0.147095, 0.272559, -0.043263, 7.0),+ float4(-0.035692, 0.034611, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(-0.696146, -0.7179, 0.0, 0.577584),+ float4(0.147095, 0.272559, -0.043263, 11.0),+ float4(-0.035692, 0.034611, 0.0, 0.01033),+ float4(-0.035692, 0.034611, 0.043263, 0.045182),+ float4(-0.696146, -0.7179, 0.0, 0.577584),+ float4(0.144932, 0.307169, 0.049753, 14.0),+ float4(0.002163, -0.034611, -0.049753, 0.0),+ float4(-0.033529, 0.0, -0.049753, 0.9131),+ float4(-0.630237, -0.649931, 0.424725, 0.904662),+ float4(0.183869, 0.317985, 0.037855, 6.0),+ float4(-0.036774, -0.045426, -0.037855, 0.0),+ float4(-0.038937, -0.010816, 0.011897, 0.806958),+ float4(0.374433, -0.753477, 0.540438, 0.854994),+ float4(0.077874, 0.407756, -0.043263, 7.0),+ float4(-0.002163, -0.319067, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.999977, -0.006779, 0.0, 0.577584),+ float4(0.111403, 0.307169, -0.043263, 7.0),+ float4(-0.002163, 0.131953, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(-0.999866, -0.016391, 0.0, 0.577584),+ float4(0.10924, 0.439122, 0.0, 6.0),+ float4(0.035692, -0.131953, 0.049753, 0.18117),+ float4(0.002163, -0.131953, 0.0, 0.955978),+ float4(-0.82919, -0.013593, 0.558802, 0.964691),+ float4(0.128708, 0.463999, 0.063813, 14.0),+ float4(0.055161, -0.146014, -0.025958, 0.246204),+ float4(0.016224, -0.156829, -0.014061, 0.964691),+ float4(0.305397, -0.053644, 0.950713, 0.973449),+ float4(0.111403, 0.307169, -0.043263, 11.0),+ float4(-0.002163, 0.131953, 0.0, 0.01033),+ float4(-0.002163, 0.131953, 0.043263, 0.045182),+ float4(-0.999866, -0.016391, 0.0, 0.577584),+ float4(0.189277, 0.28013, -0.043263, 11.0),+ float4(-0.042182, -0.007571, 0.0, 0.01033),+ float4(-0.042182, -0.007571, 0.043263, 0.045182),+ float4(0.176664, -0.984271, 0.0, 0.577584),+ float4(0.183869, 0.317985, 0.037855, 10.0),+ float4(0.005408, -0.037855, -0.037855, 0.0),+ float4(-0.036774, -0.045426, -0.037855, 0.806958),+ float4(0.124328, -0.692684, 0.710445, 0.854994),+ float4(0.189277, 0.28013, -0.043263, 7.0),+ float4(-0.042182, -0.007571, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.176664, -0.984271, 0.0, 0.577584),+ float4(0.183869, 0.317985, 0.037855, 14.0),+ float4(0.02704, -0.004326, -0.037855, 0.0),+ float4(0.005408, -0.037855, -0.037855, 0.514916),+ float4(0.70062, -0.452013, 0.552101, 0.846876),+ float4(0.210908, 0.313659, -0.043263, 11.0),+ float4(-0.021632, -0.033529, 0.0, 0.01033),+ float4(-0.021632, -0.033529, 0.043263, 0.045182),+ float4(0.840297, -0.542127, 0.0, 0.577584),+ float4(0.210908, 0.445612, 0.0, 10.0),+ float4(0.0, -0.131953, 0.0, 0.0),float4(-0.02704, -0.127627, 0.037855, 0.439658),float4(0.813734, 0.0, 0.581238, 0.871366),+ float4(0.210908, 0.313659, -0.043263, 7.0),+ float4(-0.021632, -0.033529, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.840297, -0.542127, 0.0, 0.577584),+ float4(0.210908, 0.445612, -0.043263, 11.0),+ float4(0.0, -0.131953, 0.0, 0.01033),+ float4(0.0, -0.131953, 0.043263, 0.045182),+ float4(1.0, 0.0, 0.0, 0.577584),+ float4(0.241193, 0.343943, -0.043263, 7.0),+ float4(-0.002163, 0.107077, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(-0.999796, -0.020198, 0.0, 0.577584),+ float4(0.276885, 0.311496, -0.043263, 11.0),+ float4(-0.035692, 0.032447, 0.0, 0.01033),+ float4(-0.035692, 0.032447, 0.043263, 0.045182),+ float4(-0.672673, -0.73994, 0.0, 0.577584),+ float4(0.23903, 0.45102, 0.0, 14.0),+ float4(0.042182, -0.108158, 0.046508, 0.000305),+ float4(0.002163, -0.107077, 0.0, 0.846876),+ float4(-0.758098, -0.015315, 0.651961, 0.896269),+ float4(0.276885, 0.311496, -0.043263, 7.0),+ float4(-0.035692, 0.032447, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(-0.672673, -0.73994, 0.0, 0.577584),+ float4(0.281211, 0.342862, 0.046508, 14.0),+ float4(-0.004326, -0.031366, -0.046508, 0.0),+ float4(-0.040019, 0.001082, -0.046508, 0.752941),+ float4(-0.58651, -0.645161, 0.489667, 0.846876),float4(0.246601, 0.459672, 0.06165, 14.0),float4(0.070303, -0.101669, -0.024876, 0.262257),float4(0.034611, -0.116811, -0.015142, 0.973449),float4(0.27928, -0.041605, 0.959308, 0.973449),+ float4(0.319067, 0.319067, -0.043263, 11.0),+ float4(-0.042182, -0.007571, 0.0, 0.01033),+ float4(-0.042182, -0.007571, 0.043263, 0.045182),+ float4(0.176664, -0.984271, 0.0, 0.577584),+ float4(0.319067, 0.319067, 0.0, 10.0),+ float4(-0.042182, -0.007571, 0.0, 0.0),+ float4(-0.037855, 0.023795, 0.046508, 0.896269),+ float4(0.1483, -0.826245, 0.54344, 0.896269),+ float4(0.319067, 0.319067, -0.043263, 7.0),+ float4(-0.042182, -0.007571, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.176664, -0.984271, 0.0, 0.577584),float4(0.319067, 0.319067, 0.0, 6.0),float4(-0.037855, 0.023795, 0.046508, 0.0),float4(-0.002163, 0.038937, 0.036774, 0.896269),float4(0.437906, -0.604311, 0.665618, 0.896269),- float4(0.281211, 0.342862, 0.046508, 14.0),- float4(-0.004326, -0.031366, -0.046508, 0.0),- float4(-0.040019, 0.001082, -0.046508, 0.752941),- float4(-0.58651, -0.645161, 0.489667, 0.846876),- float4(0.23903, 0.45102, 0.0, 14.0),- float4(0.042182, -0.108158, 0.046508, 0.000305),- float4(0.002163, -0.107077, 0.0, 0.846876),- float4(-0.758098, -0.015315, 0.651961, 0.896269),float4(0.316904, 0.358004, 0.036774, 14.0),float4(0.024876, -0.004326, -0.036774, 0.0),float4(0.002163, -0.038937, -0.036774, 0.617212),float4(0.707338, -0.464191, 0.533104, 0.921584),+ float4(0.34178, 0.353677, -0.043263, 11.0),+ float4(-0.022713, -0.034611, 0.0, 0.01033),+ float4(-0.022713, -0.034611, 0.043263, 0.045182),+ float4(0.836048, -0.548657, 0.0, 0.577584),float4(0.340698, 0.474815, 0.0, 14.0),float4(0.001082, -0.121137, 0.0, 0.0),float4(-0.023795, -0.116811, 0.036774, 0.473533),float4(0.828664, 0.007399, 0.559697, 0.930114),- float4(0.375309, 0.488875, 0.0, 14.0),- float4(0.078955, -0.08869, 0.032447, 0.223224),- float4(0.036774, -0.105995, 0.043263, 0.964691),- float4(0.071225, 0.39802, 0.914608, 0.973449),- float4(0.45102, 0.359085, 0.0, 6.0),- float4(-0.038937, 0.023795, 0.043263, 0.000305),- float4(0.003245, 0.0411, 0.032447, 0.879622),- float4(0.417852, -0.583049, 0.696744, 0.9131),+ float4(0.34178, 0.353677, -0.043263, 7.0),+ float4(-0.022713, -0.034611, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.836048, -0.548657, 0.0, 0.577584),+ float4(0.340698, 0.474815, -0.043263, 11.0),+ float4(0.001082, -0.121137, 0.0, 0.01033),+ float4(0.001082, -0.121137, 0.043263, 0.045182),+ float4(0.99996, 0.008928, 0.0, 0.577584),+ float4(0.411001, 0.351514, -0.043263, 11.0),+ float4(-0.034611, 0.030284, 0.0, 0.01033),+ float4(-0.034611, 0.030284, 0.043263, 0.045182),+ float4(-0.658505, -0.752577, 0.0, 0.577584),+ float4(0.411001, 0.351514, -0.043263, 7.0),+ float4(-0.034611, 0.030284, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(-0.658505, -0.752577, 0.0, 0.577584),float4(0.412083, 0.38288, 0.043263, 14.0),float4(-0.001082, -0.031366, -0.043263, 0.0),float4(-0.035692, -0.001082, -0.043263, 0.745403),float4(-0.574039, -0.656045, 0.489984, 0.854994),- float4(0.375309, 0.488875, 0.0, 14.0),- float4(0.036774, -0.105995, 0.043263, 0.000305),- float4(0.001082, -0.107077, 0.0, 0.879622),- float4(-0.771254, -0.00779, 0.63648, 0.896269),+ float4(0.45102, 0.359085, -0.043263, 11.0),+ float4(-0.040019, -0.007571, 0.0, 0.01033),+ float4(-0.040019, -0.007571, 0.043263, 0.045182),+ float4(0.185892, -0.98257, 0.0, 0.577584),+ float4(0.45102, 0.359085, 0.0, 10.0),+ float4(-0.040019, -0.007571, 0.0, 0.000305),+ float4(-0.038937, 0.023795, 0.043263, 0.879622),+ float4(0.151736, -0.802035, 0.577682, 0.9131),+ float4(0.45102, 0.359085, -0.043263, 7.0),+ float4(-0.040019, -0.007571, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.185892, -0.98257, 0.0, 0.577584),+ float4(0.45102, 0.359085, 0.0, 6.0),+ float4(-0.038937, 0.023795, 0.043263, 0.000305),+ float4(0.003245, 0.0411, 0.032447, 0.879622),+ float4(0.417852, -0.583049, 0.696744, 0.9131),+ float4(0.473733, 0.391533, -0.043263, 11.0),+ float4(-0.022713, -0.032447, 0.0, 0.01033),+ float4(-0.022713, -0.032447, 0.043263, 0.045182),+ float4(0.819232, -0.573462, 0.0, 0.577584),float4(0.454264, 0.400185, 0.032447, 14.0),float4(0.019468, -0.008653, -0.032447, 0.0),float4(-0.003245, -0.0411, -0.032447, 0.527108),float4(0.688617, -0.482032, 0.541712, 0.887922),- float4(0.473733, 0.603523, 0.0, 14.0),- float4(0.0, -0.21199, 0.0, 0.158953),- float4(-0.019468, -0.203337, 0.032447, 0.030716),- float4(0.857493, 0.0, 0.514496, 0.964691),- float4(0.179543, 0.466162, 0.058405, 10.0),- float4(-0.050834, -0.002163, 0.005408, 0.000305),- float4(0.021632, 0.171972, 0.023795, 0.022171),- float4(0.110896, -0.149888, 0.982464, 0.381323),- float4(0.326638, 0.830655, 0.0, 14.0),- float4(0.048671, -0.34178, 0.0, 0.007492),- float4(-0.125464, -0.192522, 0.0822, 0.054475),- float4(0.472493, 0.067285, 0.878762, 0.964691),- float4(0.326638, 0.830655, 0.0, 14.0),- float4(0.139524, -0.21199, 0.0, 0.0),- float4(0.048671, -0.34178, 0.0, 0.015213),- float4(0.0, 0.0, 1.0, 0.428687),- float4(-0.012979, 0.832818, 0.0, 14.0),- float4(0.339617, -0.002163, 0.0, 0.0),- float4(0.214153, -0.194685, 0.0822, 0.027314),- float4(0.002492, 0.391296, 0.920261, 0.49102),- float4(-0.012979, 0.832818, 0.0, 14.0),- float4(0.214153, -0.194685, 0.0822, 0.000305),- float4(-0.032447, -0.268232, 0.052998, 0.930114),- float4(-0.176863, 0.211325, 0.961281, 0.973449),- float4(-0.221724, 0.475896, 0.0, 14.0),- float4(0.139524, 0.055161, 0.043263, 0.520989),- float4(0.054079, -0.059487, 0.046508, 0.973449),- float4(-0.39307, 0.317373, 0.863001, 0.973449),+ float4(0.473733, 0.391533, -0.043263, 7.0),+ float4(-0.022713, -0.032447, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.819232, -0.573462, 0.0, 0.577584),+ float4(-0.223888, 0.407756, -0.043263, 7.0),+ float4(0.002163, 0.06814, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(-0.999496, 0.03173, 0.0, 0.577584),+ float4(-0.223888, 0.407756, -0.043263, 11.0),+ float4(0.002163, 0.06814, 0.0, 0.01033),+ float4(0.002163, 0.06814, 0.043263, 0.045182),+ float4(-0.999496, 0.03173, 0.0, 0.577584),float4(-0.167645, 0.416409, 0.046508, 14.0),float4(-0.056242, -0.008653, -0.046508, 0.000305),float4(-0.054079, 0.059487, -0.046508, 0.955978),float4(-0.638985, 0.020285, 0.768952, 0.973449),+ float4(-0.167645, 0.416409, 0.046508, 14.0),+ float4(0.004326, -0.035692, -0.046508, 0.000305),+ float4(-0.056242, -0.008653, -0.046508, 0.955978),+ float4(-0.339782, -0.761112, 0.552501, 0.973449),+ float4(-0.221724, 0.475896, 0.0, 14.0),+ float4(0.139524, 0.055161, 0.043263, 0.520989),+ float4(0.054079, -0.059487, 0.046508, 0.973449),+ float4(-0.39307, 0.317373, 0.863001, 0.973449),float4(-0.167645, 0.416409, 0.046508, 6.0),float4(0.073548, 0.015142, -0.046508, 0.0),float4(0.004326, -0.035692, -0.046508, 0.768154),float4(0.490917, -0.668482, 0.558688, 0.871366),- float4(-0.099506, 0.68356, 0.0, 14.0),- float4(0.017305, -0.152503, 0.043263, 0.0),- float4(-0.122219, -0.207664, 0.0, 0.723049),- float4(-0.365879, 0.215335, 0.905408, 0.854994),- float4(-0.099506, 0.68356, 0.0, 14.0),- float4(0.054079, -0.118974, 0.052998, 0.0),- float4(0.017305, -0.152503, 0.043263, 0.514916),- float4(-0.41958, 0.203352, 0.884647, 0.863157),- float4(-0.099506, 0.68356, 0.0, 14.0),- float4(0.086527, 0.149258, 0.0, 0.0),- float4(0.054079, -0.118974, 0.052998, 0.262257),- float4(-0.385563, 0.223515, 0.8952, 0.9131),- float4(-0.044345, 0.23254, 0.0, 7.0),- float4(-0.001082, 0.332046, -0.043263, 0.01033),- float4(-0.001082, 0.332046, 0.052998, 0.045182),- float4(-0.999995, -0.003257, 0.0, 0.577584),- float4(-0.045426, 0.564586, -0.043263, 7.0),- float4(-0.036774, -0.033529, 0.086527, 0.01033),- float4(0.0, 0.0, 0.096261, 0.045182),- float4(0.673754, -0.738956, 0.0, 0.577584),- float4(-0.0822, 0.531057, -0.043263, 7.0),- float4(-0.011897, -0.099506, 0.043263, 0.01033),- float4(0.0, 0.0, 0.086527, 0.045182),- float4(0.992928, -0.11872, 0.0, 0.577584),float4(-0.094098, 0.431551, -0.043263, 7.0),float4(-0.069221, -0.050834, 0.043263, 0.01033),float4(0.0, 0.0, 0.043263, 0.045182),float4(0.591909, -0.806004, 0.0, 0.577584),- float4(-0.163319, 0.380717, -0.043263, 7.0),- float4(-0.060569, 0.02704, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(-0.407651, -0.913138, 0.0, 0.577584),- float4(-0.223888, 0.407756, -0.043263, 7.0),- float4(0.002163, 0.06814, 0.043263, 0.01033),+ float4(-0.167645, 0.416409, 0.046508, 10.0),+ float4(0.085445, 0.114648, -0.003245, 0.0),+ float4(0.073548, 0.015142, -0.046508, 0.768154),+ float4(0.548356, -0.38771, 0.740936, 0.871366),+ float4(-0.0822, 0.531057, -0.043263, 11.0),+ float4(-0.011897, -0.099506, 0.0, 0.01033),+ float4(-0.011897, -0.099506, 0.043263, 0.045182),+ float4(0.992928, -0.11872, 0.0, 0.577584),+ float4(-0.044345, 0.23254, 0.0, 7.0),+ float4(-0.001082, 0.332046, -0.043263, 0.01033),+ float4(-0.001082, 0.332046, 0.052998, 0.045182),+ float4(-0.999995, -0.003257, 0.0, 0.577584),+ float4(-0.045426, 0.564586, 0.052998, 14.0),+ float4(0.1233, -0.156829, -0.052998, 0.520989),+ float4(0.014061, -0.335291, 0.005408, 0.088655),+ float4(0.429355, 0.032562, 0.902549, 0.973449),+ float4(0.10924, 0.439122, 0.0, 14.0),+ float4(-0.031366, -0.031366, 0.0, 0.132876),+ float4(-0.154666, 0.125464, 0.052998, 0.028428),+ float4(0.182761, -0.182761, 0.966021, 0.955978),+ float4(0.10924, 0.439122, -0.043263, 11.0),+ float4(-0.031366, -0.031366, 0.0, 0.01033),+ float4(-0.031366, -0.031366, 0.043263, 0.045182),+ float4(0.707107, -0.707107, 0.0, 0.577584),+ float4(0.10924, 0.439122, -0.043263, 7.0),+ float4(-0.031366, -0.031366, 0.043263, 0.01033),float4(0.0, 0.0, 0.043263, 0.045182),- float4(-0.999496, 0.03173, 0.0, 0.577584),+ float4(0.707107, -0.707107, 0.0, 0.577584),+ float4(0.10924, 0.439122, 0.0, 10.0),+ float4(0.019468, 0.024876, 0.063813, 0.18117),+ float4(0.035692, -0.131953, 0.049753, 0.955978),+ float4(-0.933936, -0.126584, 0.334276, 0.964691),+ float4(0.128708, 0.463999, 0.063813, 14.0),+ float4(0.050834, 0.002163, -0.005408, 0.0),+ float4(0.0822, -0.018387, -0.063813, 0.439658),+ float4(0.07859, -0.92643, 0.368172, 0.871366),float4(-0.221724, 0.475896, -0.043263, 7.0),float4(0.122219, 0.207664, 0.043263, 0.01033),float4(0.0, 0.0, 0.043263, 0.045182),float4(-0.861819, 0.507216, 0.0, 0.577584),+ float4(-0.221724, 0.475896, -0.043263, 9.0),+ float4(0.122219, 0.207664, 0.0, 0.01033),+ float4(0.122219, 0.207664, 0.043263, 0.045182),+ float4(-0.861819, 0.507216, 0.0, 0.577584),+ float4(-0.099506, 0.68356, 0.0, 14.0),+ float4(0.017305, -0.152503, 0.043263, 0.0),+ float4(-0.122219, -0.207664, 0.0, 0.723049),+ float4(-0.365879, 0.215335, 0.905408, 0.854994),+ float4(-0.0822, 0.531057, -0.043263, 7.0),+ float4(-0.011897, -0.099506, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.086527, 0.045182),+ float4(0.992928, -0.11872, 0.0, 0.577584),+ float4(-0.099506, 0.68356, 0.0, 14.0),+ float4(0.054079, -0.118974, 0.052998, 0.0),+ float4(0.017305, -0.152503, 0.043263, 0.514916),+ float4(-0.41958, 0.203352, 0.884647, 0.863157),float4(-0.099506, 0.68356, -0.043263, 3.0),float4(0.086527, 0.149258, 0.043263, 0.01033),float4(0.0, 0.0, 0.043263, 0.045182),float4(-0.86514, 0.501531, 0.0, 0.577584),+ float4(-0.045426, 0.564586, -0.043263, 11.0),+ float4(-0.036774, -0.033529, 0.0, 0.01033),+ float4(-0.036774, -0.033529, 0.086527, 0.045182),+ float4(0.673754, -0.738956, 0.0, 0.577584),+ float4(-0.045426, 0.564586, -0.043263, 7.0),+ float4(-0.036774, -0.033529, 0.086527, 0.01033),+ float4(0.0, 0.0, 0.096261, 0.045182),+ float4(0.673754, -0.738956, 0.0, 0.577584),+ float4(-0.099506, 0.68356, 0.0, 14.0),+ float4(0.086527, 0.149258, 0.0, 0.0),+ float4(0.054079, -0.118974, 0.052998, 0.262257),+ float4(-0.385563, 0.223515, 0.8952, 0.9131),+ float4(-0.099506, 0.68356, -0.043263, 11.0),+ float4(0.086527, 0.149258, 0.0, 0.01033),+ float4(0.086527, 0.149258, 0.043263, 0.045182),+ float4(-0.86514, 0.501531, 0.0, 0.577584),+ float4(-0.012979, 0.832818, 0.0, 14.0),+ float4(0.214153, -0.194685, 0.0822, 0.000305),+ float4(-0.032447, -0.268232, 0.052998, 0.930114),+ float4(-0.176863, 0.211325, 0.961281, 0.973449),+ float4(0.128708, 0.463999, 0.063813, 14.0),+ float4(-0.019468, -0.024876, -0.063813, 0.168276),+ float4(-0.174135, 0.100587, -0.010816, 0.038209),+ float4(-0.469238, -0.764881, 0.441331, 0.955978),+ float4(0.201174, 0.638133, 0.0822, 14.0),+ float4(-0.072466, -0.174135, -0.018387, 0.18117),+ float4(-0.246601, -0.073548, -0.029203, 0.082277),+ float4(-0.098561, -0.063844, 0.993081, 0.973449),float4(-0.012979, 0.832818, -0.043263, 7.0),float4(0.339617, -0.002163, 0.043263, 0.01033),float4(0.0, 0.0, 0.043263, 0.045182),float4(0.006369, 0.99998, 0.0, 0.577584),- float4(0.326638, 0.830655, -0.043263, 7.0),- float4(0.139524, -0.21199, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.835314, 0.549773, 0.0, 0.577584),- float4(0.466162, 0.618665, -0.043263, 3.0),- float4(0.007571, -0.015142, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.894427, 0.447214, 0.0, 0.577584),- float4(0.473733, 0.603523, -0.043263, 7.0),- float4(0.0, -0.21199, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(1.0, 0.0, 0.0, 0.577584),- float4(0.473733, 0.391533, -0.043263, 7.0),- float4(-0.022713, -0.032447, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.819232, -0.573462, 0.0, 0.577584),- float4(0.45102, 0.359085, -0.043263, 7.0),- float4(-0.040019, -0.007571, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.185892, -0.98257, 0.0, 0.577584),- float4(0.411001, 0.351514, -0.043263, 7.0),- float4(-0.034611, 0.030284, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(-0.658505, -0.752577, 0.0, 0.577584),- float4(0.376391, 0.381799, -0.043263, 7.0),- float4(-0.001082, 0.107077, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(-0.999949, -0.0101, 0.0, 0.577584),- float4(0.375309, 0.488875, -0.043263, 7.0),- float4(-0.034611, -0.014061, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.376377, -0.926467, 0.0, 0.577584),- float4(0.340698, 0.474815, -0.043263, 7.0),- float4(0.001082, -0.121137, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.99996, 0.008928, 0.0, 0.577584),- float4(0.34178, 0.353677, -0.043263, 7.0),- float4(-0.022713, -0.034611, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.836048, -0.548657, 0.0, 0.577584),- float4(0.319067, 0.319067, -0.043263, 7.0),- float4(-0.042182, -0.007571, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.176664, -0.984271, 0.0, 0.577584),- float4(0.276885, 0.311496, -0.043263, 7.0),- float4(-0.035692, 0.032447, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(-0.672673, -0.73994, 0.0, 0.577584),- float4(0.241193, 0.343943, -0.043263, 7.0),- float4(-0.002163, 0.107077, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(-0.999796, -0.020198, 0.0, 0.577584),- float4(0.23903, 0.45102, -0.043263, 7.0),- float4(-0.028121, -0.005408, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.188847, -0.982006, 0.0, 0.577584),- float4(0.210908, 0.445612, -0.043263, 7.0),- float4(0.0, -0.131953, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(1.0, 0.0, 0.0, 0.577584),- float4(0.210908, 0.313659, -0.043263, 7.0),- float4(-0.021632, -0.033529, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.840297, -0.542127, 0.0, 0.577584),- float4(0.189277, 0.28013, -0.043263, 7.0),- float4(-0.042182, -0.007571, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.176664, -0.984271, 0.0, 0.577584),- float4(0.147095, 0.272559, -0.043263, 7.0),- float4(-0.035692, 0.034611, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(-0.696146, -0.7179, 0.0, 0.577584),- float4(0.111403, 0.307169, -0.043263, 7.0),- float4(-0.002163, 0.131953, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(-0.999866, -0.016391, 0.0, 0.577584),- float4(0.10924, 0.439122, -0.043263, 7.0),- float4(-0.031366, -0.031366, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.707107, -0.707107, 0.0, 0.577584),- float4(0.077874, 0.407756, -0.043263, 7.0),- float4(-0.002163, -0.319067, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.999977, -0.006779, 0.0, 0.577584),- float4(0.075711, 0.08869, -0.043263, 7.0),- float4(-0.031366, -0.045426, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.822897, -0.568191, 0.0, 0.577584),- float4(0.044345, 0.043263, -0.043263, 7.0),- float4(-0.043263, -0.005408, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(0.124035, -0.992278, 0.0, 0.577584),- float4(0.001082, 0.037855, -0.043263, 7.0),- float4(-0.044345, 0.040019, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(-0.669964, -0.742393, 0.0, 0.577584),- float4(-0.043263, 0.077874, -0.043263, 7.0),- float4(-0.001082, 0.154666, 0.043263, 0.01033),- float4(0.0, 0.0, 0.043263, 0.045182),- float4(-0.999976, -0.006993, 0.0, 0.577584),- float4(0.044345, 0.043263, 0.0, 10.0),- float4(-0.043263, -0.005408, 0.0, 0.000305),- float4(-0.040019, 0.030284, 0.049753, 0.964691),- float4(0.101434, -0.811469, 0.575525, 0.973449),- float4(-0.031366, 0.229295, 0.058405, 14.0),- float4(0.035692, -0.155748, -0.008653, 0.000305),- float4(-0.011897, -0.151422, -0.058405, 0.955978),- float4(-0.716533, -0.20131, 0.667874, 0.904662),- float4(-0.031366, 0.229295, 0.058405, 14.0),- float4(0.10924, 0.178461, -0.058405, 0.0),- float4(0.107077, -0.140606, -0.058405, 0.376257),- float4(0.475583, -0.003224, 0.879665, 0.830777),- float4(-0.045426, 0.564586, 0.052998, 14.0),- float4(0.1233, -0.156829, -0.052998, 0.520989),- float4(0.014061, -0.335291, 0.005408, 0.088655),- float4(0.429355, 0.032562, 0.902549, 0.973449),- float4(0.183869, 0.317985, 0.037855, 10.0),- float4(0.005408, -0.037855, -0.037855, 0.0),- float4(-0.036774, -0.045426, -0.037855, 0.806958),- float4(0.124328, -0.692684, 0.710445, 0.854994),- float4(0.10924, 0.439122, 0.0, 10.0),- float4(0.019468, 0.024876, 0.063813, 0.18117),- float4(0.035692, -0.131953, 0.049753, 0.955978),- float4(-0.933936, -0.126584, 0.334276, 0.964691),+ float4(0.179543, 0.466162, 0.058405, 10.0),+ float4(-0.050834, -0.002163, 0.005408, 0.000305),+ float4(0.021632, 0.171972, 0.023795, 0.022171),+ float4(0.110896, -0.149888, 0.982464, 0.381323),+ float4(-0.012979, 0.832818, 0.0, 14.0),+ float4(0.339617, -0.002163, 0.0, 0.0),+ float4(0.214153, -0.194685, 0.0822, 0.027314),+ float4(0.002492, 0.391296, 0.920261, 0.49102),float4(0.183869, 0.317985, 0.037855, 10.0),float4(-0.055161, 0.146014, 0.025958, 0.0),float4(0.02704, 0.127627, -0.037855, 0.439658),float4(0.623841, 0.097823, 0.775405, 0.871366),- float4(0.128708, 0.463999, 0.063813, 14.0),- float4(0.050834, 0.002163, -0.005408, 0.0),- float4(0.0822, -0.018387, -0.063813, 0.439658),- float4(0.07859, -0.92643, 0.368172, 0.871366),- float4(0.319067, 0.319067, 0.0, 10.0),- float4(-0.042182, -0.007571, 0.0, 0.0),- float4(-0.037855, 0.023795, 0.046508, 0.896269),- float4(0.1483, -0.826245, 0.54344, 0.896269),+ float4(0.210908, 0.445612, -0.043263, 7.0),+ float4(0.0, -0.131953, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(1.0, 0.0, 0.0, 0.577584),+ float4(0.210908, 0.445612, 0.0, 10.0),+ float4(-0.031366, 0.02055, 0.058405, 0.000305),+ float4(0.035692, 0.014061, 0.06165, 0.022171),+ float4(-0.105864, -0.954447, 0.278971, 0.381323),+ float4(0.23903, 0.45102, -0.043263, 11.0),+ float4(-0.028121, -0.005408, 0.0, 0.01033),+ float4(-0.028121, -0.005408, 0.043263, 0.045182),+ float4(0.188847, -0.982006, 0.0, 0.577584),+ float4(0.23903, 0.45102, -0.043263, 7.0),+ float4(-0.028121, -0.005408, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.188847, -0.982006, 0.0, 0.577584),+ float4(0.246601, 0.459672, 0.06165, 11.0),+ float4(-0.007571, -0.008653, -0.06165, 0.000305),+ float4(-0.035692, -0.014061, -0.06165, 0.022171),+ float4(0.187618, -0.975617, 0.113888, 0.381323),+ float4(0.241193, 0.343943, -0.043263, 11.0),+ float4(-0.002163, 0.107077, 0.0, 0.01033),+ float4(-0.002163, 0.107077, 0.043263, 0.045182),+ float4(-0.999796, -0.020198, 0.0, 0.577584),float4(0.23903, 0.45102, 0.0, 15.0),float4(0.007571, 0.008653, 0.06165, 0.000305),float4(0.042182, -0.108158, 0.046508, 0.846876),@@ -1451,190 +1541,148 @@ constant float4 PRISM_TRIS[644] = {float4(-0.070303, 0.101669, 0.024876, 0.0),float4(0.023795, 0.116811, -0.036774, 0.473533),float4(0.523424, 0.157027, 0.837478, 0.930114),+ float4(0.340698, 0.474815, -0.043263, 7.0),+ float4(0.001082, -0.121137, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.99996, 0.008928, 0.0, 0.577584),+ float4(0.376391, 0.381799, -0.043263, 11.0),+ float4(-0.001082, 0.107077, 0.0, 0.01033),+ float4(-0.001082, 0.107077, 0.043263, 0.045182),+ float4(-0.999949, -0.0101, 0.0, 0.577584),+ float4(0.376391, 0.381799, -0.043263, 7.0),+ float4(-0.001082, 0.107077, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(-0.999949, -0.0101, 0.0, 0.577584),+ float4(0.375309, 0.488875, 0.0, 14.0),+ float4(0.036774, -0.105995, 0.043263, 0.000305),+ float4(0.001082, -0.107077, 0.0, 0.879622),+ float4(-0.771254, -0.00779, 0.63648, 0.896269),+ float4(0.375309, 0.488875, 0.0, 14.0),+ float4(0.078955, -0.08869, 0.032447, 0.223224),+ float4(0.036774, -0.105995, 0.043263, 0.964691),+ float4(0.071225, 0.39802, 0.914608, 0.973449),+ float4(0.473733, 0.603523, 0.0, 14.0),+ float4(0.0, -0.21199, 0.0, 0.158953),+ float4(-0.019468, -0.203337, 0.032447, 0.030716),+ float4(0.857493, 0.0, 0.514496, 0.964691),+ float4(0.473733, 0.603523, -0.043263, 11.0),+ float4(0.0, -0.21199, 0.0, 0.01033),+ float4(0.0, -0.21199, 0.043263, 0.045182),+ float4(1.0, 0.0, 0.0, 0.577584),+ float4(0.276885, 0.484549, 0.058405, 10.0),+ float4(-0.030284, -0.024876, 0.003245, 0.000305),+ float4(-0.097342, -0.018387, 0.0, 0.022171),+ float4(-0.03153, 0.166923, 0.985466, 0.381323),float4(0.246601, 0.459672, 0.06165, 14.0),float4(0.030284, 0.024876, -0.003245, 0.0),float4(0.094098, 0.015142, -0.06165, 0.473533),float4(0.518869, -0.545855, 0.657888, 0.930114),- float4(0.45102, 0.359085, 0.0, 10.0),- float4(-0.040019, -0.007571, 0.0, 0.000305),- float4(-0.038937, 0.023795, 0.043263, 0.879622),- float4(0.151736, -0.802035, 0.577682, 0.9131),- float4(0.454264, 0.400185, 0.032447, 12.0),- float4(-0.078955, 0.08869, -0.032447, 0.158953),- float4(0.019468, 0.203337, -0.032447, 0.030716),- float4(-0.201684, 0.173144, 0.964025, 0.964691),- float4(0.375309, 0.488875, 0.0, 10.0),- float4(0.090853, 0.12979, 0.0, 0.158953),- float4(0.098424, 0.114648, 0.0, 0.030716),- float4(0.0, 0.0, 1.0, 0.964691),+ float4(0.375309, 0.488875, -0.043263, 11.0),+ float4(-0.034611, -0.014061, 0.0, 0.01033),+ float4(-0.034611, -0.014061, 0.043263, 0.045182),+ float4(0.376377, -0.926467, 0.0, 0.577584),float4(0.340698, 0.474815, 0.0, 14.0),float4(-0.063813, 0.009734, 0.058405, 0.000305),float4(0.034611, 0.014061, 0.0, 0.022171),float4(0.3276, -0.806402, 0.492334, 0.381323),- float4(0.276885, 0.484549, 0.058405, 10.0),- float4(-0.030284, -0.024876, 0.003245, 0.000305),- float4(-0.097342, -0.018387, 0.0, 0.022171),- float4(-0.03153, 0.166923, 0.985466, 0.381323),+ float4(0.375309, 0.488875, -0.043263, 7.0),+ float4(-0.034611, -0.014061, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.376377, -0.926467, 0.0, 0.577584),+ float4(0.454264, 0.400185, 0.032447, 12.0),+ float4(-0.078955, 0.08869, -0.032447, 0.158953),+ float4(0.019468, 0.203337, -0.032447, 0.030716),+ float4(-0.201684, 0.173144, 0.964025, 0.964691),float4(0.201174, 0.638133, 0.0822, 8.0),float4(0.075711, -0.153585, -0.023795, 0.000305),float4(-0.021632, -0.171972, -0.023795, 0.022171),float4(0.026497, -0.140281, 0.989757, 0.381323),+ float4(0.473733, 0.603523, -0.043263, 7.0),+ float4(0.0, -0.21199, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(1.0, 0.0, 0.0, 0.577584),float4(0.276885, 0.484549, 0.058405, 14.0),float4(-0.075711, 0.153585, 0.023795, 0.000305),float4(0.098424, 0.004326, -0.058405, 0.022171),float4(0.50316, 0.115345, 0.856461, 0.381323),- float4(0.246601, 0.459672, 0.06165, 11.0),- float4(-0.007571, -0.008653, -0.06165, 0.000305),- float4(-0.035692, -0.014061, -0.06165, 0.022171),- float4(0.187618, -0.975617, 0.113888, 0.381323),- float4(0.210908, 0.445612, 0.0, 10.0),- float4(-0.031366, 0.02055, 0.058405, 0.000305),- float4(0.035692, 0.014061, 0.06165, 0.022171),- float4(-0.105864, -0.954447, 0.278971, 0.381323),- float4(-0.167645, 0.416409, 0.046508, 14.0),- float4(0.004326, -0.035692, -0.046508, 0.000305),- float4(-0.056242, -0.008653, -0.046508, 0.955978),- float4(-0.339782, -0.761112, 0.552501, 0.973449),- float4(-0.167645, 0.416409, 0.046508, 10.0),- float4(0.085445, 0.114648, -0.003245, 0.0),- float4(0.073548, 0.015142, -0.046508, 0.768154),- float4(0.548356, -0.38771, 0.740936, 0.871366),- float4(-0.044345, 0.23254, 0.0, 3.0),- float4(0.0, 0.0, -0.043263, 0.01033),- float4(-0.001082, 0.332046, -0.043263, 0.045182),- float4(-0.999995, -0.003257, 0.0, 0.577584),- float4(-0.045426, 0.564586, -0.043263, 11.0),- float4(-0.036774, -0.033529, 0.0, 0.01033),- float4(-0.036774, -0.033529, 0.086527, 0.045182),- float4(0.673754, -0.738956, 0.0, 0.577584),- float4(-0.0822, 0.531057, -0.043263, 11.0),- float4(-0.011897, -0.099506, 0.0, 0.01033),- float4(-0.011897, -0.099506, 0.043263, 0.045182),- float4(0.992928, -0.11872, 0.0, 0.577584),- float4(-0.094098, 0.431551, -0.043263, 11.0),- float4(-0.069221, -0.050834, 0.0, 0.01033),- float4(-0.069221, -0.050834, 0.043263, 0.045182),- float4(0.591909, -0.806004, 0.0, 0.577584),- float4(-0.163319, 0.380717, -0.043263, 11.0),- float4(-0.060569, 0.02704, 0.0, 0.01033),- float4(-0.060569, 0.02704, 0.043263, 0.045182),- float4(-0.407651, -0.913138, 0.0, 0.577584),- float4(-0.223888, 0.407756, -0.043263, 11.0),- float4(0.002163, 0.06814, 0.0, 0.01033),- float4(0.002163, 0.06814, 0.043263, 0.045182),- float4(-0.999496, 0.03173, 0.0, 0.577584),- float4(-0.221724, 0.475896, -0.043263, 9.0),- float4(0.122219, 0.207664, 0.0, 0.01033),- float4(0.122219, 0.207664, 0.043263, 0.045182),- float4(-0.861819, 0.507216, 0.0, 0.577584),- float4(-0.099506, 0.68356, -0.043263, 11.0),- float4(0.086527, 0.149258, 0.0, 0.01033),- float4(0.086527, 0.149258, 0.043263, 0.045182),- float4(-0.86514, 0.501531, 0.0, 0.577584),- float4(-0.012979, 0.832818, -0.043263, 11.0),- float4(0.339617, -0.002163, 0.0, 0.01033),- float4(0.339617, -0.002163, 0.043263, 0.045182),- float4(0.006369, 0.99998, 0.0, 0.577584),- float4(0.326638, 0.830655, -0.043263, 9.0),- float4(0.139524, -0.21199, 0.0, 0.01033),- float4(0.139524, -0.21199, 0.043263, 0.045182),- float4(0.835314, 0.549773, 0.0, 0.577584),+ float4(0.375309, 0.488875, 0.0, 10.0),+ float4(0.090853, 0.12979, 0.0, 0.158953),+ float4(0.098424, 0.114648, 0.0, 0.030716),+ float4(0.0, 0.0, 1.0, 0.964691),float4(0.466162, 0.618665, -0.043263, 11.0),float4(0.007571, -0.015142, 0.0, 0.01033),float4(0.007571, -0.015142, 0.043263, 0.045182),float4(0.894427, 0.447214, 0.0, 0.577584),- float4(0.473733, 0.603523, -0.043263, 11.0),- float4(0.0, -0.21199, 0.0, 0.01033),- float4(0.0, -0.21199, 0.043263, 0.045182),- float4(1.0, 0.0, 0.0, 0.577584),- float4(0.473733, 0.391533, -0.043263, 11.0),- float4(-0.022713, -0.032447, 0.0, 0.01033),- float4(-0.022713, -0.032447, 0.043263, 0.045182),- float4(0.819232, -0.573462, 0.0, 0.577584),- float4(0.45102, 0.359085, -0.043263, 11.0),- float4(-0.040019, -0.007571, 0.0, 0.01033),- float4(-0.040019, -0.007571, 0.043263, 0.045182),- float4(0.185892, -0.98257, 0.0, 0.577584),- float4(0.411001, 0.351514, -0.043263, 11.0),- float4(-0.034611, 0.030284, 0.0, 0.01033),- float4(-0.034611, 0.030284, 0.043263, 0.045182),- float4(-0.658505, -0.752577, 0.0, 0.577584),- float4(0.376391, 0.381799, -0.043263, 11.0),- float4(-0.001082, 0.107077, 0.0, 0.01033),- float4(-0.001082, 0.107077, 0.043263, 0.045182),- float4(-0.999949, -0.0101, 0.0, 0.577584),- float4(0.375309, 0.488875, -0.043263, 11.0),- float4(-0.034611, -0.014061, 0.0, 0.01033),- float4(-0.034611, -0.014061, 0.043263, 0.045182),- float4(0.376377, -0.926467, 0.0, 0.577584),- float4(0.340698, 0.474815, -0.043263, 11.0),- float4(0.001082, -0.121137, 0.0, 0.01033),- float4(0.001082, -0.121137, 0.043263, 0.045182),- float4(0.99996, 0.008928, 0.0, 0.577584),- float4(0.34178, 0.353677, -0.043263, 11.0),- float4(-0.022713, -0.034611, 0.0, 0.01033),- float4(-0.022713, -0.034611, 0.043263, 0.045182),- float4(0.836048, -0.548657, 0.0, 0.577584),- float4(0.319067, 0.319067, -0.043263, 11.0),- float4(-0.042182, -0.007571, 0.0, 0.01033),- float4(-0.042182, -0.007571, 0.043263, 0.045182),- float4(0.176664, -0.984271, 0.0, 0.577584),- float4(0.276885, 0.311496, -0.043263, 11.0),- float4(-0.035692, 0.032447, 0.0, 0.01033),- float4(-0.035692, 0.032447, 0.043263, 0.045182),- float4(-0.672673, -0.73994, 0.0, 0.577584),- float4(0.241193, 0.343943, -0.043263, 11.0),- float4(-0.002163, 0.107077, 0.0, 0.01033),- float4(-0.002163, 0.107077, 0.043263, 0.045182),- float4(-0.999796, -0.020198, 0.0, 0.577584),- float4(0.23903, 0.45102, -0.043263, 11.0),- float4(-0.028121, -0.005408, 0.0, 0.01033),- float4(-0.028121, -0.005408, 0.043263, 0.045182),- float4(0.188847, -0.982006, 0.0, 0.577584),- float4(0.210908, 0.445612, -0.043263, 11.0),- float4(0.0, -0.131953, 0.0, 0.01033),- float4(0.0, -0.131953, 0.043263, 0.045182),- float4(1.0, 0.0, 0.0, 0.577584),- float4(0.210908, 0.313659, -0.043263, 11.0),- float4(-0.021632, -0.033529, 0.0, 0.01033),- float4(-0.021632, -0.033529, 0.043263, 0.045182),- float4(0.840297, -0.542127, 0.0, 0.577584),- float4(0.189277, 0.28013, -0.043263, 11.0),- float4(-0.042182, -0.007571, 0.0, 0.01033),- float4(-0.042182, -0.007571, 0.043263, 0.045182),- float4(0.176664, -0.984271, 0.0, 0.577584),- float4(0.147095, 0.272559, -0.043263, 11.0),- float4(-0.035692, 0.034611, 0.0, 0.01033),- float4(-0.035692, 0.034611, 0.043263, 0.045182),- float4(-0.696146, -0.7179, 0.0, 0.577584),- float4(0.111403, 0.307169, -0.043263, 11.0),- float4(-0.002163, 0.131953, 0.0, 0.01033),- float4(-0.002163, 0.131953, 0.043263, 0.045182),- float4(-0.999866, -0.016391, 0.0, 0.577584),- float4(0.10924, 0.439122, -0.043263, 11.0),- float4(-0.031366, -0.031366, 0.0, 0.01033),- float4(-0.031366, -0.031366, 0.043263, 0.045182),- float4(0.707107, -0.707107, 0.0, 0.577584),- float4(0.077874, 0.407756, -0.043263, 11.0),- float4(-0.002163, -0.319067, 0.0, 0.01033),- float4(-0.002163, -0.319067, 0.043263, 0.045182),- float4(0.999977, -0.006779, 0.0, 0.577584),- float4(0.075711, 0.08869, -0.043263, 11.0),- float4(-0.031366, -0.045426, 0.0, 0.01033),- float4(-0.031366, -0.045426, 0.043263, 0.045182),- float4(0.822897, -0.568191, 0.0, 0.577584),- float4(0.044345, 0.043263, -0.043263, 11.0),- float4(-0.043263, -0.005408, 0.0, 0.01033),- float4(-0.043263, -0.005408, 0.043263, 0.045182),- float4(0.124035, -0.992278, 0.0, 0.577584),- float4(0.001082, 0.037855, -0.043263, 11.0),- float4(-0.044345, 0.040019, 0.0, 0.01033),- float4(-0.044345, 0.040019, 0.043263, 0.045182),- float4(-0.669964, -0.742393, 0.0, 0.577584),- float4(-0.043263, 0.077874, -0.043263, 9.0),- float4(-0.001082, 0.154666, 0.0, 0.01033),- float4(-0.001082, 0.154666, 0.043263, 0.045182),- float4(-0.999976, -0.006993, 0.0, 0.577584)+ float4(0.466162, 0.618665, -0.043263, 3.0),+ float4(0.007571, -0.015142, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.894427, 0.447214, 0.0, 0.577584),+ float4(0.326638, 0.830655, 0.0, 14.0),+ float4(0.139524, -0.21199, 0.0, 0.0),+ float4(0.048671, -0.34178, 0.0, 0.015213),+ float4(0.0, 0.0, 1.0, 0.428687),+ float4(0.326638, 0.830655, 0.0, 14.0),+ float4(0.048671, -0.34178, 0.0, 0.007492),+ float4(-0.125464, -0.192522, 0.0822, 0.054475),+ float4(0.472493, 0.067285, 0.878762, 0.964691),+ float4(0.326638, 0.830655, -0.043263, 9.0),+ float4(0.139524, -0.21199, 0.0, 0.01033),+ float4(0.139524, -0.21199, 0.043263, 0.045182),+ float4(0.835314, 0.549773, 0.0, 0.577584),+ float4(0.326638, 0.830655, -0.043263, 7.0),+ float4(0.139524, -0.21199, 0.043263, 0.01033),+ float4(0.0, 0.0, 0.043263, 0.045182),+ float4(0.835314, 0.549773, 0.0, 0.577584),+ float4(-0.012979, 0.832818, -0.043263, 11.0),+ float4(0.339617, -0.002163, 0.0, 0.01033),+ float4(0.339617, -0.002163, 0.043263, 0.045182),+ float4(0.006369, 0.99998, 0.0, 0.577584)+};+constant float4 PRISM_BOXES[44] = {+ float4(0.030135, 0.06127, -0.043945, 0.0),+ float4(0.330601, 0.483055, 0.116951, 7.0),+ float4(0.034429, 0.265258, -0.043945, 7.0),+ float4(0.542104, 0.741798, 0.116951, 8.0),+ float4(0.034429, 0.355442, -0.043945, 15.0),+ float4(0.305908, 0.822319, 0.116951, 8.0),+ float4(0.267405, 0.532589, -0.043945, 23.0),+ float4(0.542104, 0.822319, 0.082595, 8.0),+ float4(-0.045345, 0.036855, -0.044263, 31.0),+ float4(0.045345, 0.23354, 0.059405, 8.0),+ float4(-0.224888, 0.072548, -0.044263, 39.0),+ float4(0.059405, 0.565586, 0.059405, 8.0),+ float4(-0.032366, 0.042263, -0.044263, 47.0),+ float4(0.148095, 0.408756, 0.059405, 8.0),+ float4(0.074711, 0.08769, -0.044263, 55.0),+ float4(0.184869, 0.464999, 0.064813, 8.0),+ float4(0.146095, 0.271559, -0.044263, 63.0),+ float4(0.211908, 0.446612, 0.038855, 8.0),+ float4(0.23803, 0.310496, -0.044263, 71.0),+ float4(0.320067, 0.460672, 0.06265, 8.0),+ float4(0.275885, 0.310496, -0.044263, 79.0),+ float4(0.412001, 0.475815, 0.047508, 8.0),+ float4(0.375391, 0.350514, -0.044263, 87.0),+ float4(0.45202, 0.38388, 0.044263, 4.0),+ float4(0.410001, 0.350514, -0.044263, 91.0),+ float4(0.474733, 0.401185, 0.044263, 5.0),+ float4(-0.224888, 0.379717, -0.044263, 96.0),+ float4(-0.0812, 0.532057, 0.047508, 8.0),+ float4(-0.095098, 0.228295, -0.044263, 104.0),+ float4(0.211908, 0.565586, 0.064813, 8.0),+ float4(-0.222724, 0.430551, -0.044263, 112.0),+ float4(-0.011979, 0.833818, 0.053998, 8.0),+ float4(-0.100506, 0.438122, -0.044263, 120.0),+ float4(0.327638, 0.833818, 0.0832, 8.0),+ float4(0.127708, 0.312659, -0.044263, 128.0),+ float4(0.282211, 0.467162, 0.064813, 8.0),+ float4(0.245601, 0.352677, -0.044263, 136.0),+ float4(0.474733, 0.604523, 0.06265, 8.0),+ float4(0.178543, 0.390533, -0.044263, 144.0),+ float4(0.474733, 0.639133, 0.0832, 8.0),+ float4(0.200174, 0.483549, -0.044263, 152.0),+ float4(0.474733, 0.639133, 0.0832, 4.0),+ float4(-0.013979, 0.487875, -0.044263, 156.0),+ float4(0.467162, 0.833818, 0.0832, 5.0)};constant float2 PRISM_POLY[110] = {float2(0.006442, -0.002147),@@ -1821,17 +1869,35 @@ static float prism_tri(float3 ro, float3 rd, int k)static float prism_trace(float3 ro, float3 rd, int shape, thread int &hit){- int k0 = PRISM_TRI_START[shape];- int n = PRISM_TRI_COUNT[shape];+ float3 inv = 1.0 / select(float3(1e-6), rd, abs(rd) > 1e-6);+ int b0 = PRISM_BOX_START[shape];+ int nb = PRISM_BOX_COUNT[shape];float best = 1e9;hit = -1;- for (int i = 0; i < n; i++)- {- float t = prism_tri(ro, rd, k0 + i);- if (t > 1e-5 && t < best)+ for (int j = b0; j < b0 + nb; j++)+ {+ float4 lo = PRISM_BOXES[2 * j];+ float4 hi = PRISM_BOXES[2 * j + 1];+ float3 t0 = (lo.xyz - ro) * inv;+ float3 t1 = (hi.xyz - ro) * inv;+ float3 tn = min(t0, t1);+ float3 tf = max(t0, t1);+ float tmin = max(max(tn.x, tn.y), tn.z);+ float tmax = min(min(tf.x, tf.y), tf.z);+ if (tmax < max(tmin, 1e-5) || tmin > best)+ {+ continue;+ }+ int k0 = int(lo.w);+ int n = int(hi.w);+ for (int i = k0; i < k0 + n; i++){- best = t;- hit = k0 + i;+ float t = prism_tri(ro, rd, i);+ if (t > 1e-5 && t < best)+ {+ best = t;+ hit = i;+ }}}return best;diff --git a/crates/compositor/src/vk_shaders/layer.wgsl b/crates/compositor/src/vk_shaders/layer.wgslindex cb3a51083..0f4d4e452 100644--- a/crates/compositor/src/vk_shaders/layer.wgsl+++ b/crates/compositor/src/vk_shaders/layer.wgsl@@ -966,7 +966,7 @@ fn s_pixel_outline(p: vec2<f32>, shape: i32) -> f32 {// ---- Prism Glow : un cristal en MAILLAGE ---- (port du HLSL, dont les commentaires font foi)// Les facettes tracees sur son dessin, en triangles dans le repere du modele ; le serti est la-// silhouette extrudee (champ de distance), le cristal est lance de rayons triangle par triangle.+// silhouette extrudee (champ de distance), le cristal est lance de rayons boite par boite.// prism mesh: generated by design/cursors/prism-glow/model/export_compositor.pyvar<private> PRISM_TRI_START = array<i32, 2>(0, 31);var<private> PRISM_TRI_COUNT = array<i32, 2>(31, 130);@@ -974,9 +974,12 @@ var<private> PRISM_SIL_START = array<i32, 2>(0, 25);var<private> PRISM_SIL_COUNT = array<i32, 2>(25, 42);var<private> PRISM_OUT_START = array<i32, 2>(67, 76);var<private> PRISM_OUT_COUNT = array<i32, 2>(9, 34);+var<private> PRISM_BOX_START = array<i32, 2>(0, 4);+var<private> PRISM_BOX_COUNT = array<i32, 2>(4, 18);struct PrismMesh {tris: array<vec4<f32>, 644>,poly: array<vec4<f32>, 110>,+ boxes: array<vec4<f32>, 44>,}const PRISM_BEVEL: f32 = 0.012883;// end of the prism mesh@@ -1050,17 +1053,33 @@ fn prism_tri(ro: vec3<f32>, rd: vec3<f32>, k: i32) -> f32 {}// (distance, indice) du triangle du cristal `shape` le plus proche devant (ro, rd) ; (1e9, -1)-// s'il n'y en a pas.+// s'il n'y en a pas. Les triangles sont parcourus boîte par boîte (cf. HLSL).fn prism_trace(ro: vec3<f32>, rd: vec3<f32>, shape: i32) -> vec2<f32> {- let k0 = PRISM_TRI_START[shape];- let n = PRISM_TRI_COUNT[shape];+ let inv = vec3<f32>(1.0) / select(vec3<f32>(1e-6), rd, abs(rd) > vec3<f32>(1e-6));+ let b0 = PRISM_BOX_START[shape];+ let nb = PRISM_BOX_COUNT[shape];var best = 1e9;var hit = -1;- for (var i = 0; i < n; i++) {- let t = prism_tri(ro, rd, k0 + i);- if t > 1e-5 && t < best {- best = t;- hit = k0 + i;+ for (var j = b0; j < b0 + nb; j++) {+ let lo = prism.boxes[2 * j];+ let hi = prism.boxes[2 * j + 1];+ let t0 = (lo.xyz - ro) * inv;+ let t1 = (hi.xyz - ro) * inv;+ let tn = min(t0, t1);+ let tf = max(t0, t1);+ let tmin = max(max(tn.x, tn.y), tn.z);+ let tmax = min(min(tf.x, tf.y), tf.z);+ if tmax < max(tmin, 1e-5) || tmin > best {+ continue;+ }+ let k0 = i32(lo.w + 0.5);+ let n = i32(hi.w + 0.5);+ for (var i = k0; i < k0 + n; i++) {+ let t = prism_tri(ro, rd, i);+ if t > 1e-5 && t < best {+ best = t;+ hit = i;+ }}}return vec2<f32>(best, f32(hit));diff --git a/design/cursors/3d-direction.md b/design/cursors/3d-direction.mdindex e8f594bea..a18cb1ee6 100644--- a/design/cursors/3d-direction.md+++ b/design/cursors/3d-direction.md@@ -35,7 +35,8 @@ Prism Glow is built from its 2D drawing alone (`prism-glow/source.png`), not frovertices, heights and facets and writes `prism.json`; `build_blend.py` builds`prism-glow.blend` and `prism-glow.glb` from it in Blender; `export_compositor.py`writes the mesh into `crates/compositor/src/prism_mesh.rs` and the three shaders.-The compositor traces the crystal triangle by triangle: refraction per colour+The compositor ray-traces the crystal, its triangles grouped in bounding boxes that+a ray skips when it misses them: refraction per colourchannel, total internal reflection, and an exit through its flat base onto therecording under the cursor. The rim is its silhouette extruded, a distance fieldlike the other models: it gives the coverage and the shadows.diff --git a/design/cursors/prism-glow/model/export_compositor.py b/design/cursors/prism-glow/model/export_compositor.pyindex 144961acb..15cd261af 100644--- a/design/cursors/prism-glow/model/export_compositor.py+++ b/design/cursors/prism-glow/model/export_compositor.py@@ -23,6 +23,8 @@ SRC = REPO / "crates" / "compositor" / "src"SPRITE, INNER, ALPHA_MIN = 128, 112, 28 # generate-original-cursor-themes.mjsBEVEL_PX = 12.0 # rounding of the rim's edges, source pxEDGE_FOLD_DEG = 25.0+LEAF = 8 # triangles per bounding box at most+BOX_PAD = 1e-3 # model units: past prism_tri's edge slackdef glb_meshes(path):@@ -103,6 +105,31 @@ def crystal_triangles(pos, tri, col, sheet, s):return tris, float(zmin), float(model[:, 2].max()), model+def cluster(tris):+ """The triangles regrouped by neighbourhood, and one bounding box per group: a ray that+ misses a box skips all its triangles. Groups are halves of the centroids' longest extent,+ split until they hold LEAF triangles at most; the triangles come back in group order."""+ groups = []++ def split(idx):+ if len(idx) <= LEAF:+ groups.append(idx)+ return+ cent = np.array([np.mean(tris[i]["v"], axis=0) for i in idx])+ axis = int(np.argmax(cent.max(0) - cent.min(0)))+ order = [idx[j] for j in np.argsort(cent[:, axis], kind="stable")]+ split(order[: len(order) // 2])+ split(order[len(order) // 2 :])++ split(list(range(len(tris))))+ ordered, leaves = [], []+ for g in groups:+ pts = np.array([v for i in g for v in tris[i]["v"]])+ leaves.append((pts.min(0) - BOX_PAD, pts.max(0) + BOX_PAD, len(ordered), len(g)))+ ordered += [tris[i] for i in g]+ return ordered, leaves++def main():img = cv2.imread(str(HERE.parent / "source.png"), cv2.IMREAD_UNCHANGED)geo = json.loads((HERE / "prism.json").read_text())@@ -115,6 +142,7 @@ def main():hot = geo[kind]["hotspot"]s, (hx, hy), top = sprite_transform(img, x0, x1, hot)tris, zmin, zmax, model = crystal_triangles(*meshes[node], sheet, s)+ tris, leaves = cluster(tris)sil = [((x - hot[0]) * s, (y - hot[1]) * s) for x, y in geo[kind]["silhouette"]]out = [((geo[kind]["verts"][k][0] - hot[0]) * s, (geo[kind]["verts"][k][1] - hot[1]) * s)for k in geo[kind]["outline"]]@@ -122,11 +150,12 @@ def main():# the draw box: the sprite's full height (1 unit), the silhouette's widthbx0, bx1 = min(sx) - 0.01, max(sx) + 0.01shapes.append({- "kind": kind, "tris": tris, "sil": sil, "out": out, "thick": -zmin, "height": zmax,+ "kind": kind, "tris": tris, "leaves": leaves, "sil": sil, "out": out, "thick": -zmin,+ "height": zmax,"size": (bx1 - bx0, 1.0), "hotspot": (-bx0 / (bx1 - bx0), hy), "top": top,"per_px": s,})- print(f"{kind}: {len(tris)} triangles, {len(sil)} silhouette points, "+ print(f"{kind}: {len(tris)} triangles in {len(leaves)} boxes, {len(sil)} silhouette points, "f"box {bx1 - bx0:.4f} x 1, hotspot ({-bx0 / (bx1 - bx0):.4f}, {hy:.4f}), "f"height {zmax:.4f}, thick {-zmin:.4f}")write_rust(shapes)@@ -170,6 +199,17 @@ def records(shapes):return rows+def boxes(shapes):+ """Per box, two float4: (lo, first triangle), (hi, triangle count); each model's first box."""+ rows, box_start, k = [], [], 0+ for sh in shapes:+ box_start.append(len(rows) // 2)+ for lo, hi, first, count in sh["leaves"]:+ rows += [(*lo, k + first), (*hi, count)]+ k += len(sh["tris"])+ return rows, box_start++def write_rust(shapes):tri_start, rows = [], records(shapes)k = 0@@ -177,6 +217,7 @@ def write_rust(shapes):tri_start.append(k)k += len(sh["tris"])poly, sil_start, out_start = polygons(shapes)+ box_rows, box_start = boxes(shapes)lines = ["//! Les deux curseurs de Prism Glow en MAILLAGE : les facettes tracées sur l'art 2D","//! (`design/cursors/prism-glow/model`), taillées en cristal. Fichier GÉNÉRÉ par",@@ -187,7 +228,8 @@ def write_rust(shapes):"//! cristal tient en quatre float4 : (v0, drapeaux), (e1, r), (e2, g), (normale, b) ; drapeaux =","//! paroi (1) + 2 × arêtes réelles (bit k : l'arête opposée au sommet k). Le fond plat, en","//! z = -épaisseur, est laissé au shader. `POLYS` tient les silhouettes (bord extérieur du",- "//! serti) puis les contours du cristal (son bord intérieur).",+ "//! serti) puis les contours du cristal (son bord intérieur). `BOXES` range les triangles",+ "//! par voisinage : deux float4 par boîte, (coin bas, premier triangle), (coin haut, nombre).","","/// Un des deux modèles : ses triangles et sa silhouette dans les tables, sa boîte de dessin.","pub struct PrismModel {",@@ -197,6 +239,8 @@ def write_rust(shapes):" pub sil_count: usize,"," pub out_start: usize,"," pub out_count: usize,",+ " pub box_start: usize,",+ " pub box_count: usize,"," /// Largeur de la boîte, hauteur 1 (le sprite), en unités du modèle."," pub size: [f32; 2],"," /// Hotspot, fraction de la boîte.",@@ -223,6 +267,8 @@ def write_rust(shapes):f" sil_count: {len(sh['sil'])},",f" out_start: {out_start[i]},",f" out_count: {len(sh['out'])},",+ f" box_start: {box_start[i]},",+ f" box_count: {len(sh['leaves'])},",f" size: [{fl(sh['size'][0])}, {fl(sh['size'][1])}],",f" hotspot: [{fl(sh['hotspot'][0])}, {fl(sh['hotspot'][1])}],",f" top: {fl(sh['top'])},",@@ -234,6 +280,8 @@ def write_rust(shapes):lines += [f" [{', '.join(fl(v) for v in r)}]," for r in rows]lines += ["];", "", f"pub const POLYS: [[f32; 2]; {len(poly)}] = ["]lines += [f" [{fl(x)}, {fl(y)}]," for x, y in poly]+ lines += ["];", "", f"pub const BOXES: [[f32; 4]; {len(box_rows)}] = ["]+ lines += [f" [{', '.join(fl(v) for v in r)}]," for r in box_rows]lines += ["];", ""](SRC / "prism_mesh.rs").write_text("\n".join(lines), encoding="utf-8", newline="\n")@@ -241,6 +289,8 @@ def write_rust(shapes):def table_lines(shapes, lang):rows = records(shapes)poly, sil_start, out_start = polygons(shapes)+ box_rows, box_start = boxes(shapes)+ bcounts = [len(sh["leaves"]) for sh in shapes]counts = [len(sh["tris"]) for sh in shapes]scounts = [len(sh["sil"]) for sh in shapes]ocounts = [len(sh["out"]) for sh in shapes]@@ -248,6 +298,7 @@ def table_lines(shapes, lang):v4 = lambda r: f"float4({', '.join(fl(v) for v in r)})"v2 = lambda p: f"float2({fl(p[0])}, {fl(p[1])})"head4 = f"static const float4 PRISM_TRIS[{len(rows)}] = {{"+ headb = f"static const float4 PRISM_BOXES[{len(box_rows)}] = {{"head2 = f"static const float2 PRISM_POLY[{len(poly)}] = {{"tail = "};"ints = lambda name, vals: f"static const int {name}[2] = {{ {vals[0]}, {vals[1]} }};"@@ -256,6 +307,7 @@ def table_lines(shapes, lang):v4 = lambda r: f"float4({', '.join(fl(v) for v in r)})"v2 = lambda p: f"float2({fl(p[0])}, {fl(p[1])})"head4 = f"constant float4 PRISM_TRIS[{len(rows)}] = {{"+ headb = f"constant float4 PRISM_BOXES[{len(box_rows)}] = {{"head2 = f"constant float2 PRISM_POLY[{len(poly)}] = {{"tail = "};"ints = lambda name, vals: f"constant int {name}[2] = {{ {vals[0]}, {vals[1]} }};"@@ -265,17 +317,22 @@ def table_lines(shapes, lang):scalar = f"const PRISM_BEVEL: f32 = {fl(bevel(shapes))};"out = [ints("PRISM_TRI_START", [0, counts[0]]), ints("PRISM_TRI_COUNT", counts),ints("PRISM_SIL_START", sil_start), ints("PRISM_SIL_COUNT", scounts),- ints("PRISM_OUT_START", out_start), ints("PRISM_OUT_COUNT", ocounts)]+ ints("PRISM_OUT_START", out_start), ints("PRISM_OUT_COUNT", ocounts),+ ints("PRISM_BOX_START", box_start), ints("PRISM_BOX_COUNT", bcounts)]if lang == "wgsl":- # The triangles and polygons themselves go in a uniform buffer that compositor_linux.rs+ # The triangles, polygons and boxes themselves go in a uniform buffer that compositor_linux.rs# fills from prism_mesh.rs (a polygon point per vec4, the stride of a uniform array). As# a `const` or `var<private>` table, lavapipe copies them into every invocation of every# layer: a frame without any cursor rendered 3.4 times slower.return out + ["struct PrismMesh {", f" tris: array<vec4<f32>, {len(rows)}>,",- f" poly: array<vec4<f32>, {len(poly)}>,", "}", scalar]+ f" poly: array<vec4<f32>, {len(poly)}>,",+ f" boxes: array<vec4<f32>, {len(box_rows)}>,", "}", scalar]out.append(head4)out += [f" {v4(r)}," for r in rows]out[-1] = out[-1].rstrip(",")+ out += [tail, headb]+ out += [f" {v4(r)}," for r in box_rows]+ out[-1] = out[-1].rstrip(",")out += [tail, head2]out += [f" {v2(p)}," for p in poly]out[-1] = out[-1].rstrip(",")diff --git a/docs/3d-effects-v2.md b/docs/3d-effects-v2.mdindex f21bcdcfc..6308bed84 100644--- a/docs/3d-effects-v2.md+++ b/docs/3d-effects-v2.md@@ -293,7 +293,8 @@ leur dessin : un plateau et un jonc de la couleur du trait, un coussin de couleu(`s_rimmed`) ; pour Pop Coral les mêmes formes en papier découpé, des feuilles au dessus plat(`s_paper`). Prism Glow est à part : un **cristal en maillage**, ses facettes tracées sur sonseul dessin 2D (`design/cursors/prism-glow/model/`), serti dans sa silhouette extrudée, marine.-Le shader le lance de rayons triangle par triangle : réfraction par canal (une légère+Le shader le lance de rayons, triangles rangés par boîtes englobantes (un rayon saute les+boîtes qu'il rate) : réfraction par canal (une légèredispersion), réflexions totales internes, et sortie par son fond plat sur l'enregistrement sousle curseur ; chaque facette luit un peu de sa couleur du dessin, ses plis d'un liseré clair.`export_compositor.py` écrit le maillage dans `prism_mesh.rs` et dans les trois shaders. Le PNG