--wip-- [skip ci]
This commit is contained in:
+1
-1
@@ -5,7 +5,7 @@ layout(push_constant) uniform PushConstantData {
|
||||
mat4 world;
|
||||
vec3 dimensions;
|
||||
vec3 lowest_corner;
|
||||
uint enable[16*16*2];
|
||||
uint enable[16*16/2];
|
||||
} pc;
|
||||
|
||||
layout(set = 0, binding = 0) uniform Lights {
|
||||
|
||||
+18
-34
@@ -319,62 +319,46 @@ fn interval_check(csg: &CSG, push_constants: &mut PushConstantData) {
|
||||
push_constants.dimensions = (highest_corner - lowest_corner).to_array().into();
|
||||
push_constants.lowest_corner = lowest_corner.into();
|
||||
|
||||
push_constants.enable = [0; 16 * 16 * 2];
|
||||
push_constants.enable = [0; 16 * 16 / 2];
|
||||
|
||||
for x in 0..16 {
|
||||
for y in 0..16 {
|
||||
for z in 0..2 {
|
||||
let interval_input_z: Interval = Interval::new_unchecked(
|
||||
interpreter::Value::from_array([
|
||||
(((z as f32) / 2.0)
|
||||
+ (0.0 / 16.0)) * push_constants.dimensions[2]
|
||||
(((z as f32) / 2.0) + (0.0 / 16.0)) * push_constants.dimensions[2]
|
||||
+ push_constants.lowest_corner[2],
|
||||
(((z as f32) / 2.0)
|
||||
+ (1.0 / 16.0)) * push_constants.dimensions[2]
|
||||
(((z as f32) / 2.0) + (1.0 / 16.0)) * push_constants.dimensions[2]
|
||||
+ push_constants.lowest_corner[2],
|
||||
(((z as f32) / 2.0)
|
||||
+ (2.0 / 16.0)) * push_constants.dimensions[2]
|
||||
(((z as f32) / 2.0) + (2.0 / 16.0)) * push_constants.dimensions[2]
|
||||
+ push_constants.lowest_corner[2],
|
||||
(((z as f32) / 2.0)
|
||||
+ (3.0 / 16.0)) * push_constants.dimensions[2]
|
||||
(((z as f32) / 2.0) + (3.0 / 16.0)) * push_constants.dimensions[2]
|
||||
+ push_constants.lowest_corner[2],
|
||||
(((z as f32) / 2.0)
|
||||
+ (4.0 / 16.0)) * push_constants.dimensions[2]
|
||||
(((z as f32) / 2.0) + (4.0 / 16.0)) * push_constants.dimensions[2]
|
||||
+ push_constants.lowest_corner[2],
|
||||
(((z as f32) / 2.0)
|
||||
+ (5.0 / 16.0)) * push_constants.dimensions[2]
|
||||
(((z as f32) / 2.0) + (5.0 / 16.0)) * push_constants.dimensions[2]
|
||||
+ push_constants.lowest_corner[2],
|
||||
(((z as f32) / 2.0)
|
||||
+ (6.0 / 16.0)) * push_constants.dimensions[2]
|
||||
(((z as f32) / 2.0) + (6.0 / 16.0)) * push_constants.dimensions[2]
|
||||
+ push_constants.lowest_corner[2],
|
||||
(((z as f32) / 2.0)
|
||||
+ (7.0 / 16.0)) * push_constants.dimensions[2]
|
||||
(((z as f32) / 2.0) + (7.0 / 16.0)) * push_constants.dimensions[2]
|
||||
+ push_constants.lowest_corner[2],
|
||||
]),
|
||||
interpreter::Value::from_array([
|
||||
((((z as f32) / 2.0)
|
||||
+ (1.0 / 16.0)) * push_constants.dimensions[2]
|
||||
(((z as f32) / 2.0) + (1.0 / 16.0)) * push_constants.dimensions[2]
|
||||
+ push_constants.lowest_corner[2],
|
||||
(((z as f32) / 2.0)
|
||||
+ (2.0 / 16.0)) * push_constants.dimensions[2]
|
||||
(((z as f32) / 2.0) + (2.0 / 16.0)) * push_constants.dimensions[2]
|
||||
+ push_constants.lowest_corner[2],
|
||||
(((z as f32) / 2.0)
|
||||
+ (3.0 / 16.0)) * push_constants.dimensions[2]
|
||||
(((z as f32) / 2.0) + (3.0 / 16.0)) * push_constants.dimensions[2]
|
||||
+ push_constants.lowest_corner[2],
|
||||
(((z as f32) / 2.0)
|
||||
+ (4.0 / 16.0)) * push_constants.dimensions[2]
|
||||
(((z as f32) / 2.0) + (4.0 / 16.0)) * push_constants.dimensions[2]
|
||||
+ push_constants.lowest_corner[2],
|
||||
(((z as f32) / 2.0)
|
||||
+ (5.0 / 16.0)) * push_constants.dimensions[2]
|
||||
(((z as f32) / 2.0) + (5.0 / 16.0)) * push_constants.dimensions[2]
|
||||
+ push_constants.lowest_corner[2],
|
||||
(((z as f32) / 2.0)
|
||||
+ (6.0 / 16.0)) * push_constants.dimensions[2]
|
||||
(((z as f32) / 2.0) + (6.0 / 16.0)) * push_constants.dimensions[2]
|
||||
+ push_constants.lowest_corner[2],
|
||||
(((z as f32) / 2.0)
|
||||
+ (7.0 / 16.0)) * push_constants.dimensions[2]
|
||||
(((z as f32) / 2.0) + (7.0 / 16.0)) * push_constants.dimensions[2]
|
||||
+ push_constants.lowest_corner[2],
|
||||
(((z as f32) / 2.0)
|
||||
+ (8.0 / 16.0)) * push_constants.dimensions[2]
|
||||
(((z as f32) / 2.0) + (8.0 / 16.0)) * push_constants.dimensions[2]
|
||||
+ push_constants.lowest_corner[2],
|
||||
]),
|
||||
);
|
||||
@@ -1143,7 +1127,7 @@ impl App {
|
||||
world: Mat4::IDENTITY.to_cols_array_2d(),
|
||||
dimensions: Vec3::ONE.to_array().into(),
|
||||
lowest_corner: Vec3::ZERO.into(),
|
||||
enable: [0; 16],
|
||||
enable: [0; 16 * 16 / 2],
|
||||
};
|
||||
|
||||
let uniform_data = implicit_vs::Camera {
|
||||
|
||||
Reference in New Issue
Block a user