Fine tuning appearance of layers view

This commit is contained in:
Bruno
2021-01-17 12:54:50 +01:00
parent 227658d2fc
commit e02071047a
5 changed files with 3052 additions and 197 deletions

View File

@@ -1473,13 +1473,13 @@ LayerView::LayerView() : View(LAYER), aspect_ratio(1.f)
// scene.bg()->attach(persp_layer_); // scene.bg()->attach(persp_layer_);
persp_left_ = new Mesh("mesh/perspective_axis_left.ply"); persp_left_ = new Mesh("mesh/perspective_axis_left.ply");
persp_left_->shader()->color = glm::vec4( COLOR_FRAME, 0.9f ); persp_left_->shader()->color = glm::vec4( COLOR_FRAME_LIGHT, 0.9f );
persp_left_->scale_.x = LAYER_PERSPECTIVE; persp_left_->scale_.x = LAYER_PERSPECTIVE;
persp_left_->translation_.z = -0.1f; persp_left_->translation_.z = -0.1f;
scene.bg()->attach(persp_left_); scene.bg()->attach(persp_left_);
persp_right_ = new Mesh("mesh/perspective_axis_right.ply"); persp_right_ = new Mesh("mesh/perspective_axis_right.ply");
persp_right_->shader()->color = glm::vec4( COLOR_FRAME, 0.9f ); persp_right_->shader()->color = glm::vec4( COLOR_FRAME_LIGHT, 0.9f );
persp_right_->scale_.x = LAYER_PERSPECTIVE; persp_right_->scale_.x = LAYER_PERSPECTIVE;
persp_right_->translation_.z = -0.1f; persp_right_->translation_.z = -0.1f;
scene.bg()->attach(persp_right_); scene.bg()->attach(persp_right_);

View File

@@ -5,7 +5,7 @@
#define APP_TITLE " -- Video Live Mixer" #define APP_TITLE " -- Video Live Mixer"
#define APP_SETTINGS "vimix.xml" #define APP_SETTINGS "vimix.xml"
#define APP_VERSION_MAJOR 0 #define APP_VERSION_MAJOR 0
#define APP_VERSION_MINOR 4 #define APP_VERSION_MINOR 5
#define XML_VERSION_MAJOR 0 #define XML_VERSION_MAJOR 0
#define XML_VERSION_MINOR 2 #define XML_VERSION_MINOR 2
#define MAX_RECENT_HISTORY 20 #define MAX_RECENT_HISTORY 20
@@ -88,6 +88,7 @@
#define COLOR_APPEARANCE_MASK 0.1f, 0.9f, 0.9f #define COLOR_APPEARANCE_MASK 0.1f, 0.9f, 0.9f
#define COLOR_APPEARANCE_MASK_DISABLE 0.3f, 0.6f, 0.6f #define COLOR_APPEARANCE_MASK_DISABLE 0.3f, 0.6f, 0.6f
#define COLOR_FRAME 0.8f, 0.f, 0.8f #define COLOR_FRAME 0.8f, 0.f, 0.8f
#define COLOR_FRAME_LIGHT 0.95f, 0.3f, 0.95f
#define COLOR_LIMBO_CIRCLE 0.16f, 0.16f, 0.16f #define COLOR_LIMBO_CIRCLE 0.16f, 0.16f, 0.16f
#define COLOR_SLIDER_CIRCLE 0.11f, 0.11f, 0.11f #define COLOR_SLIDER_CIRCLE 0.11f, 0.11f, 0.11f
#define COLOR_STASH_CIRCLE 0.06f, 0.06f, 0.06f #define COLOR_STASH_CIRCLE 0.06f, 0.06f, 0.06f

Binary file not shown.

View File

@@ -1,11 +1,11 @@
ply ply
format ascii 1.0 format ascii 1.0
comment Created by Blender 2.91.0 - www.blender.org comment Created by Blender 2.91.0 - www.blender.org
element vertex 76 element vertex 81
property float x property float x
property float y property float y
property float z property float z
element face 94 element face 101
property list uchar uint vertex_indices property list uchar uint vertex_indices
end_header end_header
-1.005000 -2.010402 0.000000 -1.005000 -2.010402 0.000000
@@ -16,25 +16,26 @@ end_header
-1.005000 -2.140421 0.000000 -1.005000 -2.140421 0.000000
-1.012701 -2.140421 0.000000 -1.012701 -2.140421 0.000000
-0.993243 -2.143901 0.000000 -0.993243 -2.143901 0.000000
-5.016935 -6.136959 0.000000 -5.016935 -6.134262 0.000000
-5.012702 -6.172815 0.000000 -5.012702 -6.172815 0.000000
-5.012702 -6.140421 0.000000 -5.012702 -6.140421 0.000000
-5.005000 -6.269996 0.000000 -5.005000 -6.269996 0.000000
-5.012702 -6.269996 0.000000 -5.012702 -6.269996 0.000000
-4.993124 -6.273297 0.000000 -4.993124 -6.271469 0.000000
-0.993107 -2.015248 0.000000 -0.993107 -2.007656 0.000000
-0.009598 -1.029598 0.000000 -0.025000 -1.026536 0.000000
-0.040402 -1.029598 0.000000 -0.040402 -1.029598 0.000000
-1.016843 -2.042907 0.000000 -1.016843 -2.042907 0.000000
-4.997299 -6.140421 0.000000 -4.997299 -6.140421 0.000000
-4.992839 -6.143410 0.000000 -4.992839 -6.146410 0.000000
-1.016888 -2.136960 0.000000 -1.016888 -2.130304 0.000000
-5.017002 -6.172815 0.000000 -5.017002 -6.172815 0.000000
-5.016947 -6.266515 0.000000 -5.016947 -6.272215 0.000000
-6.060402 -7.309995 0.000000 -6.051421 -7.308137 0.000000
-6.029597 -7.309995 0.000000 -6.029597 -7.308137 0.000000
-0.030402 -1.019598 0.000000 -0.014928 -1.028372 0.000000
-0.019598 -1.019598 0.000000 -0.023242 -1.023197 0.000000
-0.014320 -1.024299 0.000000
-5.005000 -6.205208 0.000000 -5.005000 -6.205208 0.000000
-5.005000 -6.237602 0.000000 -5.005000 -6.237602 0.000000
-4.997299 -6.237602 0.000000 -4.997299 -6.237602 0.000000
@@ -64,6 +65,10 @@ end_header
-0.993157 -2.075412 0.000000 -0.993157 -2.075412 0.000000
-0.993157 -2.042907 0.000000 -0.993157 -2.042907 0.000000
-0.997299 -2.140421 0.000000 -0.997299 -2.140421 0.000000
-0.024245 -1.019051 0.000000
-0.029970 -1.019912 0.000000
-0.017730 -1.020603 0.000000
-0.033926 -1.023085 0.000000
-4.771169 -7.309363 0.000000 -4.771169 -7.309363 0.000000
-6.041811 -7.295620 0.000000 -6.041811 -7.295620 0.000000
-6.041811 -7.309363 0.000000 -6.041811 -7.309363 0.000000
@@ -72,14 +77,14 @@ end_header
-5.004570 -6.259233 0.000000 -5.004570 -6.259233 0.000000
-5.004570 -6.272977 0.000000 -5.004570 -6.272977 0.000000
-3.725413 -6.259233 0.000000 -3.725413 -6.259233 0.000000
-3.722498 -6.150967 0.000000 -3.722498 -6.151754 0.000000
-5.003956 -6.137224 0.000000 -5.003956 -6.129984 0.000000
-5.003956 -6.150967 0.000000 -5.003956 -6.151754 0.000000
-3.722498 -6.137224 0.000000 -3.722498 -6.129984 0.000000
0.262578 -2.143717 0.000000 0.262578 -2.147450 0.000000
-1.004861 -2.129973 0.000000 -1.004861 -2.126240 0.000000
-1.004861 -2.143717 0.000000 -1.004861 -2.147450 0.000000
0.262578 -2.129973 0.000000 0.262578 -2.126240 0.000000
0.268543 -2.021173 0.000000 0.268543 -2.021173 0.000000
-1.004861 -2.007429 0.000000 -1.004861 -2.007429 0.000000
-1.004861 -2.021173 0.000000 -1.004861 -2.021173 0.000000
@@ -94,87 +99,94 @@ end_header
3 18 19 20 3 18 19 20
3 8 21 9 3 8 21 9
3 22 23 24 3 22 23 24
3 15 25 16 3 25 26 15
3 15 26 25 3 25 27 26
3 27 28 29 3 28 29 30
3 27 30 28 3 28 31 29
3 31 32 33 3 32 33 34
3 34 35 18 3 35 36 18
3 34 36 35 3 35 37 36
3 27 29 37 3 28 30 38
3 37 38 39 3 38 39 40
3 37 29 38 3 38 30 39
3 29 13 38 3 30 13 39
3 35 37 39 3 36 38 40
3 35 36 37 3 36 37 38
3 36 27 37 3 37 28 38
3 18 40 19 3 18 41 19
3 18 35 40 3 18 36 41
3 35 39 40 3 36 40 41
3 33 12 11 3 34 12 11
3 33 32 12 3 34 33 12
3 32 22 12 3 33 22 12
3 28 33 11 3 29 34 11
3 28 30 33 3 29 31 34
3 30 31 33 3 31 32 34
3 29 41 13 3 30 42 13
3 29 28 41 3 30 29 42
3 28 11 41 3 29 11 42
3 9 30 27 3 9 31 28
3 9 21 30 3 9 21 31
3 21 31 30 3 21 32 31
3 10 36 34 3 10 37 35
3 10 9 36 3 10 9 37
3 9 27 36 3 9 28 37
3 42 43 44 3 43 44 45
3 42 45 43 3 43 46 44
3 46 47 48 3 47 48 49
3 0 49 1 3 0 50 1
3 0 50 49 3 0 51 50
3 42 44 51 3 43 45 52
3 51 52 53 3 52 53 54
3 51 44 52 3 52 45 53
3 44 7 52 3 45 7 53
3 49 51 53 3 50 52 54
3 49 50 51 3 50 51 52
3 50 42 51 3 51 43 52
3 1 54 14 3 1 55 14
3 1 49 54 3 1 50 55
3 49 53 54 3 50 54 55
3 48 6 5 3 49 6 5
3 48 47 6 3 49 48 6
3 47 20 6 3 48 20 6
3 43 48 5 3 44 49 5
3 43 45 48 3 44 46 49
3 45 46 48 3 46 47 49
3 44 55 7 3 45 56 7
3 44 43 55 3 45 44 56
3 43 5 55 3 44 5 56
3 3 45 42 3 3 46 43
3 3 17 45 3 3 17 46
3 17 46 45 3 17 47 46
3 4 50 0 3 4 51 0
3 4 3 50 3 4 3 51
3 3 42 50 3 3 43 51
3 1 14 16 3 1 14 16
3 16 2 1 3 16 2 1
3 2 4 0 3 2 4 0
3 6 20 19 3 6 20 19
3 19 7 6 3 19 7 6
3 7 55 5 3 7 56 5
3 12 22 24 3 12 22 24
3 24 13 12 3 24 13 12
3 13 41 11 3 13 42 11
3 20 8 18 3 20 8 18
3 8 10 34 3 8 10 35
3 34 18 8 3 35 18 8
3 56 57 58 3 26 57 58
3 56 59 57 3 26 27 57
3 60 61 62 3 27 59 57
3 60 63 61 3 15 60 16
3 64 65 66 3 15 26 60
3 64 67 65 3 26 58 60
3 68 69 70 3 14 25 15
3 68 71 69 3 61 62 63
3 72 73 74 3 61 64 62
3 72 75 73 3 65 66 67
3 65 68 66
3 69 70 71
3 69 72 70
3 73 74 75
3 73 76 74
3 77 78 79
3 77 80 78

File diff suppressed because it is too large Load Diff