diff --git a/blender/diyquad.blend b/blender/diyquad.blend index 5f2c00b2c..605dbedff 100644 Binary files a/blender/diyquad.blend and b/blender/diyquad.blend differ diff --git a/webots/meshes/collada_files/diyquad.dae b/webots/meshes/collada_files/diyquad.dae index 6e613af52..c40bd835a 100644 --- a/webots/meshes/collada_files/diyquad.dae +++ b/webots/meshes/collada_files/diyquad.dae @@ -5,8 +5,8 @@ Blender User Blender 4.2.1 LTS commit date:2024-08-19, commit time:11:21, hash:396f546c9d82 - 2024-09-01T03:02:37 - 2024-09-01T03:02:37 + 2024-11-23T20:30:28 + 2024-11-23T20:30:28 Z_UP @@ -68,7 +68,7 @@ - + @@ -76,11 +76,8 @@ 0 0 0 1 - 0.8 0.8 0.8 1 + 0.05461758 0.3177846 0.1024948 1 - - 1 - 1.5 @@ -88,7 +85,7 @@ - + @@ -176,7 +173,7 @@ 0 0 0 1 - 0.8 0.8 0.8 1 + 1 0 0 1 1 @@ -196,7 +193,7 @@ 0 0 0 1 - 0.8 0.8 0.8 1 + 1 0 0 1 1 @@ -216,7 +213,7 @@ 0 0 0 1 - 0.8 0.8 0.8 1 + 1 0 0 1 1 @@ -361,7 +358,7 @@ 0 0 0 1 - 0.8 0.8 0.8 1 + 1 0 0 1 1 @@ -478,12 +475,12 @@ + + + - - - @@ -546,86 +543,86 @@ - + - - -0.1640043 -0.04567909 -0.05559188 -0.1640043 -0.05340433 -0.04786664 -0.1717295 -0.04567909 -0.04786664 -0.1640043 -0.05340433 0.04786664 -0.1640043 -0.04567909 0.05559188 -0.1717295 -0.04567909 0.04786664 -0.1640043 0.04567909 -0.05559188 -0.1717295 0.04567909 -0.04786664 -0.1640043 0.05340433 -0.04786664 -0.1640043 0.04567909 0.05559188 -0.1640043 0.05340433 0.04786664 -0.1717295 0.04567909 0.04786664 0.1640043 -0.04567909 -0.05559188 0.1717295 -0.04567909 -0.04786664 0.1640043 -0.05340433 -0.04786664 0.1640043 -0.04567909 0.05559188 0.1640043 -0.05340433 0.04786664 0.1717295 -0.04567909 0.04786664 0.1640043 0.04567909 -0.05559188 0.1640043 0.05340433 -0.04786664 0.1717295 0.04567909 -0.04786664 0.1640043 0.04567909 0.05559188 0.1717295 0.04567909 0.04786664 0.1640043 0.05340433 0.04786664 + + -0.005554497 -0.01581299 -7.53455e-4 -0.005554497 -0.01581299 7.53455e-4 -0.005554497 0.01581299 -7.53455e-4 -0.005554497 0.01581299 7.53455e-4 0.005554497 -0.01581299 -7.53455e-4 0.005554497 -0.01581299 7.53455e-4 0.005554497 0.01581299 -7.53455e-4 0.005554497 0.01581299 7.53455e-4 - + - - 0 -1 0 1 0 0 0 0 1 -1 0 0 0 1 0 -0.5773503 -0.5773503 -0.5773503 -0.5773503 -0.5773503 0.5773503 -0.5773503 0.5773503 -0.5773503 -0.5773503 0.5773503 0.5773503 0.5773503 -0.5773503 -0.5773503 0.5773503 -0.5773503 0.5773503 0.5773503 0.5773503 -0.5773503 0.5773503 0.5773503 0.5773503 -0.7071068 0 -0.7071068 -0.7071068 -0.7071068 0 -0.7071068 0 0.7071068 -0.7071068 0.7071068 0 0 0.7071068 -0.7071068 0 0.7071068 0.7071068 0.7071068 0.7071068 0 0.7071068 0 -0.7071068 0.7071068 0 0.7071068 0.7071068 -0.7071068 0 0 -0.7071068 -0.7071068 0 -0.7071068 0.7071068 0 0 -1 0 -1 0 1 0 0 0 0 1 -1 0 0 0 1 0 -0.7071068 0 -0.7071068 -0.7071068 -0.7071068 0 -0.7071068 0 0.7071068 -0.7071068 0.7071068 0 0 0.7071068 -0.7071068 0 0.7071068 0.7071068 0.7071068 0.7071068 0 0.7071068 0 -0.7071068 0.7071068 0 0.7071068 0.7071068 -0.7071068 0 0 -0.7071068 -0.7071068 0 -0.7071068 0.7071068 0 0 -1 + + -1 0 0 0 1 0 1 0 0 0 -1 0 0 0 -1 0 0 1 -1 0 0 0 1 0 1 0 0 0 -1 0 0 0 -1 0 0 1 - + - - 0.6076297 0.7556231 0.3923704 0.9943769 0.3923704 0.7556231 0.6076296 0.518082 0.3923705 0.7319181 0.3923704 0.518082 0.869377 0.518082 0.6306231 0.731918 0.6306231 0.518082 0.6076296 0.01808196 0.3923705 0.231918 0.3923704 0.01808196 0.6076297 0.2556231 0.3923704 0.4943769 0.3923704 0.2556231 0.1306231 0.731918 0.1306231 0.75 0.125 0.731918 0.6076296 0.994377 0.625 0.9943769 0.6076295 1 0.1306231 0.518082 0.125 0.518082 0.1306231 0.5 0.625 0.2556231 0.6076297 0.2556231 0.6076295 0.25 0.3693768 0.731918 0.375 0.731918 0.3693768 0.75 0.625 0.7556231 0.6076297 0.7556231 0.6076295 0.75 0.3693769 0.518082 0.3693768 0.5 0.375 0.518082 0.625 0.518082 0.6076296 0.518082 0.6076296 0.5 0.1306231 0.731918 0.125 0.518082 0.1306231 0.518082 0.6076296 0 0.3923704 0.01808196 0.3923704 0 0.625 0.231918 0.6076296 0.01808196 0.625 0.01808196 0.3923704 0.2556231 0.6076296 0.231918 0.6076297 0.2556231 0.1306231 0.518082 0.3693768 0.5 0.3693769 0.518082 0.625 0.4943769 0.6076297 0.2556231 0.625 0.2556231 0.3923704 0.518082 0.6076296 0.4943769 0.6076296 0.518082 0.3693769 0.518082 0.3923705 0.7319181 0.3693768 0.731918 0.6306231 0.731918 0.6076296 0.518082 0.6306231 0.518082 0.3923704 0.7556231 0.6076296 0.7319181 0.6076297 0.7556231 0.3693768 0.731918 0.1306231 0.75 0.1306231 0.731918 0.625 0.9943769 0.6076297 0.7556231 0.625 0.7556231 0.3693769 0.518082 0.1306231 0.731918 0.1306231 0.518082 0.6076297 0.7556231 0.6076296 0.994377 0.3923704 0.9943769 0.6076296 0.518082 0.6076296 0.7319181 0.3923705 0.7319181 0.869377 0.518082 0.8693769 0.731918 0.6306231 0.731918 0.6076296 0.01808196 0.6076296 0.231918 0.3923705 0.231918 0.6076297 0.2556231 0.6076296 0.4943769 0.3923704 0.4943769 0.1306231 0.731918 0.125 0.731918 0.125 0.518082 0.6076296 0 0.6076296 0.01808196 0.3923704 0.01808196 0.625 0.231918 0.6076296 0.231918 0.6076296 0.01808196 0.3923704 0.2556231 0.3923705 0.231918 0.6076296 0.231918 0.1306231 0.518082 0.1306231 0.5 0.3693768 0.5 0.625 0.4943769 0.6076296 0.4943769 0.6076297 0.2556231 0.3923704 0.518082 0.3923704 0.4943769 0.6076296 0.4943769 0.3693769 0.518082 0.3923704 0.518082 0.3923705 0.7319181 0.6306231 0.731918 0.6076296 0.7319181 0.6076296 0.518082 0.3923704 0.7556231 0.3923705 0.7319181 0.6076296 0.7319181 0.3693768 0.731918 0.3693768 0.75 0.1306231 0.75 0.625 0.9943769 0.6076296 0.994377 0.6076297 0.7556231 0.3693769 0.518082 0.3693768 0.731918 0.1306231 0.731918 + + 0.625 0 0.375 0.25 0.375 0 0.625 0.25 0.375 0.5 0.375 0.25 0.625 0.5 0.375 0.75 0.375 0.5 0.625 0.75 0.375 1 0.375 0.75 0.375 0.5 0.125 0.75 0.125 0.5 0.875 0.5 0.625 0.75 0.625 0.5 0.625 0 0.625 0.25 0.375 0.25 0.625 0.25 0.625 0.5 0.375 0.5 0.625 0.5 0.625 0.75 0.375 0.75 0.625 0.75 0.625 1 0.375 1 0.375 0.5 0.375 0.75 0.125 0.75 0.875 0.5 0.875 0.75 0.625 0.75 - + - - + + - - - - -

16 0 0 1 0 1 14 0 2 22 1 3 13 1 4 20 1 5 9 2 6 15 2 7 21 2 8 5 3 9 7 3 10 2 3 11 10 4 12 19 4 13 8 4 14 0 5 15 1 5 16 2 5 17 3 6 18 4 6 19 5 6 20 6 7 21 7 7 22 8 7 23 9 8 24 10 8 25 11 8 26 12 9 27 13 9 28 14 9 29 15 10 30 16 10 31 17 10 32 18 11 33 19 11 34 20 11 35 21 12 36 22 12 37 23 12 38 0 13 39 7 13 40 6 13 41 3 14 42 2 14 43 1 14 44 9 15 45 5 15 46 4 15 47 8 16 48 11 16 49 10 16 50 6 17 51 19 17 52 18 17 53 21 18 54 10 18 55 9 18 56 20 19 57 23 19 58 22 19 59 18 20 60 13 20 61 12 20 62 15 21 63 22 21 64 21 21 65 14 22 66 17 22 67 16 22 68 12 23 69 1 23 70 0 23 71 4 24 72 16 24 73 15 24 74 18 25 75 0 25 76 6 25 77 16 26 78 3 26 79 1 26 80 22 27 81 17 27 82 13 27 83 9 28 84 4 28 85 15 28 86 5 29 87 11 29 88 7 29 89 10 30 90 23 30 91 19 30 92 0 31 93 2 31 94 7 31 95 3 32 96 5 32 97 2 32 98 9 33 99 11 33 100 5 33 101 8 34 102 7 34 103 11 34 104 6 35 105 8 35 106 19 35 107 21 36 108 23 36 109 10 36 110 20 37 111 19 37 112 23 37 113 18 38 114 20 38 115 13 38 116 15 39 117 17 39 118 22 39 119 14 40 120 13 40 121 17 40 122 12 41 123 14 41 124 1 41 125 4 42 126 3 42 127 16 42 128 18 43 129 12 43 130 0 43 131

+ + + + +

1 0 0 2 0 1 0 0 2 3 1 3 6 1 4 2 1 5 7 2 6 4 2 7 6 2 8 5 3 9 0 3 10 4 3 11 6 4 12 0 4 13 2 4 14 3 5 15 5 5 16 7 5 17 1 6 18 3 6 19 2 6 20 3 7 21 7 7 22 6 7 23 7 8 24 5 8 25 4 8 26 5 9 27 1 9 28 0 9 29 6 10 30 4 10 31 0 10 32 3 11 33 1 11 34 5 11 35

- + - - -0.1640043 -0.04567909 -0.05559188 -0.1640043 -0.05340433 -0.04786664 -0.1717295 -0.04567909 -0.04786664 -0.1640043 -0.05340433 0.04786664 -0.1640043 -0.04567909 0.05559188 -0.1717295 -0.04567909 0.04786664 -0.1640043 0.04567909 -0.05559188 -0.1717295 0.04567909 -0.04786664 -0.1640043 0.05340433 -0.04786664 -0.1640043 0.04567909 0.05559188 -0.1640043 0.05340433 0.04786664 -0.1717295 0.04567909 0.04786664 0.1640043 -0.04567909 -0.05559188 0.1717295 -0.04567909 -0.04786664 0.1640043 -0.05340433 -0.04786664 0.1640043 -0.04567909 0.05559188 0.1640043 -0.05340433 0.04786664 0.1717295 -0.04567909 0.04786664 0.1640043 0.04567909 -0.05559188 0.1640043 0.05340433 -0.04786664 0.1717295 0.04567909 -0.04786664 0.1640043 0.04567909 0.05559188 0.1717295 0.04567909 0.04786664 0.1640043 0.05340433 0.04786664 + + -0.1640043 -0.04567909 -0.05559188 -0.1640043 -0.05340433 -0.04786664 -0.1717295 -0.04567909 -0.04786664 -0.1640043 -0.05340433 0.04786664 -0.1640043 -0.04567909 0.05559188 -0.1717295 -0.04567909 0.04786664 -0.1640043 0.04567909 -0.05559188 -0.1717295 0.04567909 -0.04786664 -0.1640043 0.05340433 -0.04786664 -0.1640043 0.04567909 0.05559188 -0.1640043 0.05340433 0.04786664 -0.1717295 0.04567909 0.04786664 0.1640043 -0.04567909 -0.05559188 0.1717295 -0.04567909 -0.04786664 0.1640043 -0.05340433 -0.04786664 0.1640043 -0.04567909 0.05559188 0.1640043 -0.05340433 0.04786664 0.1717295 -0.04567909 0.04786664 0.1640043 0.04567909 -0.05559188 0.1640043 0.05340433 -0.04786664 0.1717295 0.04567909 -0.04786664 0.1640043 0.04567909 0.05559188 0.1717295 0.04567909 0.04786664 0.1640043 0.05340433 0.04786664 - + - - 0 -1 0 1 0 0 0 0 1 -1 0 0 0 1 0 -0.5773503 -0.5773503 -0.5773503 -0.5773503 -0.5773503 0.5773503 -0.5773503 0.5773503 -0.5773503 -0.5773503 0.5773503 0.5773503 0.5773503 -0.5773503 -0.5773503 0.5773503 -0.5773503 0.5773503 0.5773503 0.5773503 -0.5773503 0.5773503 0.5773503 0.5773503 -0.7071068 0 -0.7071068 -0.7071068 -0.7071068 0 -0.7071068 0 0.7071068 -0.7071068 0.7071068 0 0 0.7071068 -0.7071068 0 0.7071068 0.7071068 0.7071068 0.7071068 0 0.7071068 0 -0.7071068 0.7071068 0 0.7071068 0.7071068 -0.7071068 0 0 -0.7071068 -0.7071068 0 -0.7071068 0.7071068 0 0 -1 0 -1 0 1 0 0 0 0 1 -1 0 0 0 1 0 -0.7071068 0 -0.7071068 -0.7071068 -0.7071068 0 -0.7071068 0 0.7071068 -0.7071068 0.7071068 0 0 0.7071068 -0.7071068 0 0.7071068 0.7071068 0.7071068 0.7071068 0 0.7071068 0 -0.7071068 0.7071068 0 0.7071068 0.7071068 -0.7071068 0 0 -0.7071068 -0.7071068 0 -0.7071068 0.7071068 0 0 -1 + + 0 -1 0 1 0 0 0 0 1 -1 0 0 0 1 0 -0.5773503 -0.5773503 -0.5773503 -0.5773503 -0.5773503 0.5773503 -0.5773503 0.5773503 -0.5773503 -0.5773503 0.5773503 0.5773503 0.5773503 -0.5773503 -0.5773503 0.5773503 -0.5773503 0.5773503 0.5773503 0.5773503 -0.5773503 0.5773503 0.5773503 0.5773503 -0.7071068 0 -0.7071068 -0.7071068 -0.7071068 0 -0.7071068 0 0.7071068 -0.7071068 0.7071068 0 0 0.7071068 -0.7071068 0 0.7071068 0.7071068 0.7071068 0.7071068 0 0.7071068 0 -0.7071068 0.7071068 0 0.7071068 0.7071068 -0.7071068 0 0 -0.7071068 -0.7071068 0 -0.7071068 0.7071068 0 0 -1 0 -1 0 1 0 0 0 0 1 -1 0 0 0 1 0 -0.7071068 0 -0.7071068 -0.7071068 -0.7071068 0 -0.7071068 0 0.7071068 -0.7071068 0.7071068 0 0 0.7071068 -0.7071068 0 0.7071068 0.7071068 0.7071068 0.7071068 0 0.7071068 0 -0.7071068 0.7071068 0 0.7071068 0.7071068 -0.7071068 0 0 -0.7071068 -0.7071068 0 -0.7071068 0.7071068 0 0 -1 - + - - 0.6076297 0.7556231 0.3923704 0.9943769 0.3923704 0.7556231 0.6076296 0.518082 0.3923705 0.7319181 0.3923704 0.518082 0.869377 0.518082 0.6306231 0.731918 0.6306231 0.518082 0.6076296 0.01808196 0.3923705 0.231918 0.3923704 0.01808196 0.6076297 0.2556231 0.3923704 0.4943769 0.3923704 0.2556231 0.1306231 0.731918 0.1306231 0.75 0.125 0.731918 0.6076296 0.994377 0.625 0.9943769 0.6076295 1 0.1306231 0.518082 0.125 0.518082 0.1306231 0.5 0.625 0.2556231 0.6076297 0.2556231 0.6076295 0.25 0.3693768 0.731918 0.375 0.731918 0.3693768 0.75 0.625 0.7556231 0.6076297 0.7556231 0.6076295 0.75 0.3693769 0.518082 0.3693768 0.5 0.375 0.518082 0.625 0.518082 0.6076296 0.518082 0.6076296 0.5 0.1306231 0.731918 0.125 0.518082 0.1306231 0.518082 0.6076296 0 0.3923704 0.01808196 0.3923704 0 0.625 0.231918 0.6076296 0.01808196 0.625 0.01808196 0.3923704 0.2556231 0.6076296 0.231918 0.6076297 0.2556231 0.1306231 0.518082 0.3693768 0.5 0.3693769 0.518082 0.625 0.4943769 0.6076297 0.2556231 0.625 0.2556231 0.3923704 0.518082 0.6076296 0.4943769 0.6076296 0.518082 0.3693769 0.518082 0.3923705 0.7319181 0.3693768 0.731918 0.6306231 0.731918 0.6076296 0.518082 0.6306231 0.518082 0.3923704 0.7556231 0.6076296 0.7319181 0.6076297 0.7556231 0.3693768 0.731918 0.1306231 0.75 0.1306231 0.731918 0.625 0.9943769 0.6076297 0.7556231 0.625 0.7556231 0.3693769 0.518082 0.1306231 0.731918 0.1306231 0.518082 0.6076297 0.7556231 0.6076296 0.994377 0.3923704 0.9943769 0.6076296 0.518082 0.6076296 0.7319181 0.3923705 0.7319181 0.869377 0.518082 0.8693769 0.731918 0.6306231 0.731918 0.6076296 0.01808196 0.6076296 0.231918 0.3923705 0.231918 0.6076297 0.2556231 0.6076296 0.4943769 0.3923704 0.4943769 0.1306231 0.731918 0.125 0.731918 0.125 0.518082 0.6076296 0 0.6076296 0.01808196 0.3923704 0.01808196 0.625 0.231918 0.6076296 0.231918 0.6076296 0.01808196 0.3923704 0.2556231 0.3923705 0.231918 0.6076296 0.231918 0.1306231 0.518082 0.1306231 0.5 0.3693768 0.5 0.625 0.4943769 0.6076296 0.4943769 0.6076297 0.2556231 0.3923704 0.518082 0.3923704 0.4943769 0.6076296 0.4943769 0.3693769 0.518082 0.3923704 0.518082 0.3923705 0.7319181 0.6306231 0.731918 0.6076296 0.7319181 0.6076296 0.518082 0.3923704 0.7556231 0.3923705 0.7319181 0.6076296 0.7319181 0.3693768 0.731918 0.3693768 0.75 0.1306231 0.75 0.625 0.9943769 0.6076296 0.994377 0.6076297 0.7556231 0.3693769 0.518082 0.3693768 0.731918 0.1306231 0.731918 + + 0.6076297 0.7556231 0.3923704 0.9943769 0.3923704 0.7556231 0.6076296 0.518082 0.3923705 0.7319181 0.3923704 0.518082 0.869377 0.518082 0.6306231 0.731918 0.6306231 0.518082 0.6076296 0.01808196 0.3923705 0.231918 0.3923704 0.01808196 0.6076297 0.2556231 0.3923704 0.4943769 0.3923704 0.2556231 0.1306231 0.731918 0.1306231 0.75 0.125 0.731918 0.6076296 0.994377 0.625 0.9943769 0.6076295 1 0.1306231 0.518082 0.125 0.518082 0.1306231 0.5 0.625 0.2556231 0.6076297 0.2556231 0.6076295 0.25 0.3693768 0.731918 0.375 0.731918 0.3693768 0.75 0.625 0.7556231 0.6076297 0.7556231 0.6076295 0.75 0.3693769 0.518082 0.3693768 0.5 0.375 0.518082 0.625 0.518082 0.6076296 0.518082 0.6076296 0.5 0.1306231 0.731918 0.125 0.518082 0.1306231 0.518082 0.6076296 0 0.3923704 0.01808196 0.3923704 0 0.625 0.231918 0.6076296 0.01808196 0.625 0.01808196 0.3923704 0.2556231 0.6076296 0.231918 0.6076297 0.2556231 0.1306231 0.518082 0.3693768 0.5 0.3693769 0.518082 0.625 0.4943769 0.6076297 0.2556231 0.625 0.2556231 0.3923704 0.518082 0.6076296 0.4943769 0.6076296 0.518082 0.3693769 0.518082 0.3923705 0.7319181 0.3693768 0.731918 0.6306231 0.731918 0.6076296 0.518082 0.6306231 0.518082 0.3923704 0.7556231 0.6076296 0.7319181 0.6076297 0.7556231 0.3693768 0.731918 0.1306231 0.75 0.1306231 0.731918 0.625 0.9943769 0.6076297 0.7556231 0.625 0.7556231 0.3693769 0.518082 0.1306231 0.731918 0.1306231 0.518082 0.6076297 0.7556231 0.6076296 0.994377 0.3923704 0.9943769 0.6076296 0.518082 0.6076296 0.7319181 0.3923705 0.7319181 0.869377 0.518082 0.8693769 0.731918 0.6306231 0.731918 0.6076296 0.01808196 0.6076296 0.231918 0.3923705 0.231918 0.6076297 0.2556231 0.6076296 0.4943769 0.3923704 0.4943769 0.1306231 0.731918 0.125 0.731918 0.125 0.518082 0.6076296 0 0.6076296 0.01808196 0.3923704 0.01808196 0.625 0.231918 0.6076296 0.231918 0.6076296 0.01808196 0.3923704 0.2556231 0.3923705 0.231918 0.6076296 0.231918 0.1306231 0.518082 0.1306231 0.5 0.3693768 0.5 0.625 0.4943769 0.6076296 0.4943769 0.6076297 0.2556231 0.3923704 0.518082 0.3923704 0.4943769 0.6076296 0.4943769 0.3693769 0.518082 0.3923704 0.518082 0.3923705 0.7319181 0.6306231 0.731918 0.6076296 0.7319181 0.6076296 0.518082 0.3923704 0.7556231 0.3923705 0.7319181 0.6076296 0.7319181 0.3693768 0.731918 0.3693768 0.75 0.1306231 0.75 0.625 0.9943769 0.6076296 0.994377 0.6076297 0.7556231 0.3693769 0.518082 0.3693768 0.731918 0.1306231 0.731918 - + - - + + - - - - + + + +

16 0 0 1 0 1 14 0 2 22 1 3 13 1 4 20 1 5 9 2 6 15 2 7 21 2 8 5 3 9 7 3 10 2 3 11 10 4 12 19 4 13 8 4 14 0 5 15 1 5 16 2 5 17 3 6 18 4 6 19 5 6 20 6 7 21 7 7 22 8 7 23 9 8 24 10 8 25 11 8 26 12 9 27 13 9 28 14 9 29 15 10 30 16 10 31 17 10 32 18 11 33 19 11 34 20 11 35 21 12 36 22 12 37 23 12 38 0 13 39 7 13 40 6 13 41 3 14 42 2 14 43 1 14 44 9 15 45 5 15 46 4 15 47 8 16 48 11 16 49 10 16 50 6 17 51 19 17 52 18 17 53 21 18 54 10 18 55 9 18 56 20 19 57 23 19 58 22 19 59 18 20 60 13 20 61 12 20 62 15 21 63 22 21 64 21 21 65 14 22 66 17 22 67 16 22 68 12 23 69 1 23 70 0 23 71 4 24 72 16 24 73 15 24 74 18 25 75 0 25 76 6 25 77 16 26 78 3 26 79 1 26 80 22 27 81 17 27 82 13 27 83 9 28 84 4 28 85 15 28 86 5 29 87 11 29 88 7 29 89 10 30 90 23 30 91 19 30 92 0 31 93 2 31 94 7 31 95 3 32 96 5 32 97 2 32 98 9 33 99 11 33 100 5 33 101 8 34 102 7 34 103 11 34 104 6 35 105 8 35 106 19 35 107 21 36 108 23 36 109 10 36 110 20 37 111 19 37 112 23 37 113 18 38 114 20 38 115 13 38 116 15 39 117 17 39 118 22 39 119 14 40 120 13 40 121 17 40 122 12 41 123 14 41 124 1 41 125 4 42 126 3 42 127 16 42 128 18 43 129 12 43 130 0 43 131

@@ -1363,24 +1360,24 @@
- - 0.17 0 0 0.00291 0 0.02015483 0 -0.005668654 0 0 0.08938979 0.02790472 0 0 0 1 - + + 1.133343 0 0 0.003630297 0 1 0 7.76128e-5 0 0 1 0.01236772 0 0 0 1 + - + - - 0.17 0 0 0.00291 0 0.02015483 0 0.008671921 0 0 0.08938979 0.02790472 0 0 0 1 - + + 0.17 0 0 0.00291 0 0.02015483 0 -0.005668654 0 0 0.08938979 0.02790472 0 0 0 1 + - + diff --git a/webots/protos/DiyQuad.proto b/webots/protos/DiyQuad.proto index 967ceda13..64b3b8814 100644 --- a/webots/protos/DiyQuad.proto +++ b/webots/protos/DiyQuad.proto @@ -1,8 +1,10 @@ #VRML_SIM R2023b utf8 PROTO DiyQuad [ - field SFVec3f translation 0 0 0.015 - field SFRotation rotation 0 0 0 0 + field SFVec3f translation 0 0 0.015 + field SFColor rear_prop_color 0.5 0 0.5 + field SFColor front_prop_color 0.1 0.1 0.1 + field SFRotation rotation 0 0 0 0 ] { @@ -62,9 +64,9 @@ DEF ROBOT Robot { children [ - DEF FASTHELIX Shape { + Shape { appearance PBRAppearance { - baseColor 0.4 0.0 0.0 + baseColor IS rear_prop_color baseColorMap ImageTexture { url [ "../meshes/textures/fast_helix.png" @@ -89,8 +91,8 @@ DEF ROBOT Robot { Shape { appearance DEF PLASTIC PBRAppearance { - baseColor 1 0 0.1 - metalness 0 + baseColor IS rear_prop_color + metalness 0 } geometry Mesh { @@ -123,7 +125,7 @@ DEF ROBOT Robot { Shape { appearance PBRAppearance { - baseColor 0.1 0.1 0.1 + baseColor IS front_prop_color baseColorMap ImageTexture { url [ "../meshes/textures/fast_helix.png" @@ -147,7 +149,7 @@ DEF ROBOT Robot { Shape { appearance DEF PLASTIC PBRAppearance { - baseColor 0.1 0.1 0.1 + baseColor IS front_prop_color metalness 0 } @@ -180,7 +182,7 @@ DEF ROBOT Robot { Shape { appearance PBRAppearance { - baseColor 0.4 0.0 0.0 + baseColor IS rear_prop_color baseColorMap ImageTexture { url [ "../meshes/textures/fast_helix.png" @@ -203,7 +205,7 @@ DEF ROBOT Robot { Shape { appearance DEF PLASTIC PBRAppearance { - baseColor 1 0 0.1 + baseColor IS rear_prop_color metalness 0 } @@ -235,7 +237,7 @@ DEF ROBOT Robot { Shape { appearance PBRAppearance { - baseColor 0.1 0.1 0.1 + baseColor IS front_prop_color baseColorMap ImageTexture { url [ "../meshes/textures/fast_helix.png" @@ -259,7 +261,7 @@ DEF ROBOT Robot { Shape { appearance DEF PLASTIC PBRAppearance { - baseColor 0.1 0.1 0.1 + baseColor IS front_prop_color metalness 0 } diff --git a/webots/worlds/haskell.wbt b/webots/worlds/haskell.wbt index 1aca3422d..7deae3b82 100644 --- a/webots/worlds/haskell.wbt +++ b/webots/worlds/haskell.wbt @@ -18,23 +18,18 @@ WorldInfo { } ] } - Viewpoint { orientation 0 1 0 0.75 - position -1.3 -0.08 1.3 + position -1.6665689157816106 -0.08 1.6414943042676853 bloomThreshold 100 } - DEF diyquad DiyQuad { translation 0 0 0 rotation 0 0 -1 0 } - TexturedBackground { } - TexturedBackgroundLight { } - Floor { } diff --git a/webots/worlds/standard.wbt b/webots/worlds/standard.wbt index e620828f1..9c140e77c 100644 --- a/webots/worlds/standard.wbt +++ b/webots/worlds/standard.wbt @@ -19,13 +19,15 @@ WorldInfo { ] } Viewpoint { - orientation 3.5569471841302057e-16 1 3.3395925506038384e-16 0.6400000000000101 - position -1.089019602371847 -0.0006514773134054463 0.7851145507114666 + orientation -0.02958266537290491 0.9979323923866861 -0.05705967170270157 0.9533711402318593 + position -1.060743654360278 0.08074912051688324 1.4081895528007025 bloomThreshold 100 } DEF diyquad DiyQuad { - translation 0 0 0 - rotation 0 0 -1 0 + hidden linearVelocity_0 1.1840714082130835e-18 1.4153318748712773e-18 0.093713393205779 + hidden angularVelocity_0 -1.385774624347475e-32 -4.1447827396307855e-17 -2.805419841743553e-17 + translation 3.7890285062818673e-20 4.5290619995880873e-20 0.002998828582584928 + rotation -2.7688037103805507e-16 -0.8281353711188624 -0.5605281501421888 1.6015865556978885e-18 } TexturedBackground { }