Merge remote-tracking branch 'origin/props' into props

# Conflicts:
#	vis/src/main.cpp
This commit is contained in:
2020-05-26 22:57:16 -04:00
12 changed files with 38 additions and 16 deletions

View File

@@ -2,9 +2,9 @@ dimension: 3
groups: groups:
- symbol: [4, 3] - symbol: [4, 3]
slices: slices:
- root: [0.85, 0.09, 0.09, 0.09, 0.01] - root: [0.90, 0.09, 0.09, 0.09, 0.01]
color: [0.9, 0.9, 0.9] color: [0.9, 0.9, 0.9]
wires: wires:
- root: [0.85, 0.09, 0.09, 0.09, 0.01] - root: [0.90, 0.09, 0.09, 0.09, 0.01]
color: [0.3, 0.3, 0.3] color: [0.3, 0.3, 0.3]
ortho: true ortho: true

View File

@@ -2,9 +2,9 @@ dimension: 3
groups: groups:
- symbol: [4, 3] - symbol: [4, 3]
slices: slices:
- root: [0.85, 0.09, 0.09, 0.09, 0.01] - root: [0.90, 0.09, 0.09, 0.09, 0.01]
color: [0.9, 0.9, 0.9] color: [0.9, 0.9, 0.9]
wires: wires:
- root: [0.85, 0.09, 0.09, 0.09, 0.01] - root: [0.90, 0.09, 0.09, 0.09, 0.01]
color: [0.3, 0.3, 0.3] color: [0.3, 0.3, 0.3]
ortho: false ortho: false

View File

@@ -2,9 +2,9 @@ dimension: 4
groups: groups:
- symbol: [4, 3, 3] - symbol: [4, 3, 3]
slices: slices:
- root: [0.80, 0.09, 0.09, 0.09, 0.01] - root: [0.90, 0.09, 0.09, 0.09, 0.01]
color: [0.9, 0.9, 0.9] color: [0.9, 0.9, 0.9]
wires: wires:
- root: [0.80, 0.09, 0.09, 0.09, 0.01] - root: [0.90, 0.09, 0.09, 0.09, 0.01]
color: [0.3, 0.3, 0.3] color: [0.3, 0.3, 0.3]
ortho: true ortho: true

View File

@@ -2,9 +2,9 @@ dimension: 4
groups: groups:
- symbol: [4, 3, 3] - symbol: [4, 3, 3]
slices: slices:
- root: [0.80, 0.09, 0.09, 0.09, 0.01] - root: [0.90, 0.09, 0.09, 0.09, 0.01]
color: [0.9, 0.9, 0.9] color: [0.9, 0.9, 0.9]
wires: wires:
- root: [0.80, 0.09, 0.09, 0.09, 0.01] - root: [0.90, 0.09, 0.09, 0.09, 0.01]
color: [0.3, 0.3, 0.3] color: [0.3, 0.3, 0.3]
ortho: false ortho: false

View File

@@ -2,11 +2,11 @@ dimension: 4
groups: groups:
- symbol: [4, 3, 3] - symbol: [4, 3, 3]
slices: slices:
- root: [0.80, 0.09, 0.09, 0.09, 0.01] - root: [0.90, 0.09, 0.09, 0.09, 0.01]
color: [0.9, 0.9, 0.9] color: [0.9, 0.9, 0.9]
exclude: exclude:
- [0, 1, 2] - [0, 1, 2]
wires: wires:
- root: [0.80, 0.09, 0.09, 0.09, 0.01] - root: [0.90, 0.09, 0.09, 0.09, 0.01]
color: [0.3, 0.3, 0.3] color: [0.3, 0.3, 0.3]
ortho: false ortho: false

View File

@@ -2,7 +2,7 @@ dimension: 4
groups: groups:
- symbol: [4, 3, 3] - symbol: [4, 3, 3]
slices: slices:
- root: [0.80, 0.09, 0.09, 0.09, 0.01] - root: [0.90, 0.09, 0.09, 0.09, 0.01]
color: [0.9, 0.9, 0.9] color: [0.9, 0.9, 0.9]
exclude: exclude:
- [0, 1, 2] - [0, 1, 2]

View File

@@ -2,7 +2,7 @@ dimension: 5
groups: groups:
- symbol: [4, 3, 3, 2] - symbol: [4, 3, 3, 2]
slices: slices:
- root: [0.80, 0.09, 0.09, 0.09, 0.09] - root: [0.90, 0.09, 0.09, 0.09, 0.09]
color: [0.9, 0.9, 0.9] color: [0.9, 0.9, 0.9]
exclude: exclude:
- [0, 1, 2] - [0, 1, 2]

View File

@@ -2,9 +2,9 @@ dimension: 4
groups: groups:
- symbol: [4, 3, 3] - symbol: [4, 3, 3]
slices: slices:
- root: [0.85, 0.09, 0.09, 0.09, 0.01] - root: [0.90, 0.09, 0.09, 0.09, 0.01]
color: [0.9, 0.9, 0.9] color: [0.9, 0.9, 0.9]
wires: wires:
- root: [0.85, 0.09, 0.09, 0.09, 0.01] - root: [0.90, 0.09, 0.09, 0.09, 0.01]
color: [0.3, 0.3, 0.3] color: [0.3, 0.3, 0.3]
ortho: false ortho: false

View File

@@ -0,0 +1,12 @@
dimension: 4
groups:
- symbol: [3, 4, 3, 2]
slices:
- root: [1.00, 0.10, 0.10, 0.10, 0.05]
color: [1.0, 1.0, 1.0]
exclude:
- [0, 1, 2]
wires:
- root: [1.00, 0.10, 0.10, 0.10, 0.05]
color: [1.0, 1.0, 1.0]
ortho: false

View File

@@ -0,0 +1,10 @@
dimension: 4
groups:
- symbol: [5, 3, 3]
slices:
- root: [0.90, 0.09, 0.09, 0.09, 0.01]
color: [0.9, 0.9, 0.9]
wires:
- root: [0.90, 0.09, 0.09, 0.09, 0.01]
color: [0.3, 0.3, 0.3]
ortho: false

View File

@@ -2,7 +2,7 @@ dimension: 5
groups: groups:
- symbol: [5, 3, 3, 2] - symbol: [5, 3, 3, 2]
slices: slices:
- root: [0.80, 0.09, 0.09, 0.09, 0.09] - root: [0.90, 0.09, 0.09, 0.09, 0.09]
color: [0.9, 0.9, 0.9] color: [0.9, 0.9, 0.9]
exclude: exclude:
- [0, 1, 2] - [0, 1, 2]

View File

@@ -2,7 +2,7 @@
layout(location=2) uniform vec3 col; layout(location=2) uniform vec3 col;
layout(location=0) in vec3 pos; layout(location=0) in vec4 pos;
layout(location=2) in vec3 normal; layout(location=2) in vec3 normal;
out vec4 color; out vec4 color;