diff --git a/data/animated.block.dae b/data/animated.block.dae new file mode 100644 index 0000000..34ab4d0 --- /dev/null +++ b/data/animated.block.dae @@ -0,0 +1,745 @@ + + + + + Blender User + Blender 2.79.0 commit date:2018-05-26, commit time:21:51, hash:32432d91bbe + + 2018-07-09T16:03:11 + 2018-07-09T16:03:11 + + Z_UP + + + + + + + -1 -1 0 -1 -1 2 -1 1 0 -1 1 2 1 -1 0 1 -1 2 1 1 0 1 1 2 -1 0 0 -1 -1 1 -1 0 2 -1 1 1 0 1 0 0 1 2 1 1 1 1 0 0 1 0 2 1 -1 1 0 -1 0 0 -1 2 0 0 2 0 0 0 0 -1 1 1 0 1 0 1 1 -1 0 1 -1 -0.5 0 -1 -1 1.5 -1 0.5 2 -1 1 0.5 -0.5 1 0 0.5 1 2 1 1 0.5 1 0.5 0 1 -0.5 2 1 -1 0.5 0.5 -1 0 -0.5 -1 2 -1 0.5 0 -1 -1 0.5 -1 -0.5 2 -1 1 1.5 0.5 1 0 -0.5 1 2 1 1 1.5 1 -0.5 0 1 0.5 2 1 -1 1.5 -0.5 -1 0 0.5 -1 2 0 -0.5 2 0 0.5 2 0.5 0 2 -0.5 0 2 0 -0.5 0 0 0.5 0 -0.5 0 0 0.5 0 0 -0.5 -1 1 0.5 -1 1 0 -1 0.5 0 -1 1.5 1 -0.5 1 1 0.5 1 1 0 0.5 1 0 1.5 0.5 1 1 -0.5 1 1 0 1 0.5 0 1 1.5 -1 0.5 1 -1 -0.5 1 -1 0 0.5 -1 0 1.5 -1 -0.5 1.5 -1 -0.5 0.5 -1 0.5 0.5 -0.5 1 1.5 -0.5 1 0.5 0.5 1 0.5 1 0.5 1.5 1 0.5 0.5 1 -0.5 0.5 0.5 -1 1.5 0.5 -1 0.5 -0.5 -1 0.5 0.5 0.5 0 -0.5 0.5 0 -0.5 -0.5 0 -0.5 0.5 2 0.5 0.5 2 0.5 -0.5 2 -0.5 -0.5 2 0.5 -0.5 0 -0.5 -1 1.5 1 -0.5 1.5 0.5 1 1.5 -1 0.5 1.5 + + + + + + + + + + -1 0 0 0 1 0 1 0 0 0 -1 0 0 0 -1 0 0 1 + + + + + + + + + + + + + + +

28 0 41 0 97 0 31 1 44 1 96 1 34 2 47 2 95 2 37 3 27 3 94 3 45 4 36 4 93 4 40 5 37 5 92 5 50 5 49 5 91 5 51 5 52 5 90 5 28 5 53 5 89 5 54 4 48 4 88 4 55 4 56 4 87 4 33 4 57 4 86 4 58 3 39 3 85 3 59 3 60 3 84 3 49 3 61 3 83 3 62 2 35 2 82 2 63 2 64 2 81 2 46 2 65 2 80 2 66 1 32 1 79 1 67 1 68 1 78 1 43 1 69 1 77 1 70 0 29 0 76 0 71 0 72 0 75 0 40 0 73 0 74 0 74 0 25 0 71 0 27 0 71 0 9 0 1 0 74 0 27 0 75 0 8 0 26 0 39 0 26 0 0 0 9 0 75 0 39 0 76 0 2 0 38 0 72 0 38 0 8 0 25 0 76 0 72 0 77 1 24 1 67 1 41 1 67 1 11 1 3 1 77 1 41 1 78 1 12 1 30 1 29 1 30 1 2 1 11 1 78 1 29 1 79 1 6 1 42 1 68 1 42 1 12 1 24 1 79 1 68 1 80 2 23 2 63 2 44 2 63 2 14 2 7 2 80 2 44 2 81 2 15 2 33 2 32 2 33 2 6 2 14 2 81 2 32 2 82 2 4 2 45 2 64 2 45 2 15 2 23 2 82 2 64 2 83 3 22 3 59 3 47 3 59 3 17 3 5 3 83 3 47 3 84 3 18 3 36 3 35 3 36 3 4 3 17 3 84 3 35 3 85 3 0 3 48 3 60 3 48 3 18 3 22 3 85 3 60 3 86 4 21 4 55 4 42 4 55 4 12 4 6 4 86 4 42 4 87 4 8 4 38 4 30 4 38 4 2 4 12 4 87 4 30 4 88 4 0 4 26 4 56 4 26 4 8 4 21 4 88 4 56 4 89 5 20 5 51 5 43 5 51 5 13 5 3 5 89 5 43 5 90 5 16 5 46 5 31 5 46 5 7 5 13 5 90 5 31 5 91 5 5 5 34 5 52 5 34 5 16 5 20 5 91 5 52 5 92 5 19 5 50 5 53 5 50 5 20 5 10 5 92 5 53 5 93 4 18 4 54 4 57 4 54 4 21 4 15 4 93 4 57 4 94 3 9 3 58 3 61 3 58 3 22 3 19 3 94 3 61 3 95 2 17 2 62 2 65 2 62 2 23 2 16 2 95 2 65 2 96 1 14 1 66 1 69 1 66 1 24 1 13 1 96 1 69 1 97 0 11 0 70 0 73 0 70 0 25 0 10 0 97 0 73 0 28 0 3 0 41 0 31 1 7 1 44 1 34 2 5 2 47 2 37 3 1 3 27 3 45 4 4 4 36 4 40 5 1 5 37 5 50 5 19 5 49 5 51 5 20 5 52 5 28 5 10 5 53 5 54 4 18 4 48 4 55 4 21 4 56 4 33 4 15 4 57 4 58 3 9 3 39 3 59 3 22 3 60 3 49 3 19 3 61 3 62 2 17 2 35 2 63 2 23 2 64 2 46 2 16 2 65 2 66 1 14 1 32 1 67 1 24 1 68 1 43 1 13 1 69 1 70 0 11 0 29 0 71 0 25 0 72 0 40 0 10 0 73 0 74 0 73 0 25 0 27 0 74 0 71 0 1 0 40 0 74 0 75 0 72 0 8 0 39 0 75 0 26 0 9 0 71 0 75 0 76 0 29 0 2 0 72 0 76 0 38 0 25 0 70 0 76 0 77 1 69 1 24 1 41 1 77 1 67 1 3 1 43 1 77 1 78 1 68 1 12 1 29 1 78 1 30 1 11 1 67 1 78 1 79 1 32 1 6 1 68 1 79 1 42 1 24 1 66 1 79 1 80 2 65 2 23 2 44 2 80 2 63 2 7 2 46 2 80 2 81 2 64 2 15 2 32 2 81 2 33 2 14 2 63 2 81 2 82 2 35 2 4 2 64 2 82 2 45 2 23 2 62 2 82 2 83 3 61 3 22 3 47 3 83 3 59 3 5 3 49 3 83 3 84 3 60 3 18 3 35 3 84 3 36 3 17 3 59 3 84 3 85 3 39 3 0 3 60 3 85 3 48 3 22 3 58 3 85 3 86 4 57 4 21 4 42 4 86 4 55 4 6 4 33 4 86 4 87 4 56 4 8 4 30 4 87 4 38 4 12 4 55 4 87 4 88 4 48 4 0 4 56 4 88 4 26 4 21 4 54 4 88 4 89 5 53 5 20 5 43 5 89 5 51 5 3 5 28 5 89 5 90 5 52 5 16 5 31 5 90 5 46 5 13 5 51 5 90 5 91 5 49 5 5 5 52 5 91 5 34 5 20 5 50 5 91 5 92 5 37 5 19 5 53 5 92 5 50 5 10 5 40 5 92 5 93 4 36 4 18 4 57 4 93 4 54 4 15 4 45 4 93 4 94 3 27 3 9 3 61 3 94 3 58 3 19 3 37 3 94 3 95 2 47 2 17 2 65 2 95 2 62 2 16 2 34 2 95 2 96 1 44 1 14 1 69 1 96 1 66 1 13 1 31 1 96 1 97 0 41 0 11 0 73 0 97 0 70 0 10 0 28 0 97 0

+ + + + + + + + 0.04166662 0.8333333 + + + + + + + + 0 0 + + + + + + + + BEZIER BEZIER + + + + + + + + -0.2674091 0 0.5242576 0 + + + + + + + + + 0.3507424 0 1.142409 0 + + + + + + + + + + + + + + + + + + + 0.04166662 0.8333333 + + + + + + + + 0 0 + + + + + + + + BEZIER BEZIER + + + + + + + + -0.2674091 0 0.5242576 0 + + + + + + + + + 0.3507424 0 1.142409 0 + + + + + + + + + + + + + + + + + + + 0.04166662 0.8333333 + + + + + + + + 0 0 + + + + + + + + BEZIER BEZIER + + + + + + + + -0.2674091 0 0.5242576 0 + + + + + + + + + 0.3507424 0 1.142409 0 + + + + + + + + + + + + + + + + + + + 0.04166662 0.8333333 + + + + + + + + 0 0 + + + + + + + + BEZIER BEZIER + + + + + + + + -0.2674091 0 0.5242576 0 + + + + + + + + + 0.3507424 0 1.142409 0 + + + + + + + + + + + + + + + + + + + 0.04166662 0.8333333 + + + + + + + + 0 0 + + + + + + + + BEZIER BEZIER + + + + + + + + -0.2674091 0 0.5242576 0 + + + + + + + + + 0.3507424 0 1.142409 0 + + + + + + + + + + + + + + + + + + + 0.04166662 0.8333333 + + + + + + + + 0 0 + + + + + + + + BEZIER BEZIER + + + + + + + + -0.2674091 0 0.5242576 0 + + + + + + + + + 0.3507424 0 1.142409 0 + + + + + + + + + + + + + + + + + + + 0.04166662 0.8333333 + + + + + + + + 1 1 + + + + + + + + BEZIER BEZIER + + + + + + + + -0.2674091 1 0.5242576 1 + + + + + + + + + 0.3507424 1 1.142409 1 + + + + + + + + + + + + + + + + + + + 0.04166662 0.8333333 + + + + + + + + 1 1 + + + + + + + + BEZIER BEZIER + + + + + + + + -0.2674091 1 0.5242576 1 + + + + + + + + + 0.3507424 1 1.142409 1 + + + + + + + + + + + + + + + + + + + 0.04166662 0.8333333 + + + + + + + + 1 1 + + + + + + + + BEZIER BEZIER + + + + + + + + -0.2674091 1 0.5242576 1 + + + + + + + + + 0.3507424 1 1.142409 1 + + + + + + + + + + + + + + + + + + + 0.04166662 0.8333333 1.666667 + + + + + + + + 1 0 0 0 0 0 -1 0 0 1 0 0 0 0 0 1 1 0 0 0 0 0 -1 0 0 1 0 0 0 0 0 1 1 0 0 0 0 0 -1 0 0 1 0 0 0 0 0 1 + + + + + + + + LINEAR LINEAR LINEAR + + + + + + + + + + + + + + + + 0.04166662 0.8333333 1.666667 + + + + + + + + 1 0 0 0 0 1 0 0.5 0 0 1 0 0 0 0 1 1 0 0 0 0 1 0 0.5 0 0 1 0 0 0 0 1 1 0 0 0 0 1 0 0.5 0 0 1 0 0 0 0 1 + + + + + + + + LINEAR LINEAR LINEAR + + + + + + + + + + + + + + + + 0.04166662 0.8333333 1.666667 + + + + + + + + 1 0 0 0 0 1 0 0.5 0 0 1 0 0 0 0 1 0.5406476 0.3529544 -0.1763822 0 -0.2424221 0.8341969 -0.2256688 0.5 0.04301937 0.2650852 0.9450057 0 0 0 0 1 1 0 0 0 0 1 0 0.5 0 0 1 0 0 0 0 1 + + + + + + + + LINEAR LINEAR LINEAR + + + + + + + + + + + + + + + + 0.04166662 0.8333333 1.666667 + + + + + + + + 1 0 0 0 0 1 0 0.5 0 0 1 0 0 0 0 1 1 0 0 0 0 1 0 0.5 0 0 1 0 0 0 0 1 1 0 0 0 0 1 0 0.5 0 0 1 0 0 0 0 1 + + + + + + + + LINEAR LINEAR LINEAR + + + + + + + + + + + + + + + + + + 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 + + Bone Bone_002 Bone_001 Bone_003 + + + + + + + + 1 0 0 0 0 0 1 0 0 -1 0 0 0 0 0 1 1 0 0 0 0 0 1 -0.5 0 -1 0 0 0 0 0 1 1 0 0 0 0 0 1 -1 0 -1 0 0 0 0 0 1 1 0 0 0 0 0 1 -1.5 0 -1 0 0 0 0 0 1 + + + + + + + + 0.3447096 0.5641419 0.09114837 0.09121769 0.6926597 0.2161225 0.2161225 0.6926597 0.09121769 0.09114837 0.5641419 0.3447096 0.2161225 0.6926597 0.09121769 0.09114837 0.5641419 0.3447096 0.3447096 0.5641419 0.09114837 0.09121769 0.6926597 0.2161225 0.22878 0.7084835 0.06273645 0.1114824 0.3886053 0.3970124 0.1029 0.06273645 0.7084835 0.22878 0.1029 0.3970124 0.3886052 0.1114823 0.2287799 0.7084835 0.06273645 0.06273645 0.7084835 0.22878 0.1114824 0.3886053 0.3970124 0.1029 0.22878 0.7084835 0.06273645 0.06273645 0.7084835 0.22878 0.1029 0.3970124 0.3886052 0.1114823 0.22878 0.7084835 0.06273645 0.06273645 0.7084835 0.22878 1 1 0.09136503 0.408635 0.408635 0.09136503 0.09136503 0.408635 0.408635 0.09136503 0.09136503 0.408635 0.408635 0.09136503 0.09136503 0.408635 0.408635 0.09136503 0.2443717 0.6823307 0.07329744 0.0321002 0.1517159 0.5311362 0.2850476 0.07329744 0.6823308 0.2443718 0.2850476 0.5311361 0.1517159 0.0321002 0.210599 0.7163642 0.07303678 0.07303678 0.7163642 0.210599 0.3181867 0.5004422 0.1543055 0.02706557 0.2443717 0.6823307 0.07329744 0.07329744 0.6823308 0.2443718 0.2850476 0.5311361 0.1517159 0.0321002 0.210599 0.7163642 0.07303678 0.07303678 0.7163642 0.210599 0.210599 0.7163642 0.07303678 0.3181867 0.5004422 0.1543055 0.02706557 0.07303678 0.7163642 0.210599 0.02706557 0.1543055 0.5004422 0.3181867 0.2443718 0.6823308 0.07329744 0.07329744 0.6823308 0.2443718 0.0321002 0.1517159 0.5311362 0.2850476 0.210599 0.7163642 0.07303678 0.07303678 0.7163642 0.210599 0.02706557 0.1543055 0.5004422 0.3181867 0.2443717 0.6823307 0.07329744 0.07329744 0.6823308 0.2443718 0.002464354 0.6834716 0.314064 0.002464354 0.6834716 0.314064 0.002464354 0.6834716 0.314064 0.002464354 0.6834716 0.314064 0.314064 0.6834716 0.002464354 0.314064 0.6834716 0.002464354 0.314064 0.6834716 0.002464354 0.314064 0.6834716 0.002464354 0.1010656 0.398977 0.4030711 0.09688621 0.09688621 0.4030711 0.398977 0.1010656 0.328189 0.5365397 0.1269097 0.008361637 0.008361637 0.1269097 0.5365397 0.328189 0.09688621 0.4030711 0.398977 0.1010656 0.1010656 0.398977 0.4030711 0.09688627 0.328189 0.5365397 0.1269097 0.008361637 0.008361637 0.1269097 0.5365397 0.328189 0.1010656 0.398977 0.4030711 0.09688627 0.09688621 0.4030711 0.398977 0.1010656 0.328189 0.5365397 0.1269097 0.008361637 0.008361637 0.1269097 0.5365397 0.328189 0.09688621 0.4030711 0.398977 0.1010656 0.1010656 0.398977 0.4030711 0.09688621 0.328189 0.5365397 0.1269097 0.008361637 0.008361637 0.1269097 0.5365397 0.328189 0.01992881 0.1391872 0.5372208 0.3036632 0.3170841 0.5251039 0.140608 0.01720398 0.3036632 0.5372208 0.1391872 0.01992881 0.01720398 0.140608 0.5251039 0.3170841 0.3036632 0.5372208 0.1391872 0.01992881 0.3170841 0.5251039 0.140608 0.01720398 0.01992881 0.1391872 0.5372208 0.3036632 0.3170841 0.5251039 0.140608 0.01720398 0.3036632 0.5372208 0.1391872 0.01992881 0.01720398 0.140608 0.5251039 0.3170841 0.3036632 0.5372208 0.1391872 0.01992881 0.3170841 0.5251039 0.140608 0.01720398 0.2299401 0.7381219 0.03193795 0.2159614 0.7523441 0.03169441 0.2299401 0.7381219 0.03193795 0.03193795 0.7381219 0.2299401 0.03169441 0.7523441 0.2159614 0.03193795 0.7381219 0.2299401 0.03169441 0.7523441 0.2159614 0.2159614 0.7523441 0.03169441 0.01992881 0.1391872 0.5372208 0.3036632 0.01720398 0.140608 0.5251039 0.3170841 0.01992881 0.1391872 0.5372208 0.3036632 0.01720398 0.140608 0.5251039 0.3170841 + + + + + + + + + + + + + + 3 3 3 3 3 3 3 3 3 4 3 4 3 3 4 3 3 4 3 3 1 1 4 4 4 4 3 4 3 4 3 3 4 3 3 4 3 3 3 4 3 4 3 3 4 3 3 4 3 3 3 3 3 3 3 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 3 3 3 3 3 4 4 4 4 + 0 0 1 1 2 2 1 3 2 4 3 5 0 6 1 7 2 8 1 9 2 10 3 11 0 12 1 13 2 14 1 15 2 16 3 17 0 18 1 19 2 20 1 21 2 22 3 23 0 24 1 25 2 26 0 27 1 28 2 29 3 30 1 31 2 32 3 33 0 34 1 35 2 36 3 37 0 38 1 39 2 40 1 41 2 42 3 43 0 44 1 45 2 46 3 47 0 48 1 49 2 50 1 51 2 52 3 53 0 54 1 55 2 56 3 57 0 58 1 59 2 60 1 61 2 62 3 63 3 64 0 65 0 66 1 67 2 68 3 69 0 70 1 71 2 72 3 73 0 74 1 75 2 76 3 77 0 78 1 79 2 80 3 81 0 82 1 83 2 84 0 85 1 86 2 87 3 88 1 89 2 90 3 91 0 92 1 93 2 94 3 95 0 96 1 97 2 98 1 99 2 100 3 101 0 102 1 103 2 104 3 105 0 106 1 107 2 108 1 109 2 110 3 111 0 112 1 113 2 114 3 115 0 116 1 117 2 118 1 119 2 120 3 121 0 122 1 123 2 124 0 125 1 126 2 127 3 128 1 129 2 130 3 131 0 132 1 133 2 134 3 135 0 136 1 137 2 138 1 139 2 140 3 141 0 142 1 143 2 144 3 145 0 146 1 147 2 148 1 149 2 150 3 151 0 152 1 153 2 154 3 155 0 156 1 157 2 158 1 159 2 160 3 161 1 162 2 163 3 164 1 165 2 166 3 167 1 168 2 169 3 170 1 171 2 172 3 173 0 174 1 175 2 176 0 177 1 178 2 179 0 180 1 181 2 182 0 183 1 184 2 185 0 186 1 187 2 188 3 189 0 190 1 191 2 192 3 193 0 194 1 195 2 196 3 197 0 198 1 199 2 200 3 201 0 202 1 203 2 204 3 205 0 206 1 207 2 208 3 209 0 210 1 211 2 212 3 213 0 214 1 215 2 216 3 217 0 218 1 219 2 220 3 221 0 222 1 223 2 224 3 225 0 226 1 227 2 228 3 229 0 230 1 231 2 232 3 233 0 234 1 235 2 236 3 237 0 238 1 239 2 240 3 241 0 242 1 243 2 244 3 245 0 246 1 247 2 248 3 249 0 250 1 251 2 252 3 253 0 254 1 255 2 256 3 257 0 258 1 259 2 260 3 261 0 262 1 263 2 264 3 265 0 266 1 267 2 268 3 269 0 270 1 271 2 272 3 273 0 274 1 275 2 276 3 277 0 278 1 279 2 280 3 281 0 282 1 283 2 284 3 285 0 286 1 287 2 288 3 289 0 290 1 291 2 292 3 293 0 294 1 295 2 296 3 297 0 298 1 299 2 300 0 301 1 302 2 303 0 304 1 305 2 306 1 307 2 308 3 309 1 310 2 311 3 312 1 313 2 314 3 315 1 316 2 317 3 318 0 319 1 320 2 321 0 322 1 323 2 324 3 325 0 326 1 327 2 328 3 329 0 330 1 331 2 332 3 333 0 334 1 335 2 336 3 337 + + + + + + + + 1 0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 + + 1 0 0 0 0 0 -1 0 0 1 0 0 0 0 0 1 + + 1 0 0 0 0 1 0 0.5 0 0 1 0 0 0 0 1 + + 1 0 0 0 0 1 0 0.5 0 0 1 0 0 0 0 1 + + 1 0 0 0 0 1 0 0.5 0 0 1 0 0 0 0 1 + + + 1 + 0 + 0 + 0 + 0.5 + + + + + + 1 + 0 + + + + + + 1 + 0 + + + + + + 0 + + + + + + 0 0 0 + 0 0 1 0 + 0 1 0 0 + 1 0 0 0 + 1 1 1 + + #Armature_Bone + + + + + + + + \ No newline at end of file diff --git a/src/.gdb_history b/src/.gdb_history deleted file mode 100644 index bbc42a3..0000000 --- a/src/.gdb_history +++ /dev/null @@ -1,18 +0,0 @@ -new-ui mi /dev/pts/4 -break moveCamera -k -q -new-ui mi /dev/pts/6 -break moveCamera(bool, bool, bool, bool) -r -c -n -c -n -delete -set confirm off -break rotateCamera(int, int) -r -n -k -q diff --git a/src/renderer.h b/src/renderer.h index ecb54d5..928b37e 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -451,7 +451,7 @@ createScene(std::vector* hexes, Entity* entities, uint32 entity_count) // TODO: Testing Entities/assimp model loading g_entity_render_group.entity = &entities[0]; - entities[0].model_transform = glm::scale(glm::mat4(1), glm::vec3(10, 10, 10)); + entities[0].model_transform = glm::scale(glm::mat4(1), glm::vec3(100, 100, 100)); uint entity_buf_len = entities[0].num_vertices * 3; GLfloat* entity_buf = (GLfloat*) std::calloc(entity_buf_len, sizeof(GLfloat));