From bb957e119a371732fc2dd691da5e9d49b9aabeb8 Mon Sep 17 00:00:00 2001 From: kazu Date: Tue, 3 Apr 2018 13:46:51 +0200 Subject: [PATCH 1/2] added obj resources --- res/mdl/chair.obj | 119 ++++++++++++++++ res/mdl/expedit1.obj | 153 ++++++++++++++++++++ res/mdl/expedit2.obj | 313 +++++++++++++++++++++++++++++++++++++++++ res/mdl/flipchart.obj | 86 +++++++++++ res/mdl/flower1.obj | 83 +++++++++++ res/mdl/table.obj | 107 ++++++++++++++ res/mdl/whiteboard.obj | 23 +++ 7 files changed, 884 insertions(+) create mode 100644 res/mdl/chair.obj create mode 100644 res/mdl/expedit1.obj create mode 100644 res/mdl/expedit2.obj create mode 100644 res/mdl/flipchart.obj create mode 100644 res/mdl/flower1.obj create mode 100644 res/mdl/table.obj create mode 100644 res/mdl/whiteboard.obj diff --git a/res/mdl/chair.obj b/res/mdl/chair.obj new file mode 100644 index 0000000..3c5a662 --- /dev/null +++ b/res/mdl/chair.obj @@ -0,0 +1,119 @@ +# Blender v2.79 (sub 0) OBJ File: 'stuff3.blend' +# www.blender.org +v 0.200000 -0.200000 0.440000 +v -0.200000 -0.200000 0.900000 +v -0.200000 -0.200000 0.440000 +v 0.200000 -0.200000 0.900000 +v 0.200000 0.200000 0.440000 +v 0.200000 0.200000 0.480000 +v -0.200000 0.200000 0.440000 +v -0.200000 0.200000 0.480000 +v -0.200000 -0.160000 0.480000 +v 0.200000 -0.160000 0.480000 +v -0.200000 -0.180000 0.900000 +v 0.200000 -0.180000 0.900000 +s off +f 2 12 11 +f 9 7 3 +f 8 5 7 +f 5 10 1 +f 7 1 3 +f 10 4 1 +f 9 6 8 +f 9 12 10 +f 1 2 3 +f 9 2 11 +f 2 4 12 +f 9 8 7 +f 8 6 5 +f 5 6 10 +f 7 5 1 +f 10 12 4 +f 9 10 6 +f 9 11 12 +f 1 4 2 +f 9 3 2 +v -0.120000 0.120000 0.000000 +v -0.120000 0.120000 0.440000 +v -0.200000 0.120000 0.000000 +v -0.200000 0.120000 0.440000 +v -0.120000 0.200000 0.000000 +v -0.120000 0.200000 0.440000 +v -0.200000 0.200000 0.000000 +v -0.200000 0.200000 0.440000 +s off +f 14 15 13 +f 16 19 15 +f 20 17 19 +f 18 13 17 +f 19 13 15 +f 16 18 20 +f 14 16 15 +f 16 20 19 +f 20 18 17 +f 18 14 13 +f 19 17 13 +f 16 14 18 +v -0.120000 -0.200000 0.000000 +v -0.120000 -0.200000 0.440000 +v -0.200000 -0.200000 0.000000 +v -0.200000 -0.200000 0.440000 +v -0.120000 -0.120000 0.000000 +v -0.120000 -0.120000 0.440000 +v -0.200000 -0.120000 0.000000 +v -0.200000 -0.120000 0.440000 +s off +f 22 23 21 +f 24 27 23 +f 28 25 27 +f 26 21 25 +f 27 21 23 +f 24 26 28 +f 22 24 23 +f 24 28 27 +f 28 26 25 +f 26 22 21 +f 27 25 21 +f 24 22 26 +v 0.200000 -0.200000 0.000000 +v 0.200000 -0.200000 0.440000 +v 0.120000 -0.200000 0.000000 +v 0.120000 -0.200000 0.440000 +v 0.200000 -0.120000 0.000000 +v 0.200000 -0.120000 0.440000 +v 0.120000 -0.120000 0.000000 +v 0.120000 -0.120000 0.440000 +s off +f 30 31 29 +f 32 35 31 +f 36 33 35 +f 34 29 33 +f 35 29 31 +f 32 34 36 +f 30 32 31 +f 32 36 35 +f 36 34 33 +f 34 30 29 +f 35 33 29 +f 32 30 34 +v 0.200000 0.120000 0.000000 +v 0.200000 0.120000 0.440000 +v 0.120000 0.120000 0.000000 +v 0.120000 0.120000 0.440000 +v 0.200000 0.200000 0.000000 +v 0.200000 0.200000 0.440000 +v 0.120000 0.200000 0.000000 +v 0.120000 0.200000 0.440000 +s off +f 38 39 37 +f 40 43 39 +f 44 41 43 +f 42 37 41 +f 43 37 39 +f 40 42 44 +f 38 40 39 +f 40 44 43 +f 44 42 41 +f 42 38 37 +f 43 41 37 +f 40 38 42 diff --git a/res/mdl/expedit1.obj b/res/mdl/expedit1.obj new file mode 100644 index 0000000..71794f8 --- /dev/null +++ b/res/mdl/expedit1.obj @@ -0,0 +1,153 @@ +# Blender v2.79 (sub 0) OBJ File: 'expedit1.blend' +# www.blender.org +v 0.200000 -0.400000 0.000000 +v 0.200000 -0.400000 0.800000 +v -0.200000 -0.400000 0.000000 +v -0.200000 -0.400000 0.800000 +v 0.200000 0.400000 0.000000 +v 0.200000 0.400000 0.800000 +v -0.200000 0.400000 0.000000 +v -0.200000 0.400000 0.800000 +v -0.200000 -0.350000 0.750000 +v 0.200000 -0.350000 0.750000 +v -0.200000 -0.350000 0.410000 +v 0.200000 -0.350000 0.410000 +v -0.200000 -0.010000 0.410000 +v 0.200000 -0.010000 0.410000 +v -0.200000 -0.010000 0.750000 +v 0.200000 -0.010000 0.750000 +v -0.200000 -0.350000 0.390000 +v 0.200000 -0.350000 0.390000 +v -0.200000 -0.350000 0.050000 +v 0.200000 -0.350000 0.050000 +v -0.200000 -0.010000 0.050000 +v 0.200000 -0.010000 0.050000 +v -0.200000 -0.010000 0.390000 +v 0.200000 -0.010000 0.390000 +v -0.200000 0.010000 0.390000 +v 0.200000 0.010000 0.390000 +v -0.200000 0.010000 0.050000 +v 0.200000 0.010000 0.050000 +v -0.200000 0.350000 0.050000 +v 0.200000 0.347436 0.050000 +v 0.200000 0.350000 0.050000 +v 0.200000 0.010000 0.370976 +v -0.200000 0.350000 0.390000 +v 0.200000 0.350000 0.390000 +v -0.200000 0.010000 0.086585 +v -0.200000 0.010000 0.750000 +v 0.200000 0.010000 0.750000 +v -0.200000 0.010000 0.410000 +v 0.200000 0.010000 0.410000 +v -0.200000 0.350000 0.410000 +v 0.200000 0.350000 0.410000 +v -0.200000 0.347436 0.750000 +v -0.200000 0.350000 0.750000 +v 0.200000 0.350000 0.750000 +v -0.200000 0.010000 0.429024 +v 0.200000 0.010000 0.429024 +s off +f 2 3 1 +f 3 21 7 +f 8 5 7 +f 28 22 1 +f 7 1 3 +f 4 6 8 +f 14 15 13 +f 11 10 12 +f 36 15 4 +f 2 16 6 +f 12 13 11 +f 16 9 15 +f 22 23 21 +f 19 18 20 +f 7 21 27 +f 34 31 5 +f 19 22 21 +f 23 18 17 +f 31 33 29 +f 25 26 32 +f 23 11 13 +f 28 30 27 +f 34 25 33 +f 40 44 43 +f 45 36 46 +f 38 41 40 +f 37 36 42 +f 37 6 16 +f 2 4 3 +f 3 17 19 +f 19 21 3 +f 8 6 5 +f 1 5 28 +f 28 32 22 +f 5 30 28 +f 22 20 1 +f 32 24 22 +f 7 5 1 +f 4 2 6 +f 14 16 15 +f 11 9 10 +f 4 8 36 +f 36 45 15 +f 8 42 36 +f 15 9 4 +f 45 13 15 +f 2 10 16 +f 12 14 13 +f 16 10 9 +f 22 24 23 +f 19 17 18 +f 21 35 27 +f 27 29 7 +f 2 1 18 +f 1 20 18 +f 12 10 2 +f 39 46 14 +f 12 2 18 +f 41 39 26 +f 14 12 18 +f 24 32 26 +f 14 18 24 +f 6 44 41 +f 39 14 24 +f 24 26 39 +f 5 6 41 +f 41 26 34 +f 31 30 5 +f 5 41 34 +f 19 20 22 +f 23 24 18 +f 31 34 33 +f 32 28 35 +f 35 25 32 +f 28 27 35 +f 7 29 33 +f 25 35 23 +f 8 7 33 +f 35 21 23 +f 43 42 8 +f 40 43 8 +f 33 25 38 +f 17 3 4 +f 25 23 13 +f 17 4 11 +f 4 9 11 +f 40 8 33 +f 13 45 38 +f 38 40 33 +f 23 17 11 +f 13 38 25 +f 29 27 30 +f 30 31 29 +f 34 26 25 +f 40 41 44 +f 46 39 38 +f 38 45 46 +f 36 37 46 +f 38 39 41 +f 42 43 44 +f 44 37 42 +f 16 14 46 +f 37 44 6 +f 16 46 37 diff --git a/res/mdl/expedit2.obj b/res/mdl/expedit2.obj new file mode 100644 index 0000000..158732d --- /dev/null +++ b/res/mdl/expedit2.obj @@ -0,0 +1,313 @@ +# Blender v2.79 (sub 0) OBJ File: 'expedit2.blend' +# www.blender.org +v 0.200000 -0.750000 0.000000 +v 0.200000 -0.750000 0.800000 +v -0.200000 -0.750000 0.000000 +v -0.200000 -0.750000 0.800000 +v 0.200000 0.750000 0.000000 +v 0.200000 0.750000 0.800000 +v -0.200000 0.750000 0.000000 +v -0.200000 0.750000 0.800000 +v -0.200000 0.010000 0.390000 +v 0.200000 0.010000 0.390000 +v -0.200000 0.010000 0.050000 +v 0.200000 0.010000 0.050000 +v -0.200000 0.350000 0.050000 +v 0.200000 0.350000 0.050000 +v -0.200000 0.350000 0.390000 +v 0.200000 0.350000 0.390000 +v 0.200000 0.350000 0.213333 +v -0.200000 -0.350000 0.390000 +v 0.200000 -0.350000 0.390000 +v -0.200000 -0.350000 0.050000 +v 0.200000 -0.350000 0.050000 +v -0.200000 -0.010000 0.050000 +v 0.200000 -0.010000 0.050000 +v -0.200000 -0.010000 0.390000 +v 0.200000 -0.010000 0.390000 +v -0.200000 -0.350000 0.205263 +v 0.200000 -0.010000 0.069737 +v -0.200000 -0.010000 0.379737 +v -0.200000 0.010000 0.750000 +v 0.200000 0.010000 0.750000 +v -0.200000 0.010000 0.410000 +v 0.200000 0.010000 0.410000 +v -0.200000 0.350000 0.410000 +v 0.200000 0.350000 0.410000 +v -0.200000 0.350000 0.750000 +v 0.200000 0.350000 0.750000 +v -0.200000 0.010000 0.516727 +v -0.200000 -0.350000 0.750000 +v 0.200000 -0.350000 0.750000 +v -0.200000 -0.350000 0.410000 +v 0.200000 -0.350000 0.410000 +v -0.200000 -0.010000 0.410000 +v 0.200000 -0.010000 0.410000 +v -0.200000 -0.350000 0.650909 +v 0.200000 -0.350000 0.594737 +v -0.200000 -0.010000 0.750000 +v 0.200000 -0.010000 0.750000 +v -0.200000 -0.010000 0.524182 +v 0.200000 -0.010000 0.420263 +v -0.200000 0.370000 0.750000 +v 0.200000 0.370000 0.750000 +v -0.200000 0.370000 0.410000 +v 0.200000 0.370000 0.410000 +v -0.200000 0.710000 0.410000 +v 0.200000 0.710000 0.410000 +v -0.200000 0.698718 0.750000 +v -0.200000 0.710000 0.750000 +v 0.200000 0.710000 0.750000 +v -0.200000 0.370000 0.429500 +v 0.200000 0.370000 0.429500 +v -0.200000 0.370000 0.390000 +v 0.200000 0.370000 0.390000 +v -0.200000 0.370000 0.050000 +v 0.200000 0.370000 0.050000 +v -0.200000 0.710000 0.050000 +v 0.200000 0.710000 0.050000 +v 0.200000 0.656250 0.050000 +v -0.200000 0.370000 0.370500 +v 0.200000 0.370000 0.202667 +v -0.200000 0.710000 0.390000 +v 0.200000 0.710000 0.390000 +v -0.200000 -0.710000 0.390000 +v 0.200000 -0.710000 0.390000 +v -0.200000 -0.652564 0.050000 +v -0.200000 -0.710000 0.050000 +v 0.200000 -0.710000 0.050000 +v -0.200000 -0.370000 0.050000 +v 0.200000 -0.370000 0.050000 +v -0.200000 -0.370000 0.390000 +v 0.200000 -0.370000 0.390000 +v -0.200000 -0.370000 0.195000 +v 0.200000 -0.370000 0.370500 +v -0.200000 -0.710000 0.750000 +v -0.200000 -0.615854 0.750000 +v 0.200000 -0.652564 0.750000 +v 0.200000 -0.710000 0.750000 +v -0.200000 -0.710000 0.410000 +v 0.200000 -0.710000 0.410000 +v -0.200000 -0.370000 0.410000 +v 0.200000 -0.370000 0.410000 +v -0.200000 -0.370000 0.750000 +v 0.200000 -0.370000 0.750000 +v 0.200000 -0.370000 0.605000 +v -0.200000 -0.370000 0.658364 +s off +f 2 3 1 +f 20 22 3 +f 8 5 7 +f 64 14 5 +f 7 1 3 +f 4 6 8 +f 17 16 15 +f 11 10 12 +f 7 13 63 +f 1 12 23 +f 12 13 11 +f 16 9 15 +f 25 24 28 +f 26 18 19 +f 21 78 1 +f 20 23 22 +f 24 19 18 +f 34 35 33 +f 31 37 32 +f 39 47 2 +f 46 38 4 +f 32 33 31 +f 36 29 35 +f 49 47 48 +f 44 39 45 +f 41 42 40 +f 47 38 46 +f 55 57 54 +f 59 50 60 +f 51 6 36 +f 52 55 54 +f 51 50 56 +f 65 71 70 +f 68 62 69 +f 72 4 87 +f 67 66 65 +f 71 61 70 +f 82 79 81 +f 75 73 76 +f 71 5 6 +f 78 77 74 +f 80 72 79 +f 92 91 94 +f 88 83 86 +f 87 90 89 +f 85 83 84 +f 2 4 3 +f 7 3 22 +f 77 81 20 +f 3 74 77 +f 11 13 7 +f 28 9 11 +f 22 28 11 +f 81 26 20 +f 22 11 7 +f 3 77 20 +f 8 6 5 +f 1 5 12 +f 64 69 14 +f 5 67 64 +f 14 12 5 +f 69 17 14 +f 7 5 1 +f 4 2 6 +f 15 13 17 +f 14 17 13 +f 11 9 10 +f 13 15 68 +f 63 65 7 +f 13 68 63 +f 12 27 23 +f 23 21 1 +f 12 14 13 +f 16 10 9 +f 28 22 27 +f 27 25 28 +f 22 23 27 +f 19 21 26 +f 20 26 21 +f 21 19 82 +f 78 76 1 +f 21 82 78 +f 20 21 23 +f 24 25 19 +f 34 36 35 +f 30 32 37 +f 37 29 30 +f 6 2 47 +f 92 93 39 +f 2 85 92 +f 30 36 6 +f 49 32 30 +f 47 49 30 +f 93 45 39 +f 47 30 6 +f 2 92 39 +f 4 8 29 +f 50 59 35 +f 8 56 50 +f 91 84 4 +f 44 94 38 +f 38 94 91 +f 59 33 35 +f 29 37 48 +f 8 50 35 +f 29 48 46 +f 8 35 29 +f 38 91 4 +f 4 29 46 +f 32 34 33 +f 36 30 29 +f 48 42 49 +f 43 49 42 +f 47 46 48 +f 45 41 40 +f 44 38 39 +f 45 40 44 +f 41 43 42 +f 47 39 38 +f 55 58 57 +f 60 53 52 +f 52 59 60 +f 50 51 60 +f 36 34 60 +f 51 58 6 +f 36 60 51 +f 52 53 55 +f 56 57 58 +f 58 51 56 +f 65 66 71 +f 69 64 63 +f 68 61 62 +f 69 63 68 +f 7 65 70 +f 61 68 15 +f 8 7 70 +f 61 15 33 +f 57 56 8 +f 54 57 8 +f 70 61 52 +f 9 28 24 +f 18 26 79 +f 15 9 33 +f 26 81 79 +f 9 31 33 +f 18 79 40 +f 54 8 70 +f 33 59 52 +f 52 54 70 +f 24 42 31 +f 33 52 61 +f 48 37 42 +f 31 9 24 +f 24 18 42 +f 42 37 31 +f 94 44 89 +f 42 18 40 +f 89 44 40 +f 40 79 89 +f 75 74 3 +f 89 79 72 +f 72 75 3 +f 4 84 83 +f 87 89 72 +f 4 83 87 +f 72 3 4 +f 65 63 67 +f 64 67 63 +f 71 62 61 +f 81 77 78 +f 82 80 79 +f 81 78 82 +f 75 72 73 +f 2 1 73 +f 1 76 73 +f 86 85 2 +f 88 86 2 +f 80 82 19 +f 25 27 10 +f 73 80 90 +f 27 12 10 +f 80 19 90 +f 25 10 43 +f 88 2 73 +f 45 93 90 +f 90 88 73 +f 19 41 90 +f 41 45 90 +f 19 25 41 +f 16 17 62 +f 17 69 62 +f 41 25 43 +f 32 49 43 +f 43 10 32 +f 16 62 34 +f 32 10 16 +f 53 60 34 +f 34 32 16 +f 34 62 53 +f 55 53 71 +f 53 62 71 +f 6 58 55 +f 66 67 5 +f 6 55 71 +f 71 66 5 +f 74 75 76 +f 76 78 74 +f 80 73 72 +f 94 89 93 +f 93 92 94 +f 89 90 93 +f 88 87 83 +f 87 88 90 +f 84 91 92 +f 85 86 83 +f 84 92 85 diff --git a/res/mdl/flipchart.obj b/res/mdl/flipchart.obj new file mode 100644 index 0000000..d767edf --- /dev/null +++ b/res/mdl/flipchart.obj @@ -0,0 +1,86 @@ +# Blender v2.79 (sub 0) OBJ File: 'flipchart.blend' +# www.blender.org +v 0.191748 -0.005000 0.008464 +v 0.018100 -0.005000 0.993272 +v 0.181900 -0.005000 0.006728 +v 0.008252 -0.005000 0.991536 +v 0.191748 0.005000 0.008464 +v 0.018100 0.005000 0.993272 +v 0.181900 0.005000 0.006728 +v 0.008252 0.005000 0.991536 +s off +f 2 3 1 +f 4 7 3 +f 8 5 7 +f 6 1 5 +f 7 1 3 +f 4 6 8 +f 2 4 3 +f 4 8 7 +f 8 6 5 +f 6 2 1 +f 7 5 1 +f 4 2 6 +v -0.165300 -0.406379 0.013586 +v -0.075003 -0.273838 0.508236 +v -0.184997 -0.405480 0.016940 +v -0.094700 -0.272939 0.511591 +v -0.165300 -0.387061 0.008409 +v -0.075003 -0.254520 0.503060 +v -0.184997 -0.386162 0.011764 +v -0.094700 -0.253621 0.506414 +s off +f 10 11 9 +f 11 16 15 +f 16 13 15 +f 13 10 9 +f 11 13 9 +f 12 14 16 +f 10 12 11 +f 11 12 16 +f 16 14 13 +f 13 14 10 +f 11 15 13 +f 12 10 14 +v -0.081900 -0.325000 0.506728 +v 0.091748 -0.325000 1.491536 +v -0.091748 -0.325000 0.508464 +v 0.081900 -0.325000 1.493272 +v -0.081900 0.325000 0.506728 +v 0.091748 0.325000 1.491536 +v -0.091748 0.325000 0.508464 +v 0.081900 0.325000 1.493272 +s off +f 18 19 17 +f 20 23 19 +f 24 21 23 +f 22 17 21 +f 23 17 19 +f 20 22 24 +f 18 20 19 +f 20 24 23 +f 24 22 21 +f 22 18 17 +f 23 21 17 +f 20 18 22 +v -0.165300 0.387061 0.008409 +v -0.075003 0.254520 0.503060 +v -0.184997 0.386162 0.011764 +v -0.094700 0.253621 0.506414 +v -0.165300 0.406379 0.013586 +v -0.075003 0.273838 0.508236 +v -0.184997 0.405480 0.016940 +v -0.094700 0.272939 0.511591 +s off +f 26 27 25 +f 27 32 31 +f 31 30 29 +f 29 26 25 +f 31 25 27 +f 32 26 30 +f 26 28 27 +f 27 28 32 +f 31 32 30 +f 29 30 26 +f 31 29 25 +f 32 28 26 diff --git a/res/mdl/flower1.obj b/res/mdl/flower1.obj new file mode 100644 index 0000000..5f10c96 --- /dev/null +++ b/res/mdl/flower1.obj @@ -0,0 +1,83 @@ +# Blender v2.79 (sub 0) OBJ File: 'flower1.blend' +# www.blender.org +v 0.122153 -0.122153 0.000000 +v 0.209296 -0.209296 0.400000 +v -0.122153 -0.122153 0.000000 +v -0.209296 -0.209296 0.400000 +v 0.122153 0.122153 0.000000 +v 0.209296 0.209296 0.400000 +v -0.122153 0.122153 0.000000 +v -0.209296 0.209296 0.400000 +v 0.045917 -0.000000 0.368976 +v -0.000000 -0.045917 0.368976 +v 0.000000 0.045917 0.368976 +v -0.045917 0.000000 0.368976 +v 0.045917 -0.000000 0.800000 +v -0.000000 -0.045917 0.800000 +v 0.000000 0.045917 0.800000 +v -0.045917 0.000000 0.800000 +v 0.278912 -0.000000 0.900000 +v -0.000000 -0.278912 0.900000 +v 0.000000 0.278912 0.900000 +v -0.278912 0.000000 0.900000 +v 0.272816 -0.000000 1.100000 +v -0.000000 -0.272816 1.100000 +v 0.000000 0.272816 1.100000 +v -0.272816 0.000000 1.100000 +v 0.083813 -0.000000 1.200000 +v -0.000000 -0.083813 1.200000 +v 0.000000 0.083813 1.200000 +v -0.083813 0.000000 1.200000 +s off +f 2 3 1 +f 4 7 3 +f 8 5 7 +f 6 1 5 +f 7 1 3 +f 4 12 8 +f 12 15 11 +f 8 11 6 +f 2 10 4 +f 6 9 2 +f 15 17 13 +f 9 14 10 +f 11 13 9 +f 10 16 12 +f 18 24 20 +f 14 20 16 +f 16 19 15 +f 13 18 14 +f 24 27 23 +f 20 23 19 +f 17 22 18 +f 19 21 17 +f 26 27 28 +f 21 26 22 +f 23 25 21 +f 22 28 24 +f 2 4 3 +f 4 8 7 +f 8 6 5 +f 6 2 1 +f 7 5 1 +f 4 10 12 +f 12 16 15 +f 8 12 11 +f 2 9 10 +f 6 11 9 +f 15 19 17 +f 9 13 14 +f 11 15 13 +f 10 14 16 +f 18 22 24 +f 14 18 20 +f 16 20 19 +f 13 17 18 +f 24 28 27 +f 20 24 23 +f 17 21 22 +f 19 23 21 +f 26 25 27 +f 21 25 26 +f 23 27 25 +f 22 26 28 diff --git a/res/mdl/table.obj b/res/mdl/table.obj new file mode 100644 index 0000000..f4d7ca7 --- /dev/null +++ b/res/mdl/table.obj @@ -0,0 +1,107 @@ +# Blender v2.79 (sub 0) OBJ File: 'stuff3.blend' +# www.blender.org +v 0.800000 -0.380000 0.700000 +v 0.800000 -0.380000 0.740000 +v -0.800000 -0.380000 0.700000 +v -0.800000 -0.380000 0.740000 +v 0.800000 0.380000 0.700000 +v 0.800000 0.380000 0.740000 +v -0.800000 0.380000 0.700000 +v -0.800000 0.380000 0.740000 +s off +f 2 3 1 +f 4 7 3 +f 8 5 7 +f 6 1 5 +f 7 1 3 +f 4 6 8 +f 2 4 3 +f 4 8 7 +f 8 6 5 +f 6 2 1 +f 7 5 1 +f 4 2 6 +v -0.700000 0.270000 0.000000 +v -0.700000 0.270000 0.700000 +v -0.780000 0.270000 0.000000 +v -0.780000 0.270000 0.700000 +v -0.700000 0.350000 0.000000 +v -0.700000 0.350000 0.700000 +v -0.780000 0.350000 0.000000 +v -0.780000 0.350000 0.700000 +s off +f 10 11 9 +f 12 15 11 +f 16 13 15 +f 14 9 13 +f 15 9 11 +f 12 14 16 +f 10 12 11 +f 12 16 15 +f 16 14 13 +f 14 10 9 +f 15 13 9 +f 12 10 14 +v 0.780000 0.280000 0.000000 +v 0.780000 0.280000 0.700000 +v 0.700000 0.280000 0.000000 +v 0.700000 0.280000 0.700000 +v 0.780000 0.360000 0.000000 +v 0.780000 0.360000 0.700000 +v 0.700000 0.360000 0.000000 +v 0.700000 0.360000 0.700000 +s off +f 18 19 17 +f 20 23 19 +f 24 21 23 +f 22 17 21 +f 23 17 19 +f 20 22 24 +f 18 20 19 +f 20 24 23 +f 24 22 21 +f 22 18 17 +f 23 21 17 +f 20 18 22 +v -0.700000 -0.350000 0.000000 +v -0.700000 -0.350000 0.700000 +v -0.780000 -0.350000 0.000000 +v -0.780000 -0.350000 0.700000 +v -0.700000 -0.270000 0.000000 +v -0.700000 -0.270000 0.700000 +v -0.780000 -0.270000 0.000000 +v -0.780000 -0.270000 0.700000 +s off +f 26 27 25 +f 28 31 27 +f 32 29 31 +f 30 25 29 +f 31 25 27 +f 28 30 32 +f 26 28 27 +f 28 32 31 +f 32 30 29 +f 30 26 25 +f 31 29 25 +f 28 26 30 +v 0.780000 -0.350000 0.000000 +v 0.780000 -0.350000 0.700000 +v 0.700000 -0.350000 0.000000 +v 0.700000 -0.350000 0.700000 +v 0.780000 -0.270000 0.000000 +v 0.780000 -0.270000 0.700000 +v 0.700000 -0.270000 0.000000 +v 0.700000 -0.270000 0.700000 +s off +f 34 35 33 +f 36 39 35 +f 40 37 39 +f 38 33 37 +f 39 33 35 +f 36 38 40 +f 34 36 35 +f 36 40 39 +f 40 38 37 +f 38 34 33 +f 39 37 33 +f 36 34 38 diff --git a/res/mdl/whiteboard.obj b/res/mdl/whiteboard.obj new file mode 100644 index 0000000..d885187 --- /dev/null +++ b/res/mdl/whiteboard.obj @@ -0,0 +1,23 @@ +# Blender v2.79 (sub 0) OBJ File: 'whiteboard.blend' +# www.blender.org +v 0.000000 -0.600000 -0.450000 +v 0.000000 -0.600000 0.450000 +v -0.010000 -0.600000 -0.450000 +v -0.010000 -0.600000 0.450000 +v 0.000000 0.600000 -0.450000 +v 0.000000 0.600000 0.450000 +v -0.010000 0.600000 -0.450000 +v -0.010000 0.600000 0.450000 +s off +f 2 3 1 +f 4 7 3 +f 8 5 7 +f 6 1 5 +f 7 1 3 +f 4 6 8 +f 2 4 3 +f 4 8 7 +f 8 6 5 +f 6 2 1 +f 7 5 1 +f 4 2 6 From c4b07dcee65e5ec59b345124ce84e792d7bcfc99 Mon Sep 17 00:00:00 2001 From: k-a-z-u Date: Tue, 3 Apr 2018 16:13:44 +0200 Subject: [PATCH 2/2] added objects minor changes --- IndoorMap.pro | 7 +- MainController.cpp | 9 ++- main.cpp | 2 + res/mdl/dude1.obj | 164 +++++++++++++++++++++++++++++++++++++++++++++ res/mdl/dude2.obj | 164 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 341 insertions(+), 5 deletions(-) create mode 100644 res/mdl/dude1.obj create mode 100644 res/mdl/dude2.obj diff --git a/IndoorMap.pro b/IndoorMap.pro index 692ea49..3101202 100644 --- a/IndoorMap.pro +++ b/IndoorMap.pro @@ -6,7 +6,8 @@ QT += core gui opengl -CONFIG += c++11 -g3 -O0 +CONFIG += c++17 -g3 -O0 +LIBS += -lstdc++fs greaterThan(QT_MAJOR_VERSION, 4): QT += widgets svg @@ -16,13 +17,13 @@ TEMPLATE = app DEFINES += WITH_ASSERTIONS DEFINES += WITH_DEBUG_LOG + INCLUDEPATH += \ ../ SOURCES += \ - lib/gpc/gpc.cpp \ main.cpp \ MainWindow.cpp \ MainController.cpp \ @@ -172,7 +173,7 @@ HEADERS += MainWindow.h \ mapview/3D/grid/GridModel.h \ mapview/3D/grid/GridRenderer.h \ mapview/3D/grid/MyNode.h \ - mapview/3D/navMesh/NavMeshModel.h \ + mapview/3D/navMesh/NavMeshModel.h \ mapview/3D/navMesh/NavMeshRenderer.h \ mapview/3D/navMesh/QNavMeshSettings.h \ mapview/3D/misc/TriangleData.h \ diff --git a/MainController.cpp b/MainController.cpp index b609756..449a00f 100644 --- a/MainController.cpp +++ b/MainController.cpp @@ -103,7 +103,12 @@ MainController::MainController() { connect(mw, &MainWindow::onGridNodeColorType, [&] () {mw->getMapView3D()->getGridRenderer()->setNodeColorMode(GridRendererColorMode::SHOW_NODE_TYPE);} ); connect(mw, &MainWindow::onGridShowEdges, [&] (const bool show) {mw->getMapView3D()->getGridRenderer()->setShowEdges(show);} ); - Ray3D::OBJPool::get().init("/mnt/vm/paper/diss/code/IndoorMap/res/mdl/"); + //Ray3D::OBJPool::get().init("/mnt/vm/paper/diss/code/IndoorMap/res/mdl/"); + //Ray3D::OBJPool::get().init("/apps/paper/diss/code/IndoorMap/res/mdl/"); + Ray3D::OBJPool::get().init({ + "/mnt/vm/paper/diss/code/IndoorMap/res/mdl/", + "/apps/paper/diss/code/IndoorMap/res/mdl/", + }); //mapModel->load("../IndoorMap/maps/SHL36_noel.xml"); //mapModel->load("../IndoorMap/maps/SHL38_no_elev.xml"); @@ -113,7 +118,7 @@ MainController::MainController() { //mapModel->load("/mnt/vm/paper/diss/data/maps/test_in_out_overlap.xml"); - mapModel->load("/mnt/vm/paper/diss/data/maps/walkmodel_stairs3.xml"); + //mapModel->load("/mnt/vm/paper/diss/data/maps/walkmodel_stairs3.xml"); //mapModel->load("/mnt/vm/paper/diss/data/maps/SHL42_nm.xml"); //mapModel->load("/apps/paper/diss/data/maps/SHL41_nm.xml"); diff --git a/main.cpp b/main.cpp index ed98f72..48d844e 100644 --- a/main.cpp +++ b/main.cpp @@ -3,6 +3,8 @@ #include "MainController.h" #include +#include +#include //#include "exp.h" //#include "ray.h" diff --git a/res/mdl/dude1.obj b/res/mdl/dude1.obj new file mode 100644 index 0000000..397bbc0 --- /dev/null +++ b/res/mdl/dude1.obj @@ -0,0 +1,164 @@ +# Blender v2.79 (sub 0) OBJ File: 'dude1.blend' +# www.blender.org +v 0.050000 0.225000 0.750000 +v 0.050000 0.225000 1.450000 +v -0.050000 0.225000 0.750000 +v -0.050000 0.225000 1.450000 +v 0.050000 0.325000 0.750000 +v 0.050000 0.325000 1.450000 +v -0.050000 0.325000 0.750000 +v -0.050000 0.325000 1.450000 +vn 0.0000 -1.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 1.0000 0.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 0.0000 1.0000 +s off +f 2//1 3//1 1//1 +f 4//2 7//2 3//2 +f 8//3 5//3 7//3 +f 6//4 1//4 5//4 +f 7//5 1//5 3//5 +f 4//6 6//6 8//6 +f 2//1 4//1 3//1 +f 4//2 8//2 7//2 +f 8//3 6//3 5//3 +f 6//4 2//4 1//4 +f 7//5 5//5 1//5 +f 4//6 2//6 6//6 +v 0.050000 -0.325000 0.750000 +v 0.050000 -0.325000 1.450000 +v -0.050000 -0.325000 0.750000 +v -0.050000 -0.325000 1.450000 +v 0.050000 -0.225000 0.750000 +v 0.050000 -0.225000 1.450000 +v -0.050000 -0.225000 0.750000 +v -0.050000 -0.225000 1.450000 +vn 0.0000 -1.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 1.0000 0.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 0.0000 1.0000 +s off +f 10//7 11//7 9//7 +f 12//8 15//8 11//8 +f 16//9 13//9 15//9 +f 14//10 9//10 13//10 +f 15//11 9//11 11//11 +f 12//12 14//12 16//12 +f 10//7 12//7 11//7 +f 12//8 16//8 15//8 +f 16//9 14//9 13//9 +f 14//10 10//10 9//10 +f 15//11 13//11 9//11 +f 12//12 10//12 14//12 +v 0.100000 -0.100000 1.550000 +v 0.100000 -0.100000 1.750000 +v -0.100000 -0.100000 1.550000 +v -0.100000 -0.100000 1.750000 +v 0.100000 0.100000 1.550000 +v 0.100000 0.100000 1.750000 +v -0.100000 0.100000 1.550000 +v -0.100000 0.100000 1.750000 +vn 0.0000 -1.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 1.0000 0.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 0.0000 1.0000 +s off +f 18//13 19//13 17//13 +f 20//14 23//14 19//14 +f 24//15 21//15 23//15 +f 22//16 17//16 21//16 +f 23//17 17//17 19//17 +f 20//18 22//18 24//18 +f 18//13 20//13 19//13 +f 20//14 24//14 23//14 +f 24//15 22//15 21//15 +f 22//16 18//16 17//16 +f 23//17 21//17 17//17 +f 20//18 18//18 22//18 +v 0.150000 -0.200000 0.900000 +v 0.150000 -0.200000 1.500000 +v -0.150000 -0.200000 0.900000 +v -0.150000 -0.200000 1.500000 +v 0.150000 0.200000 0.900000 +v 0.150000 0.200000 1.500000 +v -0.150000 0.200000 0.900000 +v -0.150000 0.200000 1.500000 +vn 0.0000 -1.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 1.0000 0.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 0.0000 1.0000 +s off +f 26//19 27//19 25//19 +f 28//20 31//20 27//20 +f 32//21 29//21 31//21 +f 30//22 25//22 29//22 +f 31//23 25//23 27//23 +f 28//24 30//24 32//24 +f 26//19 28//19 27//19 +f 28//20 32//20 31//20 +f 32//21 30//21 29//21 +f 30//22 26//22 25//22 +f 31//23 29//23 25//23 +f 28//24 26//24 30//24 +v 0.075000 0.025000 0.000000 +v 0.075000 0.025000 0.850000 +v -0.075000 0.025000 0.000000 +v -0.075000 0.025000 0.850000 +v 0.075000 0.175000 0.000000 +v 0.075000 0.175000 0.850000 +v -0.075000 0.175000 0.000000 +v -0.075000 0.175000 0.850000 +vn 0.0000 -1.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 1.0000 0.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 0.0000 1.0000 +s off +f 34//25 35//25 33//25 +f 36//26 39//26 35//26 +f 40//27 37//27 39//27 +f 38//28 33//28 37//28 +f 39//29 33//29 35//29 +f 36//30 38//30 40//30 +f 34//25 36//25 35//25 +f 36//26 40//26 39//26 +f 40//27 38//27 37//27 +f 38//28 34//28 33//28 +f 39//29 37//29 33//29 +f 36//30 34//30 38//30 +v 0.075000 -0.175000 0.000000 +v 0.075000 -0.175000 0.850000 +v -0.075000 -0.175000 0.000000 +v -0.075000 -0.175000 0.850000 +v 0.075000 -0.025000 0.000000 +v 0.075000 -0.025000 0.850000 +v -0.075000 -0.025000 0.000000 +v -0.075000 -0.025000 0.850000 +vn 0.0000 -1.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 1.0000 0.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 0.0000 1.0000 +s off +f 42//31 43//31 41//31 +f 44//32 47//32 43//32 +f 48//33 45//33 47//33 +f 46//34 41//34 45//34 +f 47//35 41//35 43//35 +f 44//36 46//36 48//36 +f 42//31 44//31 43//31 +f 44//32 48//32 47//32 +f 48//33 46//33 45//33 +f 46//34 42//34 41//34 +f 47//35 45//35 41//35 +f 44//36 42//36 46//36 diff --git a/res/mdl/dude2.obj b/res/mdl/dude2.obj new file mode 100644 index 0000000..becee6d --- /dev/null +++ b/res/mdl/dude2.obj @@ -0,0 +1,164 @@ +# Blender v2.79 (sub 0) OBJ File: 'dude2.blend' +# www.blender.org +v -0.255778 0.216248 0.761661 +v 0.038929 0.242032 1.396077 +v -0.346064 0.208349 0.803923 +v -0.051357 0.234133 1.438339 +v -0.264493 0.315867 0.761661 +v 0.030214 0.341651 1.396077 +v -0.354779 0.307968 0.803923 +v -0.060072 0.333752 1.438339 +vn 0.0872 -0.9962 -0.0000 +vn -0.9029 -0.0790 0.4226 +vn -0.0872 0.9962 0.0000 +vn 0.9029 0.0790 -0.4226 +vn -0.4210 -0.0368 -0.9063 +vn 0.4210 0.0368 0.9063 +s off +f 2//1 3//1 1//1 +f 4//2 7//2 3//2 +f 7//3 6//3 5//3 +f 6//4 1//4 5//4 +f 7//5 1//5 3//5 +f 4//6 6//6 8//6 +f 2//1 4//1 3//1 +f 4//2 8//2 7//2 +f 7//3 8//3 6//3 +f 6//4 2//4 1//4 +f 7//5 5//5 1//5 +f 4//6 2//6 6//6 +v 0.357916 -0.307968 0.803923 +v 0.063209 -0.333752 1.438339 +v 0.267630 -0.315867 0.761661 +v -0.027077 -0.341651 1.396077 +v 0.349200 -0.208349 0.803923 +v 0.054493 -0.234133 1.438339 +v 0.258915 -0.216248 0.761661 +v -0.035792 -0.242032 1.396077 +vn 0.0872 -0.9962 -0.0000 +vn -0.9029 -0.0790 -0.4226 +vn -0.0872 0.9962 0.0000 +vn 0.9029 0.0790 0.4226 +vn 0.4210 0.0368 -0.9063 +vn -0.4210 -0.0368 0.9063 +s off +f 10//7 11//7 9//7 +f 12//8 15//8 11//8 +f 15//9 14//9 13//9 +f 14//10 9//10 13//10 +f 15//11 9//11 11//11 +f 16//12 10//12 14//12 +f 10//7 12//7 11//7 +f 12//8 16//8 15//8 +f 15//9 16//9 14//9 +f 14//10 10//10 9//10 +f 15//11 13//11 9//11 +f 16//12 12//12 10//12 +v 0.100000 -0.100000 1.550000 +v 0.100000 -0.100000 1.750000 +v -0.100000 -0.100000 1.550000 +v -0.100000 -0.100000 1.750000 +v 0.100000 0.100000 1.550000 +v 0.100000 0.100000 1.750000 +v -0.100000 0.100000 1.550000 +v -0.100000 0.100000 1.750000 +vn 0.0000 -1.0000 0.0000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 1.0000 0.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 0.0000 0.0000 1.0000 +s off +f 18//13 19//13 17//13 +f 20//14 23//14 19//14 +f 24//15 21//15 23//15 +f 22//16 17//16 21//16 +f 23//17 17//17 19//17 +f 20//18 22//18 24//18 +f 18//13 20//13 19//13 +f 20//14 24//14 23//14 +f 24//15 22//15 21//15 +f 22//16 18//16 17//16 +f 23//17 21//17 17//17 +f 20//18 18//18 22//18 +v 0.166860 -0.186166 0.900000 +v 0.166860 -0.186166 1.500000 +v -0.131998 -0.212312 0.900000 +v -0.131998 -0.212312 1.500000 +v 0.131998 0.212312 0.900000 +v 0.131998 0.212312 1.500000 +v -0.166860 0.186166 0.900000 +v -0.166860 0.186166 1.500000 +vn 0.0872 -0.9962 0.0000 +vn -0.9962 -0.0872 0.0000 +vn -0.0872 0.9962 0.0000 +vn 0.9962 0.0872 0.0000 +vn -0.0000 0.0000 -1.0000 +vn -0.0000 0.0000 1.0000 +s off +f 26//19 27//19 25//19 +f 28//20 31//20 27//20 +f 32//21 29//21 31//21 +f 30//22 25//22 29//22 +f 31//23 25//23 27//23 +f 28//24 30//24 32//24 +f 26//19 28//19 27//19 +f 28//20 32//20 31//20 +f 32//21 30//21 29//21 +f 30//22 26//22 25//22 +f 31//23 29//23 25//23 +f 28//24 26//24 30//24 +v 0.210243 0.025000 0.019480 +v 0.062642 0.025000 0.856567 +v 0.062522 0.025000 -0.006567 +v -0.085079 0.025000 0.830520 +v 0.210243 0.175000 0.019480 +v 0.062642 0.175000 0.856567 +v 0.062522 0.175000 -0.006567 +v -0.085079 0.175000 0.830520 +vn 0.0000 -1.0000 0.0000 +vn -0.9848 0.0000 -0.1736 +vn 0.0000 1.0000 0.0000 +vn 0.9848 0.0000 0.1736 +vn 0.1736 0.0000 -0.9848 +vn -0.1736 0.0000 0.9848 +s off +f 34//25 35//25 33//25 +f 36//26 39//26 35//26 +f 40//27 37//27 39//27 +f 38//28 33//28 37//28 +f 39//29 33//29 35//29 +f 36//30 38//30 40//30 +f 34//25 36//25 35//25 +f 36//26 40//26 39//26 +f 40//27 38//27 37//27 +f 38//28 34//28 33//28 +f 39//29 37//29 33//29 +f 36//30 34//30 38//30 +v -0.075060 -0.175000 -0.006567 +v 0.072541 -0.175000 0.830520 +v -0.222781 -0.175000 0.019480 +v -0.075180 -0.175000 0.856567 +v -0.075060 -0.025000 -0.006567 +v 0.072541 -0.025000 0.830520 +v -0.222781 -0.025000 0.019480 +v -0.075180 -0.025000 0.856567 +vn 0.0000 -1.0000 0.0000 +vn -0.9848 0.0000 0.1736 +vn 0.0000 1.0000 0.0000 +vn 0.9848 0.0000 -0.1736 +vn -0.1736 0.0000 -0.9848 +vn 0.1736 0.0000 0.9848 +s off +f 42//31 43//31 41//31 +f 44//32 47//32 43//32 +f 48//33 45//33 47//33 +f 46//34 41//34 45//34 +f 47//35 41//35 43//35 +f 44//36 46//36 48//36 +f 42//31 44//31 43//31 +f 44//32 48//32 47//32 +f 48//33 46//33 45//33 +f 46//34 42//34 41//34 +f 47//35 45//35 41//35 +f 44//36 42//36 46//36