diff --git a/TODO.md b/TODO.md index 5d5a60f..afd6937 100644 --- a/TODO.md +++ b/TODO.md @@ -17,8 +17,10 @@ - pass in frame time to camera movement functions to decouple speed from framerate - test camera speed when moving with composite vector - may be fixed?? need to test by examining camera position between frames and compare the distance - - show debug mesh for light positions - - attenuate point lights in shader + - debug lighting (using multiple lights doesn't add correctly atm + - move glUniform call to lights[i].position out of rgDraw, and into scene_loader init phase + - show debug mesh for light positions + - attenuate point lights in shader - remove checks for colors, textures from render_group functions - actually cannot remove checks for texture because some meshes aren't loaded properly - maybe can cause loading mesh to fail when more than one mesh per file diff --git a/data/level.2.dae b/data/level.2.dae index b306928..2cd4c3f 100644 --- a/data/level.2.dae +++ b/data/level.2.dae @@ -5,8 +5,8 @@ Blender User Blender 2.79.6 commit date:2018-12-22, commit time:14:10, hash:2c0c1f494dcf - 2019-01-07T14:49:49 - 2019-01-07T14:49:49 + 2019-01-08T13:41:11 + 2019-01-08T13:41:11 Z_UP @@ -50,9 +50,9 @@ - 1 -1 0 -1 1 0 -1 0 0 1 0 0 0 0 0 -1 -0.5 0 0.5 -1 0 -0.5 1 0 -1 0.5 0 -0.5 -1 0 0 0.5 0 0 -0.5 0 -0.5 -0.5 0 0.5 0.5 0 -1 -0.75 0 1 0.75 0 -0.75 1 0 -1 0.25 0 -0.25 -1 0 1 -0.25 0 0 -0.25 0 0.25 0 0 -1 -0.25 0 -0.75 -1 0 1 -0.75 0 0.75 1 0 0 0.25 0 -0.25 0 0 0.5 -0.75 0 0.25 -0.5 0 0.75 -0.5 0 -0.5 -0.75 0 -0.5 0.75 0 -0.75 0.5 0 0.5 0.75 0 0.75 0.5 0 0.75 0.25 0 -0.75 0.25 0 -0.75 0.75 0 0.75 -0.75 0 0.25 -0.75 0 -0.25 -0.25 0 -0.25 0.75 0 -1.99973 0 0 -1.99973 -0.25 0 -1.99973 0.25 0 -3.99973 0 0 -2.99973 0 0 -2.49973 0 0 -1.99973 -0.75 0 -3.99973 -0.25 0 -2.49973 1 0 -3.49973 0 0 -2.99973 -0.75 0 -2.99973 -0.25 0 -2.49973 -0.25 0 -3.49973 -0.25 0 -1 -1 0 0.75 -1 0 1 1 0 0 -1 0 0.25 1 0 0 1 0 0 0.75 0 -0.75 0 0 0.25 -1 0 1 0.25 0 1 0.5 0 -0.25 1 0 -1 0.75 0 1 -0.5 0 0.5 1 0 0 -0.75 0 -0.5 0 0 0.75 0 0 0.5 0 0 0.5 -0.25 0 0.5 -0.5 0 -0.5 -0.25 0 -0.75 -0.5 0 -0.25 -0.5 0 -0.5 0.25 0 -0.5 0.5 0 -0.25 0.5 0 0.5 0.25 0 0.25 0.5 0 0.25 0.25 0 0.25 0.75 0 -0.25 0.25 0 -0.25 -0.75 0 -0.75 -0.75 0 -0.75 -0.25 0 0.25 -0.25 0 0.75 -0.25 0 0.75 0.75 0 -3.99973 0.75 0 -3.99973 1 0 -1.99973 -1 0 -2.49973 -1 0 -1.99973 1 0 -3.99973 0.25 0 -3.99973 0.5 0 -3.49973 -1 0 -2.99973 -1 0 -3.99973 -0.75 0 -3.99973 -0.5 0 -1.99973 0.75 0 -1.99973 0.5 0 -3.49973 1 0 -2.99973 1 0 -2.99973 0.75 0 -2.99973 0.25 0 -2.99973 0.5 0 -2.49973 0.5 0 -3.49973 0.5 0 -2.99973 -0.5 0 -3.49973 -0.5 0 -2.49973 -0.5 0 -1.99973 -0.5 0 -3.99973 -1 0 -3.49973 -0.75 0 -3.49973 0.25 0 -2.49973 0.25 0 -2.49973 0.75 0 -3.49973 0.75 0 -2.49973 -0.75 0 + 1 -1 0 -1 1 0 -1 0 0 1 0 0 0 0 0 -1 -0.5 0 0.5 -1 0 -0.5 1 0 -1 0.5 0 -0.5 -1 0 0 0.5 0 0 -0.5 0 -0.5 -0.5 0 0.5 0.5 0 -1 -0.75 0 1 0.75 0 -0.75 1 0 -1 0.25 0 -0.25 -1 0 1 -0.25 0 0 -0.25 0 0.25 0 0 -1 -0.25 0 -0.75 -1 0 1 -0.75 0 0.75 1 0 0 0.25 0 -0.25 0 0 0.5 -0.75 0 0.25 -0.5 0 0.75 -0.5 0 -0.5 -0.75 0 -0.5 0.75 0 -0.75 0.5 0 0.5 0.75 0 0.75 0.5 0 0.75 0.25 0 -0.75 0.25 0 -0.75 0.75 0 0.75 -0.75 0 0.25 -0.75 0 -0.25 -0.25 0 -0.25 0.75 0 -1.99973 0 0 -1.99973 -0.25 0 -1.99973 0.25 0 -3.99973 0 0 -2.99973 0 0 -2.49973 0 0 -1.99973 -0.75 0 -3.99973 -0.25 0 -2.49973 1 0 -3.49973 0 0 -2.99973 -0.75 0 -2.99973 -0.25 0 -2.49973 -0.25 0 -3.49973 -0.25 0 -1 -1 0 0.75 -1 0 1 1 0 0 -1 0 0.25 1 0 0 1 0 0 0.75 0 -0.75 0 0 0.25 -1 0 1 0.25 0 1 0.5 0 -0.25 1 0 -1 0.75 0 1 -0.5 0 0.5 1 0 0 -0.75 0 -0.5 0 0 0.75 0 0 0.5 0 0 0.5 -0.25 0 0.5 -0.5 0 -0.5 -0.25 0 -0.75 -0.5 0 -0.25 -0.5 0 -0.5 0.25 0 -0.5 0.5 0 -0.25 0.5 0 0.5 0.25 0 0.25 0.5 0 0.25 0.25 0 0.25 0.75 0 -0.25 0.25 0 -0.25 -0.75 0 -0.75 -0.75 0 -0.75 -0.25 0 0.25 -0.25 0 0.75 -0.25 0 0.75 0.75 0 -3.99973 0.75 0 -3.99973 1 0 -1.99973 -1 0 -2.49973 -1 0 -1.99973 1 0 -3.99973 0.25 0 -3.99973 0.5 0 -3.49973 -1 0 -2.99973 -1 0 -3.99973 -0.75 0 -3.99973 -0.5 0 -1.99973 0.75 0 -1.99973 0.5 0 -3.49973 1 0 -2.99973 1 0 -2.99973 0.75 0 -2.99973 0.25 0 -2.99973 0.5 0 -2.49973 0.5 0 -3.49973 0.5 0 -2.99973 -0.5 0 -3.49973 -0.5 0 -2.49973 -0.5 0 -1.99973 -0.5 0 -3.99973 -1 0 -3.49973 -0.75 0 -3.49973 0.25 0 -2.49973 0.25 0 -2.49973 0.75 0 -3.49973 0.75 0 -2.49973 -0.75 0 -1 1 0.3738793 1 0 0.3738793 -0.5 1 0.3738793 -1 -0.75 0.3738793 1 0.75 0.3738793 -0.75 1 0.3738793 -1 0.25 0.3738793 -0.75 -1 0.3738793 0.75 1 0.3738793 -1.99973 -0.25 0.3738793 -1.99973 -0.75 0.3738793 -3.99973 -0.25 0.3738793 -2.49973 1 0.3738793 -1 -1 0.3738793 0 1 0.3738793 0.25 -1 0.3738793 1 0.25 0.3738793 1 0.5 0.3738793 -1 0.75 0.3738793 -3.99973 1 0.3738793 -2.49973 -1 0.3738793 -3.99973 -0.75 0.3738793 -1.99973 0.5 0.3738793 -3.49973 1 0.3738793 1 -1 0.3738793 -1 -0.5 0.3738793 0.5 -1 0.3738793 -1 0.5 0.3738793 -0.5 -1 0.3738793 -0.25 -1 0.3738793 1 -0.25 0.3738793 -1 -0.25 0.3738793 1 -0.75 0.3738793 -1.99973 0.25 0.3738793 -3.99973 0 0.3738793 0.75 -1 0.3738793 1 1 0.3738793 0 -1 0.3738793 0.25 1 0.3738793 -0.25 1 0.3738793 1 -0.5 0.3738793 0.5 1 0.3738793 -3.99973 0.75 0.3738793 -1.99973 -1 0.3738793 -1.99973 1 0.3738793 -3.99973 0.25 0.3738793 -3.99973 0.5 0.3738793 -3.49973 -1 0.3738793 -2.99973 -1 0.3738793 -3.99973 -0.5 0.3738793 -1.99973 0.75 0.3738793 -2.99973 1 0.3738793 -1.99973 -0.5 0.3738793 -3.99973 -1 0.3738793 -2 1 0.3738793 -2 0.25 0.3738793 -2 0.75 0.3738793 -2 0.5 0.3738793 -2 -0.75 0.3738793 -2 -1 0.3738793 -2 -0.5 0.3738793 -2 -0.25 0.3738793 -0.75 -2 0.3738793 -1 -2 0.3738793 0.25 -2 0.3738793 -2.49973 -2 0.3738793 1 -2 0.3738793 0.5 -2 0.3738793 -0.5 -2 0.3738793 -0.25 -2 0.3738793 0.75 -2 0.3738793 0 -2 0.3738793 -1.99973 -2 0.3738793 -3.49973 -2 0.3738793 -2.99973 -2 0.3738793 -3.99973 -2 0.3738793 -2 -2 0.3738793 -1 2 0.3738793 -0.5 2 0.3738793 -0.75 2 0.3738793 0.75 2 0.3738793 -2.49973 2 0.3738793 0 2 0.3738793 -3.99973 2 0.3738793 -3.49973 2 0.3738793 1 2 0.3738793 0.25 2 0.3738793 -0.25 2 0.3738793 0.5 2 0.3738793 -1.99973 2 0.3738793 -2.99973 2 0.3738793 -2 2 0.3738793 2 0 0.3738793 2 0.75 0.3738793 2 0.25 0.3738793 2 0.5 0.3738793 2 -1 0.3738793 2 -0.25 0.3738793 2 -0.75 0.3738793 2 1 0.3738793 2 -0.5 0.3738793 2 -2 0.3738793 2 2 0.3738793 -4.99973 -0.25 0.3738793 -4.99973 1 0.3738793 -4.99973 -0.75 0.3738793 -4.99973 0 0.3738793 -4.99973 0.75 0.3738793 -4.99973 0.25 0.3738793 -4.99973 0.5 0.3738793 -4.99973 -0.5 0.3738793 -4.99973 -1 0.3738793 -4.99973 -2 0.3738793 -4.99973 2 0.3738793 - + @@ -60,9 +60,9 @@ - 0 0 1 + 0 0 1 0 -1 0 0 1 0 1 0 0 -1 0 0 - + @@ -70,9 +70,9 @@ - 0.1017179 0.9735111 0.1011635 0.9739962 0.1017179 0.9739962 0.1017179 0.9754515 0.1011635 0.9759367 0.1017179 0.9759367 0.1039355 0.9754515 0.1033811 0.9759367 0.1039355 0.9759367 0.1039355 0.9735111 0.1033811 0.9739962 0.1039355 0.9739962 0.1039355 0.9744814 0.1033811 0.9749664 0.1039355 0.9749664 0.1050443 0.9744814 0.1044899 0.9749664 0.1050443 0.9749664 0.1050443 0.9735111 0.1044899 0.9739962 0.1050443 0.9739963 0.1050443 0.9764217 0.1044899 0.9769068 0.1050443 0.9769068 0.1050443 0.9754515 0.1044899 0.9759367 0.1050443 0.9759367 0.1017178 0.9764217 0.1011635 0.9769068 0.1017179 0.9769068 0.1028267 0.9764217 0.1022723 0.9769068 0.1028267 0.9769068 0.1028267 0.9754515 0.1022723 0.9759367 0.1028267 0.9759367 0.1017179 0.9744814 0.1011635 0.9749664 0.1017179 0.9749664 0.1028267 0.9744814 0.1022723 0.9749664 0.1028267 0.9749664 0.1028267 0.9735111 0.1022723 0.9739963 0.1028267 0.9739962 0.1028267 0.9739962 0.1022723 0.9744814 0.1028267 0.9744814 0.1033811 0.9739962 0.1028267 0.9744814 0.1033811 0.9744814 0.1033811 0.9735111 0.1028267 0.9739962 0.1033811 0.9739962 0.1028267 0.9749664 0.1022723 0.9754515 0.1028267 0.9754515 0.1033811 0.9749664 0.1028267 0.9754515 0.1033811 0.9754515 0.1033811 0.9744814 0.1028267 0.9749664 0.1033811 0.9749664 0.1022723 0.9749664 0.1017179 0.9754515 0.1022723 0.9754515 0.1022723 0.9744814 0.1017179 0.9749664 0.1022723 0.9749664 0.1033811 0.9759367 0.1028267 0.9764217 0.1033811 0.9764217 0.1033811 0.9754515 0.1028267 0.9759367 0.1033811 0.9759367 0.1028267 0.9769068 0.1022723 0.977392 0.1028267 0.977392 0.1033811 0.9769068 0.1028267 0.977392 0.1033811 0.977392 0.1033811 0.9764217 0.1028267 0.9769068 0.1033811 0.9769068 0.1017179 0.9769068 0.1011635 0.977392 0.1017179 0.977392 0.1022723 0.9769068 0.1017179 0.977392 0.1022723 0.977392 0.1022723 0.9764217 0.1017179 0.9769068 0.1022723 0.9769068 0.1050443 0.9759367 0.1044899 0.9764217 0.1050443 0.9764217 0.1055987 0.9759367 0.1050443 0.9764217 0.1055987 0.9764217 0.1055987 0.9754515 0.1050443 0.9759367 0.1055987 0.9759367 0.1050443 0.9769068 0.1044899 0.977392 0.1050443 0.977392 0.1055987 0.9769068 0.1050443 0.977392 0.1055987 0.977392 0.1055987 0.9764217 0.1050443 0.9769068 0.1055987 0.9769068 0.1039355 0.9769068 0.1033811 0.977392 0.1039355 0.977392 0.1044899 0.9769068 0.1039355 0.977392 0.1044899 0.977392 0.1044899 0.9764217 0.1039355 0.9769068 0.1044899 0.9769068 0.1050443 0.9739963 0.1044899 0.9744814 0.1050443 0.9744814 0.1055987 0.9739963 0.1050443 0.9744814 0.1055987 0.9744814 0.1055987 0.9735111 0.1050443 0.9739963 0.1055987 0.9739963 0.1050443 0.9749664 0.1044899 0.9754515 0.1050443 0.9754515 0.1055987 0.9749664 0.1050443 0.9754515 0.1055987 0.9754515 0.1055987 0.9744814 0.1050443 0.9749664 0.1055987 0.9749664 0.1039355 0.9749664 0.1033811 0.9754515 0.1039355 0.9754515 0.1044899 0.9749664 0.1039355 0.9754515 0.1044899 0.9754515 0.1044899 0.9744814 0.1039355 0.9749664 0.1044899 0.9749664 0.1044899 0.9739962 0.1039355 0.9744814 0.1044899 0.9744814 0.1044899 0.9735111 0.1039355 0.9739962 0.1044899 0.9739962 0.1039355 0.9759367 0.1033811 0.9764217 0.1039355 0.9764217 0.1044899 0.9759367 0.1039355 0.9764217 0.1044899 0.9764217 0.1044899 0.9754515 0.1039355 0.9759367 0.1044899 0.9759367 0.1017179 0.9759367 0.1011635 0.9764217 0.1017178 0.9764217 0.1022723 0.9759367 0.1017178 0.9764217 0.1022723 0.9764217 0.1022723 0.9754515 0.1017179 0.9759367 0.1022723 0.9759367 0.1017179 0.9739962 0.1011635 0.9744814 0.1017179 0.9744814 0.1022723 0.9739963 0.1017179 0.9744814 0.1022723 0.9744814 0.1022723 0.9735111 0.1017179 0.9739962 0.1022723 0.9739963 0.1033811 0.977392 0.1039355 0.9793319 0.1039355 0.977392 0.1028267 0.977392 0.1033811 0.9793319 0.1033811 0.977392 0.1055987 0.9744814 0.1061531 0.9735111 0.1061531 0.9744814 0.1072619 0.9783621 0.1078163 0.977392 0.1078163 0.9783621 0.1055987 0.9764217 0.1061531 0.9754515 0.1061531 0.9764217 0.1067075 0.9764217 0.1072619 0.9754515 0.1072619 0.9764217 0.1067075 0.9744814 0.1072619 0.9735111 0.1072619 0.9744814 0.1067075 0.9754515 0.1072619 0.9744814 0.1072619 0.9754515 0.1072619 0.9754515 0.1078163 0.9744814 0.1078163 0.9754515 0.1072619 0.9744814 0.1078163 0.9735111 0.1078163 0.9744814 0.1067075 0.977392 0.1072619 0.9764217 0.1072619 0.977392 0.1072619 0.977392 0.1078163 0.9764217 0.1078163 0.977392 0.1072619 0.9764217 0.1078163 0.9754515 0.1078163 0.9764217 0.1061531 0.9764217 0.1067075 0.9754515 0.1067075 0.9764217 0.1083707 0.9754515 0.1078163 0.9764217 0.1078163 0.9754515 0.1083707 0.9764217 0.1078163 0.977392 0.1078163 0.9764217 0.1089251 0.9735111 0.1083707 0.9744814 0.1083707 0.9735111 0.1083707 0.9735111 0.1078163 0.9744814 0.1078163 0.9735111 0.1083707 0.9744814 0.1078163 0.9754515 0.1078163 0.9744814 0.1072619 0.9793323 0.1078163 0.9783621 0.1078163 0.9793323 0.1055987 0.9754515 0.1061531 0.9744814 0.1061531 0.9754515 0.1061531 0.9754515 0.1067075 0.9744814 0.1067075 0.9754515 0.1061531 0.9744814 0.1067075 0.9735111 0.1067075 0.9744814 0.1033811 0.9793319 0.1039355 0.9798169 0.1033811 0.9798169 0.1044899 0.9793319 0.1039355 0.9798169 0.1039355 0.9793319 0.1028267 0.9793319 0.1022723 0.9798169 0.1022723 0.9793319 0.1028267 0.9793319 0.1033811 0.9798169 0.1028267 0.9798169 0.1055987 0.9803026 0.1061531 0.9812727 0.1061531 0.9803026 0.1067075 0.9783621 0.1072619 0.9793323 0.1072619 0.9783621 0.1067075 0.9803026 0.1072619 0.9812727 0.1072619 0.9803026 0.1011635 0.980302 0.1022723 0.9798169 0.1011635 0.9798169 0.1011635 0.9798169 0.1022723 0.9793319 0.1011635 0.9793319 0.1067075 0.9793323 0.1072619 0.9803026 0.1072619 0.9793323 0.1061531 0.977392 0.1067075 0.9783621 0.1067075 0.977392 0.1061531 0.9783621 0.1067075 0.9793323 0.1067075 0.9783621 0.1055987 0.9793323 0.1061531 0.9803026 0.1061531 0.9793323 0.1061531 0.9793323 0.1067075 0.9803026 0.1067075 0.9793323 0.1061531 0.9803026 0.1067075 0.9812727 0.1067075 0.9803026 0.1017179 0.9735111 0.1011635 0.9735111 0.1011635 0.9739962 0.1017179 0.9754515 0.1011635 0.9754515 0.1011635 0.9759367 0.1039355 0.9754515 0.1033811 0.9754515 0.1033811 0.9759367 0.1039355 0.9735111 0.1033811 0.9735111 0.1033811 0.9739962 0.1039355 0.9744814 0.1033811 0.9744814 0.1033811 0.9749664 0.1050443 0.9744814 0.1044899 0.9744814 0.1044899 0.9749664 0.1050443 0.9735111 0.1044899 0.9735111 0.1044899 0.9739962 0.1050443 0.9764217 0.1044899 0.9764217 0.1044899 0.9769068 0.1050443 0.9754515 0.1044899 0.9754515 0.1044899 0.9759367 0.1017178 0.9764217 0.1011635 0.9764217 0.1011635 0.9769068 0.1028267 0.9764217 0.1022723 0.9764217 0.1022723 0.9769068 0.1028267 0.9754515 0.1022723 0.9754515 0.1022723 0.9759367 0.1017179 0.9744814 0.1011635 0.9744814 0.1011635 0.9749664 0.1028267 0.9744814 0.1022723 0.9744814 0.1022723 0.9749664 0.1028267 0.9735111 0.1022723 0.9735111 0.1022723 0.9739963 0.1028267 0.9739962 0.1022723 0.9739963 0.1022723 0.9744814 0.1033811 0.9739962 0.1028267 0.9739962 0.1028267 0.9744814 0.1033811 0.9735111 0.1028267 0.9735111 0.1028267 0.9739962 0.1028267 0.9749664 0.1022723 0.9749664 0.1022723 0.9754515 0.1033811 0.9749664 0.1028267 0.9749664 0.1028267 0.9754515 0.1033811 0.9744814 0.1028267 0.9744814 0.1028267 0.9749664 0.1022723 0.9749664 0.1017179 0.9749664 0.1017179 0.9754515 0.1022723 0.9744814 0.1017179 0.9744814 0.1017179 0.9749664 0.1033811 0.9759367 0.1028267 0.9759367 0.1028267 0.9764217 0.1033811 0.9754515 0.1028267 0.9754515 0.1028267 0.9759367 0.1028267 0.9769068 0.1022723 0.9769068 0.1022723 0.977392 0.1033811 0.9769068 0.1028267 0.9769068 0.1028267 0.977392 0.1033811 0.9764217 0.1028267 0.9764217 0.1028267 0.9769068 0.1017179 0.9769068 0.1011635 0.9769068 0.1011635 0.977392 0.1022723 0.9769068 0.1017179 0.9769068 0.1017179 0.977392 0.1022723 0.9764217 0.1017178 0.9764217 0.1017179 0.9769068 0.1050443 0.9759367 0.1044899 0.9759367 0.1044899 0.9764217 0.1055987 0.9759367 0.1050443 0.9759367 0.1050443 0.9764217 0.1055987 0.9754515 0.1050443 0.9754515 0.1050443 0.9759367 0.1050443 0.9769068 0.1044899 0.9769068 0.1044899 0.977392 0.1055987 0.9769068 0.1050443 0.9769068 0.1050443 0.977392 0.1055987 0.9764217 0.1050443 0.9764217 0.1050443 0.9769068 0.1039355 0.9769068 0.1033811 0.9769068 0.1033811 0.977392 0.1044899 0.9769068 0.1039355 0.9769068 0.1039355 0.977392 0.1044899 0.9764217 0.1039355 0.9764217 0.1039355 0.9769068 0.1050443 0.9739963 0.1044899 0.9739962 0.1044899 0.9744814 0.1055987 0.9739963 0.1050443 0.9739963 0.1050443 0.9744814 0.1055987 0.9735111 0.1050443 0.9735111 0.1050443 0.9739963 0.1050443 0.9749664 0.1044899 0.9749664 0.1044899 0.9754515 0.1055987 0.9749664 0.1050443 0.9749664 0.1050443 0.9754515 0.1055987 0.9744814 0.1050443 0.9744814 0.1050443 0.9749664 0.1039355 0.9749664 0.1033811 0.9749664 0.1033811 0.9754515 0.1044899 0.9749664 0.1039355 0.9749664 0.1039355 0.9754515 0.1044899 0.9744814 0.1039355 0.9744814 0.1039355 0.9749664 0.1044899 0.9739962 0.1039355 0.9739962 0.1039355 0.9744814 0.1044899 0.9735111 0.1039355 0.9735111 0.1039355 0.9739962 0.1039355 0.9759367 0.1033811 0.9759367 0.1033811 0.9764217 0.1044899 0.9759367 0.1039355 0.9759367 0.1039355 0.9764217 0.1044899 0.9754515 0.1039355 0.9754515 0.1039355 0.9759367 0.1017179 0.9759367 0.1011635 0.9759367 0.1011635 0.9764217 0.1022723 0.9759367 0.1017179 0.9759367 0.1017178 0.9764217 0.1022723 0.9754515 0.1017179 0.9754515 0.1017179 0.9759367 0.1017179 0.9739962 0.1011635 0.9739962 0.1011635 0.9744814 0.1022723 0.9739963 0.1017179 0.9739962 0.1017179 0.9744814 0.1022723 0.9735111 0.1017179 0.9735111 0.1017179 0.9739962 0.1033811 0.977392 0.1033811 0.9793319 0.1039355 0.9793319 0.1028267 0.977392 0.1028267 0.9793319 0.1033811 0.9793319 0.1055987 0.9744814 0.1055987 0.9735111 0.1061531 0.9735111 0.1072619 0.9783621 0.1072619 0.977392 0.1078163 0.977392 0.1055987 0.9764217 0.1055987 0.9754515 0.1061531 0.9754515 0.1067075 0.9764217 0.1067075 0.9754515 0.1072619 0.9754515 0.1067075 0.9744814 0.1067075 0.9735111 0.1072619 0.9735111 0.1067075 0.9754515 0.1067075 0.9744814 0.1072619 0.9744814 0.1072619 0.9754515 0.1072619 0.9744814 0.1078163 0.9744814 0.1072619 0.9744814 0.1072619 0.9735111 0.1078163 0.9735111 0.1067075 0.977392 0.1067075 0.9764217 0.1072619 0.9764217 0.1072619 0.977392 0.1072619 0.9764217 0.1078163 0.9764217 0.1072619 0.9764217 0.1072619 0.9754515 0.1078163 0.9754515 0.1061531 0.9764217 0.1061531 0.9754515 0.1067075 0.9754515 0.1083707 0.9754515 0.1083707 0.9764217 0.1078163 0.9764217 0.1083707 0.9764217 0.1083707 0.977392 0.1078163 0.977392 0.1089251 0.9735111 0.1089251 0.9744814 0.1083707 0.9744814 0.1083707 0.9735111 0.1083707 0.9744814 0.1078163 0.9744814 0.1083707 0.9744814 0.1083707 0.9754515 0.1078163 0.9754515 0.1072619 0.9793323 0.1072619 0.9783621 0.1078163 0.9783621 0.1055987 0.9754515 0.1055987 0.9744814 0.1061531 0.9744814 0.1061531 0.9754515 0.1061531 0.9744814 0.1067075 0.9744814 0.1061531 0.9744814 0.1061531 0.9735111 0.1067075 0.9735111 0.1033811 0.9793319 0.1039355 0.9793319 0.1039355 0.9798169 0.1044899 0.9793319 0.1044899 0.9798169 0.1039355 0.9798169 0.1028267 0.9793319 0.1028267 0.9798169 0.1022723 0.9798169 0.1028267 0.9793319 0.1033811 0.9793319 0.1033811 0.9798169 0.1055987 0.9803026 0.1055987 0.9812727 0.1061531 0.9812727 0.1067075 0.9783621 0.1067075 0.9793323 0.1072619 0.9793323 0.1067075 0.9803026 0.1067075 0.9812727 0.1072619 0.9812727 0.1011635 0.980302 0.1022723 0.980302 0.1022723 0.9798169 0.1011635 0.9798169 0.1022723 0.9798169 0.1022723 0.9793319 0.1067075 0.9793323 0.1067075 0.9803026 0.1072619 0.9803026 0.1061531 0.977392 0.1061531 0.9783621 0.1067075 0.9783621 0.1061531 0.9783621 0.1061531 0.9793323 0.1067075 0.9793323 0.1055987 0.9793323 0.1055987 0.9803026 0.1061531 0.9803026 0.1061531 0.9793323 0.1061531 0.9803026 0.1067075 0.9803026 0.1061531 0.9803026 0.1061531 0.9812727 0.1067075 0.9812727 + 0.09179294 0.9732168 0.09210407 0.9734588 0.09179294 0.9734588 0.09179294 0.9741848 0.09210407 0.9744268 0.09179294 0.9744268 0.09054845 0.9741848 0.09085959 0.9744268 0.09054845 0.9744268 0.09054845 0.9732168 0.09085959 0.9734588 0.09054845 0.9734588 0.09054845 0.9737008 0.09085959 0.9739428 0.09054845 0.9739428 0.08992624 0.9737008 0.09023737 0.9739428 0.08992624 0.9739428 0.08992624 0.9732168 0.09023731 0.9734588 0.08992624 0.9734588 0.08992624 0.9746688 0.09023731 0.9749107 0.08992624 0.9749107 0.08992624 0.9741848 0.09023737 0.9744268 0.08992624 0.9744268 0.09179294 0.9746688 0.09210407 0.9749107 0.09179294 0.9749107 0.09117072 0.9746688 0.09148186 0.9749107 0.09117072 0.9749107 0.09117072 0.9741848 0.09148186 0.9744268 0.09117072 0.9744268 0.09179294 0.9737008 0.09210407 0.9739428 0.09179294 0.9739428 0.09117072 0.9737008 0.09148186 0.9739428 0.09117072 0.9739428 0.09117072 0.9732168 0.09148186 0.9734588 0.09117072 0.9734588 0.09117072 0.9734588 0.09148186 0.9737008 0.09117072 0.9737008 0.09085959 0.9734588 0.09117072 0.9737008 0.09085959 0.9737008 0.09085959 0.9732168 0.09117072 0.9734588 0.09085959 0.9734588 0.09117072 0.9739428 0.09148186 0.9741848 0.09117072 0.9741848 0.09085959 0.9739428 0.09117072 0.9741848 0.09085959 0.9741848 0.09085959 0.9737008 0.09117072 0.9739428 0.09085959 0.9739428 0.09148186 0.9739428 0.09179294 0.9741848 0.09148186 0.9741848 0.09148186 0.9737008 0.09179294 0.9739428 0.09148186 0.9739428 0.09085959 0.9744268 0.09117072 0.9746688 0.09085959 0.9746688 0.09085959 0.9741848 0.09117072 0.9744268 0.09085959 0.9744268 0.09117072 0.9749107 0.09148186 0.9751527 0.09117072 0.9751527 0.09085959 0.9749107 0.09117072 0.9751527 0.09085959 0.9751527 0.09085959 0.9746688 0.09117072 0.9749107 0.09085959 0.9749107 0.09179294 0.9749107 0.09210407 0.9751527 0.09179294 0.9751527 0.09148186 0.9749107 0.09179294 0.9751527 0.09148186 0.9751527 0.09148186 0.9746688 0.09179294 0.9749107 0.09148186 0.9749107 0.08992624 0.9744268 0.09023731 0.9746688 0.08992624 0.9746688 0.0896151 0.9744268 0.08992624 0.9746688 0.0896151 0.9746688 0.0896151 0.9741848 0.08992624 0.9744268 0.0896151 0.9744268 0.08992624 0.9749107 0.09023731 0.9751527 0.08992624 0.9751527 0.0896151 0.9749107 0.08992624 0.9751527 0.0896151 0.9751527 0.0896151 0.9746688 0.08992624 0.9749107 0.0896151 0.9749107 0.09054845 0.9749107 0.09085959 0.9751527 0.09054845 0.9751527 0.09023731 0.9749107 0.09054845 0.9751527 0.09023731 0.9751527 0.09023731 0.9746688 0.09054845 0.9749107 0.09023731 0.9749107 0.08992624 0.9734588 0.09023731 0.9737008 0.08992624 0.9737008 0.0896151 0.9734588 0.08992624 0.9737008 0.0896151 0.9737008 0.0896151 0.9732168 0.08992624 0.9734588 0.0896151 0.9734588 0.08992624 0.9739428 0.09023737 0.9741848 0.08992624 0.9741848 0.0896151 0.9739428 0.08992624 0.9741848 0.0896151 0.9741848 0.0896151 0.9737008 0.08992624 0.9739428 0.0896151 0.9739428 0.09054845 0.9739428 0.09085959 0.9741848 0.09054845 0.9741848 0.09023737 0.9739428 0.09054845 0.9741848 0.09023737 0.9741848 0.09023731 0.9737008 0.09054845 0.9739428 0.09023737 0.9739428 0.09023731 0.9734588 0.09054845 0.9737008 0.09023731 0.9737008 0.09023731 0.9732168 0.09054845 0.9734588 0.09023731 0.9734588 0.09054845 0.9744268 0.09085959 0.9746688 0.09054845 0.9746688 0.09023737 0.9744268 0.09054845 0.9746688 0.09023731 0.9746688 0.09023737 0.9741848 0.09054845 0.9744268 0.09023737 0.9744268 0.09179294 0.9744268 0.09210407 0.9746688 0.09179294 0.9746688 0.09148186 0.9744268 0.09179294 0.9746688 0.09148186 0.9746688 0.09148186 0.9741848 0.09179294 0.9744268 0.09148186 0.9744268 0.09179294 0.9734588 0.09210407 0.9737008 0.09179294 0.9737008 0.09148186 0.9734588 0.09179294 0.9737008 0.09148186 0.9737008 0.09148186 0.9732168 0.09179294 0.9734588 0.09148186 0.9734588 0.09085959 0.9751527 0.09054845 0.9761205 0.09054845 0.9751527 0.09117072 0.9751527 0.09085959 0.9761205 0.09085959 0.9751527 0.0896151 0.9766045 0.08992624 0.9761205 0.08992624 0.9766045 0.09210407 0.9766045 0.09179294 0.9770884 0.09179294 0.9766045 0.0896151 0.9775724 0.08992624 0.9770884 0.08992624 0.9775724 0.09023731 0.9775724 0.09054845 0.9770884 0.09054845 0.9775724 0.09023737 0.9766045 0.09054845 0.9761205 0.09054845 0.9766045 0.09023731 0.9770884 0.09054845 0.9766045 0.09054845 0.9770884 0.09054845 0.9770884 0.09085959 0.9766045 0.09085959 0.9770884 0.09054845 0.9766045 0.09085959 0.9761205 0.09085959 0.9766045 0.09023731 0.9780564 0.09054845 0.9775724 0.09054845 0.9780564 0.09054845 0.9780564 0.09085959 0.9775724 0.09085959 0.9780564 0.09054845 0.9775724 0.09085959 0.9770884 0.09085959 0.9775724 0.08992624 0.9775724 0.09023731 0.9770884 0.09023731 0.9775724 0.09117072 0.9770884 0.09085959 0.9775724 0.09085959 0.9770884 0.09117072 0.9775724 0.09085959 0.9780564 0.09085959 0.9775724 0.09148186 0.9761205 0.09117072 0.9766045 0.09117072 0.9761205 0.09117072 0.9761205 0.09085959 0.9766045 0.09085959 0.9761205 0.09117072 0.9766045 0.09085959 0.9770884 0.09085959 0.9766045 0.09210407 0.9761205 0.09179294 0.9766045 0.09179294 0.9761205 0.0896151 0.9770884 0.08992624 0.9766045 0.08992624 0.9770884 0.08992624 0.9770884 0.09023737 0.9766045 0.09023731 0.9770884 0.08992624 0.9766045 0.09023731 0.9761205 0.09023737 0.9766045 0.09054845 0.9746688 0.09085959 0.9749107 0.09054845 0.9749107 0.09179294 0.9739428 0.09210407 0.9741848 0.09179294 0.9741848 0.09117072 0.9744268 0.09148186 0.9746688 0.09117072 0.9746688 0.09054845 0.9734588 0.09085959 0.9737008 0.09054845 0.9737008 0.09210407 0.9775724 0.09179294 0.9780564 0.09179294 0.9775724 0.09148186 0.9766045 0.09117072 0.9770884 0.09117072 0.9766045 0.09148186 0.9775724 0.09117072 0.9780564 0.09117072 0.9775724 0.0896151 0.9780564 0.08992624 0.9775724 0.08992624 0.9780564 0.08992624 0.9780564 0.09023731 0.9775724 0.09023731 0.9780564 0.09148186 0.9770884 0.09117072 0.9775724 0.09117072 0.9770884 0.09179294 0.9761205 0.09148186 0.9766045 0.09148186 0.9761205 0.09179294 0.9766045 0.09148186 0.9770884 0.09148186 0.9766045 0.09210407 0.9770884 0.09179294 0.9775724 0.09179294 0.9770884 0.09179294 0.9770884 0.09148186 0.9775724 0.09148186 0.9770884 0.09179294 0.9775724 0.09148186 0.9780564 0.09148186 0.9775724 0.09349995 0.9732168 0.09396523 0.9734588 0.09349995 0.9734588 0.09256935 0.9734588 0.09210407 0.9732168 0.09256935 0.9732168 0.09489583 0.9734588 0.09443056 0.9732168 0.09489583 0.9732168 0.09489583 0.9744268 0.09443056 0.9741848 0.09489583 0.9741848 0.09349995 0.9749107 0.09396523 0.9751527 0.09349995 0.9751527 0.09443056 0.9734588 0.09396523 0.9732168 0.09443056 0.9732168 0.09675699 0.9741848 0.09629172 0.9739428 0.09675699 0.9739428 0.09582638 0.9741845 0.09536111 0.9732168 0.09582638 0.9732168 0.09256935 0.9744268 0.09210407 0.9741848 0.09256935 0.9741848 0.09303468 0.9746688 0.09349995 0.9751527 0.09303468 0.9751527 0.09443056 0.9744268 0.09396523 0.9741848 0.09443056 0.9741848 0.09256935 0.9739428 0.09210407 0.9737008 0.09256935 0.9737008 0.09349995 0.9739428 0.09396523 0.9741848 0.09349995 0.9741848 0.09349995 0.9744268 0.09396523 0.9746688 0.09349995 0.9746688 0.09582638 0.9741848 0.09629172 0.9744268 0.09582638 0.9744268 0.09629172 0.9739428 0.09582638 0.9737008 0.09629172 0.9737008 0.09443056 0.9739428 0.09396523 0.9737008 0.09443056 0.9737008 0.09256935 0.9749107 0.09210407 0.9746688 0.09256935 0.9746688 0.09443056 0.9749107 0.09396523 0.9746688 0.09443056 0.9746688 0.09349995 0.9734588 0.09396523 0.9737008 0.09349995 0.9737008 0.09489583 0.9751527 0.09443056 0.9749107 0.09489583 0.9749107 0.09675699 0.9734588 0.09629172 0.9732168 0.09675699 0.9732168 0.09303468 0.9737008 0.09256935 0.9732168 0.09303468 0.9732168 0.09675699 0.9746688 0.09629172 0.9744268 0.09675699 0.9744268 0.09489583 0.9746688 0.09443056 0.9744268 0.09489583 0.9744268 0.09349995 0.9737008 0.09396523 0.9739428 0.09349995 0.9739428 0.09303468 0.9746688 0.09256935 0.9741848 0.09303468 0.9741848 0.09629172 0.9737008 0.09582638 0.9734588 0.09629172 0.9734588 0.09489583 0.9737008 0.09443056 0.9734588 0.09489583 0.9734588 0.09256935 0.9741848 0.09210407 0.9739428 0.09256935 0.9739428 0.09489583 0.9732168 0.09536111 0.9741845 0.09489583 0.9741845 0.09349995 0.9746688 0.09396523 0.9749107 0.09349995 0.9749107 0.09675699 0.9744268 0.09629172 0.9741848 0.09675699 0.9741848 0.09349995 0.9741848 0.09396523 0.9744268 0.09349995 0.9744268 0.09582638 0.9744268 0.09629172 0.9746688 0.09582638 0.9746688 0.09303468 0.9741848 0.09349995 0.9746688 0.09303468 0.9746688 0.09489583 0.9741848 0.09443056 0.9739428 0.09489583 0.9739428 0.09256935 0.9746688 0.09210407 0.9744268 0.09256935 0.9744268 0.09256935 0.9737008 0.09210407 0.9734588 0.09256935 0.9734588 0.09443056 0.9737008 0.09396523 0.9734588 0.09443056 0.9734588 0.09675699 0.9739428 0.09629172 0.9737008 0.09675699 0.9737008 0.09443056 0.9746688 0.09396523 0.9744268 0.09443056 0.9744268 0.09443056 0.9751527 0.09396523 0.9749107 0.09443056 0.9749107 0.09303468 0.9732168 0.09349995 0.9737008 0.09303468 0.9737008 0.09443056 0.9741848 0.09396523 0.9739428 0.09443056 0.9739428 0.09489583 0.9749107 0.09443056 0.9746688 0.09489583 0.9746688 0.09675699 0.9737008 0.09629172 0.9734588 0.09675699 0.9734588 0.09582638 0.9739428 0.09629172 0.9741848 0.09582638 0.9741848 0.09303468 0.9741848 0.09256935 0.9737008 0.09303468 0.9737008 0.09489583 0.9739428 0.09443056 0.9737008 0.09489583 0.9737008 0.09256935 0.9751527 0.09210407 0.9749107 0.09256935 0.9749107 0.09629172 0.9734588 0.09582638 0.9732168 0.09629172 0.9732168 0.09303468 0.9751527 0.09256935 0.9746688 0.09303468 0.9746688 0.09303468 0.9737008 0.09349995 0.9741848 0.09303468 0.9741848 0.09303742 0.9722489 0.09272634 0.9732168 0.09272634 0.9722489 0.09272634 0.9722489 0.09241521 0.9732168 0.09241521 0.9722489 0.09334856 0.9722489 0.09303742 0.9732168 0.09303742 0.9722489 0.09148186 0.9722489 0.09117072 0.9732168 0.09117072 0.9722489 0.09179294 0.9722489 0.09148186 0.9732168 0.09148186 0.9722489 0.09117072 0.9722489 0.09085959 0.9732168 0.09085959 0.9722489 0.09085959 0.9715229 0.0896151 0.9712809 0.09085959 0.9712809 0.09085959 0.9710389 0.0896151 0.970797 0.09085959 0.970797 0.09770429 0.970313 0.09832656 0.969345 0.09832656 0.970313 0.09085959 0.970797 0.0896151 0.970555 0.09085959 0.970555 0.09085959 0.9722489 0.0896151 0.9720069 0.09085959 0.9720069 0.0964598 0.970313 0.09708207 0.969345 0.09708207 0.970313 0.09085959 0.9732168 0.0896151 0.9722489 0.09085959 0.9722489 0.09583759 0.970313 0.0964598 0.969345 0.0964598 0.970313 0.09708207 0.970313 0.09770429 0.969345 0.09770429 0.970313 0.09085959 0.9712809 0.0896151 0.9710389 0.09085959 0.9710389 0.09085959 0.9717649 0.0896151 0.9715229 0.09085959 0.9715229 0.09085959 0.9720069 0.0896151 0.9717649 0.09085959 0.9717649 0.09085959 0.970555 0.0896151 0.970313 0.09085959 0.970313 0.09832656 0.9722489 0.09770429 0.9732168 0.09770429 0.9722489 0.09334856 0.970797 0.0945931 0.9710389 0.09334856 0.9710389 0.09334856 0.9720069 0.0945931 0.9722489 0.09334856 0.9722489 0.09334856 0.9715229 0.0945931 0.9717649 0.09334856 0.9717649 0.09334856 0.9717649 0.0945931 0.9720069 0.09334856 0.9720069 0.09770429 0.9722489 0.09708207 0.9732168 0.09708207 0.9722489 0.09334856 0.970555 0.0945931 0.970797 0.09334856 0.970797 0.09708207 0.9722489 0.0964598 0.9732168 0.0964598 0.9722489 0.0964598 0.9722489 0.09583759 0.9732168 0.09583759 0.9722489 0.09334856 0.9722489 0.0945931 0.9732168 0.09334856 0.9732168 0.09334856 0.9710389 0.0945931 0.9712809 0.09334856 0.9712809 0.09334856 0.970313 0.0945931 0.970555 0.09334856 0.970555 0.09334856 0.9712809 0.0945931 0.9715229 0.09334856 0.9715229 0.09272634 0.970313 0.09303742 0.969345 0.09303742 0.970313 0.09148186 0.970313 0.09179294 0.969345 0.09179294 0.970313 0.09241521 0.970313 0.09272634 0.969345 0.09272634 0.970313 0.09210407 0.970313 0.09241521 0.969345 0.09241521 0.970313 0.0896151 0.970313 0.09085959 0.969345 0.09085959 0.970313 0.09117072 0.970313 0.09148186 0.969345 0.09148186 0.970313 0.09334856 0.970313 0.0945931 0.969345 0.0945931 0.970313 0.09179294 0.970313 0.09210407 0.969345 0.09210407 0.970313 0.09303742 0.970313 0.09334856 0.969345 0.09334856 0.970313 0.09085959 0.970313 0.09117072 0.969345 0.09117072 0.970313 0.09583759 0.9720069 0.0945931 0.9717649 0.09583759 0.9717649 0.09583759 0.9712809 0.0945931 0.9710389 0.09583759 0.9710389 0.09583759 0.970797 0.0945931 0.970555 0.09583759 0.970555 0.09583759 0.9710389 0.0945931 0.970797 0.09583759 0.970797 0.09583759 0.9715229 0.0945931 0.9712809 0.09583759 0.9712809 0.09583759 0.970555 0.0945931 0.970313 0.09583759 0.970313 0.09583759 0.9717649 0.0945931 0.9715229 0.09583759 0.9715229 0.09583759 0.9722489 0.0945931 0.9720069 0.09583759 0.9720069 0.09583759 0.9732168 0.0945931 0.9722489 0.09583759 0.9722489 0.09583759 0.970313 0.0945931 0.969345 0.09583759 0.969345 0.09179294 0.9732168 0.09210407 0.9732168 0.09210407 0.9734588 0.09179294 0.9741848 0.09210407 0.9741848 0.09210407 0.9744268 0.09054845 0.9741848 0.09085959 0.9741848 0.09085959 0.9744268 0.09054845 0.9732168 0.09085959 0.9732168 0.09085959 0.9734588 0.09054845 0.9737008 0.09085959 0.9737008 0.09085959 0.9739428 0.08992624 0.9737008 0.09023731 0.9737008 0.09023737 0.9739428 0.08992624 0.9732168 0.09023731 0.9732168 0.09023731 0.9734588 0.08992624 0.9746688 0.09023731 0.9746688 0.09023731 0.9749107 0.08992624 0.9741848 0.09023737 0.9741848 0.09023737 0.9744268 0.09179294 0.9746688 0.09210407 0.9746688 0.09210407 0.9749107 0.09117072 0.9746688 0.09148186 0.9746688 0.09148186 0.9749107 0.09117072 0.9741848 0.09148186 0.9741848 0.09148186 0.9744268 0.09179294 0.9737008 0.09210407 0.9737008 0.09210407 0.9739428 0.09117072 0.9737008 0.09148186 0.9737008 0.09148186 0.9739428 0.09117072 0.9732168 0.09148186 0.9732168 0.09148186 0.9734588 0.09117072 0.9734588 0.09148186 0.9734588 0.09148186 0.9737008 0.09085959 0.9734588 0.09117072 0.9734588 0.09117072 0.9737008 0.09085959 0.9732168 0.09117072 0.9732168 0.09117072 0.9734588 0.09117072 0.9739428 0.09148186 0.9739428 0.09148186 0.9741848 0.09085959 0.9739428 0.09117072 0.9739428 0.09117072 0.9741848 0.09085959 0.9737008 0.09117072 0.9737008 0.09117072 0.9739428 0.09148186 0.9739428 0.09179294 0.9739428 0.09179294 0.9741848 0.09148186 0.9737008 0.09179294 0.9737008 0.09179294 0.9739428 0.09085959 0.9744268 0.09117072 0.9744268 0.09117072 0.9746688 0.09085959 0.9741848 0.09117072 0.9741848 0.09117072 0.9744268 0.09117072 0.9749107 0.09148186 0.9749107 0.09148186 0.9751527 0.09085959 0.9749107 0.09117072 0.9749107 0.09117072 0.9751527 0.09085959 0.9746688 0.09117072 0.9746688 0.09117072 0.9749107 0.09179294 0.9749107 0.09210407 0.9749107 0.09210407 0.9751527 0.09148186 0.9749107 0.09179294 0.9749107 0.09179294 0.9751527 0.09148186 0.9746688 0.09179294 0.9746688 0.09179294 0.9749107 0.08992624 0.9744268 0.09023737 0.9744268 0.09023731 0.9746688 0.0896151 0.9744268 0.08992624 0.9744268 0.08992624 0.9746688 0.0896151 0.9741848 0.08992624 0.9741848 0.08992624 0.9744268 0.08992624 0.9749107 0.09023731 0.9749107 0.09023731 0.9751527 0.0896151 0.9749107 0.08992624 0.9749107 0.08992624 0.9751527 0.0896151 0.9746688 0.08992624 0.9746688 0.08992624 0.9749107 0.09054845 0.9749107 0.09085959 0.9749107 0.09085959 0.9751527 0.09023731 0.9749107 0.09054845 0.9749107 0.09054845 0.9751527 0.09023731 0.9746688 0.09054845 0.9746688 0.09054845 0.9749107 0.08992624 0.9734588 0.09023731 0.9734588 0.09023731 0.9737008 0.0896151 0.9734588 0.08992624 0.9734588 0.08992624 0.9737008 0.0896151 0.9732168 0.08992624 0.9732168 0.08992624 0.9734588 0.08992624 0.9739428 0.09023737 0.9739428 0.09023737 0.9741848 0.0896151 0.9739428 0.08992624 0.9739428 0.08992624 0.9741848 0.0896151 0.9737008 0.08992624 0.9737008 0.08992624 0.9739428 0.09054845 0.9739428 0.09085959 0.9739428 0.09085959 0.9741848 0.09023737 0.9739428 0.09054845 0.9739428 0.09054845 0.9741848 0.09023731 0.9737008 0.09054845 0.9737008 0.09054845 0.9739428 0.09023731 0.9734588 0.09054845 0.9734588 0.09054845 0.9737008 0.09023731 0.9732168 0.09054845 0.9732168 0.09054845 0.9734588 0.09054845 0.9744268 0.09085959 0.9744268 0.09085959 0.9746688 0.09023737 0.9744268 0.09054845 0.9744268 0.09054845 0.9746688 0.09023737 0.9741848 0.09054845 0.9741848 0.09054845 0.9744268 0.09179294 0.9744268 0.09210407 0.9744268 0.09210407 0.9746688 0.09148186 0.9744268 0.09179294 0.9744268 0.09179294 0.9746688 0.09148186 0.9741848 0.09179294 0.9741848 0.09179294 0.9744268 0.09179294 0.9734588 0.09210407 0.9734588 0.09210407 0.9737008 0.09148186 0.9734588 0.09179294 0.9734588 0.09179294 0.9737008 0.09148186 0.9732168 0.09179294 0.9732168 0.09179294 0.9734588 0.09085959 0.9751527 0.09085959 0.9761205 0.09054845 0.9761205 0.09117072 0.9751527 0.09117072 0.9761205 0.09085959 0.9761205 0.0896151 0.9766045 0.0896151 0.9761205 0.08992624 0.9761205 0.09210407 0.9766045 0.09210407 0.9770884 0.09179294 0.9770884 0.0896151 0.9775724 0.0896151 0.9770884 0.08992624 0.9770884 0.09023731 0.9775724 0.09023731 0.9770884 0.09054845 0.9770884 0.09023737 0.9766045 0.09023731 0.9761205 0.09054845 0.9761205 0.09023731 0.9770884 0.09023737 0.9766045 0.09054845 0.9766045 0.09054845 0.9770884 0.09054845 0.9766045 0.09085959 0.9766045 0.09054845 0.9766045 0.09054845 0.9761205 0.09085959 0.9761205 0.09023731 0.9780564 0.09023731 0.9775724 0.09054845 0.9775724 0.09054845 0.9780564 0.09054845 0.9775724 0.09085959 0.9775724 0.09054845 0.9775724 0.09054845 0.9770884 0.09085959 0.9770884 0.08992624 0.9775724 0.08992624 0.9770884 0.09023731 0.9770884 0.09117072 0.9770884 0.09117072 0.9775724 0.09085959 0.9775724 0.09117072 0.9775724 0.09117072 0.9780564 0.09085959 0.9780564 0.09148186 0.9761205 0.09148186 0.9766045 0.09117072 0.9766045 0.09117072 0.9761205 0.09117072 0.9766045 0.09085959 0.9766045 0.09117072 0.9766045 0.09117072 0.9770884 0.09085959 0.9770884 0.09210407 0.9761205 0.09210407 0.9766045 0.09179294 0.9766045 0.0896151 0.9770884 0.0896151 0.9766045 0.08992624 0.9766045 0.08992624 0.9770884 0.08992624 0.9766045 0.09023737 0.9766045 0.08992624 0.9766045 0.08992624 0.9761205 0.09023731 0.9761205 0.09054845 0.9746688 0.09085959 0.9746688 0.09085959 0.9749107 0.09179294 0.9739428 0.09210407 0.9739428 0.09210407 0.9741848 0.09117072 0.9744268 0.09148186 0.9744268 0.09148186 0.9746688 0.09054845 0.9734588 0.09085959 0.9734588 0.09085959 0.9737008 0.09210407 0.9775724 0.09210407 0.9780564 0.09179294 0.9780564 0.09148186 0.9766045 0.09148186 0.9770884 0.09117072 0.9770884 0.09148186 0.9775724 0.09148186 0.9780564 0.09117072 0.9780564 0.0896151 0.9780564 0.0896151 0.9775724 0.08992624 0.9775724 0.08992624 0.9780564 0.08992624 0.9775724 0.09023731 0.9775724 0.09148186 0.9770884 0.09148186 0.9775724 0.09117072 0.9775724 0.09179294 0.9761205 0.09179294 0.9766045 0.09148186 0.9766045 0.09179294 0.9766045 0.09179294 0.9770884 0.09148186 0.9770884 0.09210407 0.9770884 0.09210407 0.9775724 0.09179294 0.9775724 0.09179294 0.9770884 0.09179294 0.9775724 0.09148186 0.9775724 0.09179294 0.9775724 0.09179294 0.9780564 0.09148186 0.9780564 0.09349995 0.9732168 0.09396523 0.9732168 0.09396523 0.9734588 0.09256935 0.9734588 0.09210407 0.9734588 0.09210407 0.9732168 0.09489583 0.9734588 0.09443056 0.9734588 0.09443056 0.9732168 0.09489583 0.9744268 0.09443056 0.9744268 0.09443056 0.9741848 0.09349995 0.9749107 0.09396523 0.9749107 0.09396523 0.9751527 0.09443056 0.9734588 0.09396523 0.9734588 0.09396523 0.9732168 0.09675699 0.9741848 0.09629172 0.9741848 0.09629172 0.9739428 0.09582638 0.9741845 0.09536111 0.9741845 0.09536111 0.9732168 0.09256935 0.9744268 0.09210407 0.9744268 0.09210407 0.9741848 0.09303468 0.9746688 0.09349995 0.9746688 0.09349995 0.9751527 0.09443056 0.9744268 0.09396523 0.9744268 0.09396523 0.9741848 0.09256935 0.9739428 0.09210407 0.9739428 0.09210407 0.9737008 0.09349995 0.9739428 0.09396523 0.9739428 0.09396523 0.9741848 0.09349995 0.9744268 0.09396523 0.9744268 0.09396523 0.9746688 0.09582638 0.9741848 0.09629172 0.9741848 0.09629172 0.9744268 0.09629172 0.9739428 0.09582638 0.9739428 0.09582638 0.9737008 0.09443056 0.9739428 0.09396523 0.9739428 0.09396523 0.9737008 0.09256935 0.9749107 0.09210407 0.9749107 0.09210407 0.9746688 0.09443056 0.9749107 0.09396523 0.9749107 0.09396523 0.9746688 0.09349995 0.9734588 0.09396523 0.9734588 0.09396523 0.9737008 0.09489583 0.9751527 0.09443056 0.9751527 0.09443056 0.9749107 0.09675699 0.9734588 0.09629172 0.9734588 0.09629172 0.9732168 0.09303468 0.9737008 0.09256935 0.9737008 0.09256935 0.9732168 0.09675699 0.9746688 0.09629172 0.9746688 0.09629172 0.9744268 0.09489583 0.9746688 0.09443056 0.9746688 0.09443056 0.9744268 0.09349995 0.9737008 0.09396523 0.9737008 0.09396523 0.9739428 0.09303468 0.9746688 0.09256935 0.9746688 0.09256935 0.9741848 0.09629172 0.9737008 0.09582638 0.9737008 0.09582638 0.9734588 0.09489583 0.9737008 0.09443056 0.9737008 0.09443056 0.9734588 0.09256935 0.9741848 0.09210407 0.9741848 0.09210407 0.9739428 0.09489583 0.9732168 0.09536111 0.9732168 0.09536111 0.9741845 0.09349995 0.9746688 0.09396523 0.9746688 0.09396523 0.9749107 0.09675699 0.9744268 0.09629172 0.9744268 0.09629172 0.9741848 0.09349995 0.9741848 0.09396523 0.9741848 0.09396523 0.9744268 0.09582638 0.9744268 0.09629172 0.9744268 0.09629172 0.9746688 0.09303468 0.9741848 0.09349995 0.9741848 0.09349995 0.9746688 0.09489583 0.9741848 0.09443056 0.9741848 0.09443056 0.9739428 0.09256935 0.9746688 0.09210407 0.9746688 0.09210407 0.9744268 0.09256935 0.9737008 0.09210407 0.9737008 0.09210407 0.9734588 0.09443056 0.9737008 0.09396523 0.9737008 0.09396523 0.9734588 0.09675699 0.9739428 0.09629172 0.9739428 0.09629172 0.9737008 0.09443056 0.9746688 0.09396523 0.9746688 0.09396523 0.9744268 0.09443056 0.9751527 0.09396523 0.9751527 0.09396523 0.9749107 0.09303468 0.9732168 0.09349995 0.9732168 0.09349995 0.9737008 0.09443056 0.9741848 0.09396523 0.9741848 0.09396523 0.9739428 0.09489583 0.9749107 0.09443056 0.9749107 0.09443056 0.9746688 0.09675699 0.9737008 0.09629172 0.9737008 0.09629172 0.9734588 0.09582638 0.9739428 0.09629172 0.9739428 0.09629172 0.9741848 0.09303468 0.9741848 0.09256935 0.9741848 0.09256935 0.9737008 0.09489583 0.9739428 0.09443056 0.9739428 0.09443056 0.9737008 0.09256935 0.9751527 0.09210407 0.9751527 0.09210407 0.9749107 0.09629172 0.9734588 0.09582638 0.9734588 0.09582638 0.9732168 0.09303468 0.9751527 0.09256935 0.9751527 0.09256935 0.9746688 0.09303468 0.9737008 0.09349995 0.9737008 0.09349995 0.9741848 0.09303742 0.9722489 0.09303742 0.9732168 0.09272634 0.9732168 0.09272634 0.9722489 0.09272634 0.9732168 0.09241521 0.9732168 0.09334856 0.9722489 0.09334856 0.9732168 0.09303742 0.9732168 0.09148186 0.9722489 0.09148186 0.9732168 0.09117072 0.9732168 0.09179294 0.9722489 0.09179294 0.9732168 0.09148186 0.9732168 0.09117072 0.9722489 0.09117072 0.9732168 0.09085959 0.9732168 0.09085959 0.9715229 0.0896151 0.9715229 0.0896151 0.9712809 0.09085959 0.9710389 0.0896151 0.9710389 0.0896151 0.970797 0.09770429 0.970313 0.09770429 0.969345 0.09832656 0.969345 0.09085959 0.970797 0.0896151 0.970797 0.0896151 0.970555 0.09085959 0.9722489 0.0896151 0.9722489 0.0896151 0.9720069 0.0964598 0.970313 0.0964598 0.969345 0.09708207 0.969345 0.09085959 0.9732168 0.0896151 0.9732168 0.0896151 0.9722489 0.09583759 0.970313 0.09583759 0.969345 0.0964598 0.969345 0.09708207 0.970313 0.09708207 0.969345 0.09770429 0.969345 0.09085959 0.9712809 0.0896151 0.9712809 0.0896151 0.9710389 0.09085959 0.9717649 0.0896151 0.9717649 0.0896151 0.9715229 0.09085959 0.9720069 0.0896151 0.9720069 0.0896151 0.9717649 0.09085959 0.970555 0.0896151 0.970555 0.0896151 0.970313 0.09832656 0.9722489 0.09832656 0.9732168 0.09770429 0.9732168 0.09334856 0.970797 0.0945931 0.970797 0.0945931 0.9710389 0.09334856 0.9720069 0.0945931 0.9720069 0.0945931 0.9722489 0.09334856 0.9715229 0.0945931 0.9715229 0.0945931 0.9717649 0.09334856 0.9717649 0.0945931 0.9717649 0.0945931 0.9720069 0.09770429 0.9722489 0.09770429 0.9732168 0.09708207 0.9732168 0.09334856 0.970555 0.0945931 0.970555 0.0945931 0.970797 0.09708207 0.9722489 0.09708207 0.9732168 0.0964598 0.9732168 0.0964598 0.9722489 0.0964598 0.9732168 0.09583759 0.9732168 0.09334856 0.9722489 0.0945931 0.9722489 0.0945931 0.9732168 0.09334856 0.9710389 0.0945931 0.9710389 0.0945931 0.9712809 0.09334856 0.970313 0.0945931 0.970313 0.0945931 0.970555 0.09334856 0.9712809 0.0945931 0.9712809 0.0945931 0.9715229 0.09272634 0.970313 0.09272634 0.969345 0.09303742 0.969345 0.09148186 0.970313 0.09148186 0.969345 0.09179294 0.969345 0.09241521 0.970313 0.09241521 0.969345 0.09272634 0.969345 0.09210407 0.970313 0.09210407 0.969345 0.09241521 0.969345 0.0896151 0.970313 0.0896151 0.969345 0.09085959 0.969345 0.09117072 0.970313 0.09117072 0.969345 0.09148186 0.969345 0.09334856 0.970313 0.09334856 0.969345 0.0945931 0.969345 0.09179294 0.970313 0.09179294 0.969345 0.09210407 0.969345 0.09303742 0.970313 0.09303742 0.969345 0.09334856 0.969345 0.09085959 0.970313 0.09085959 0.969345 0.09117072 0.969345 0.09583759 0.9720069 0.0945931 0.9720069 0.0945931 0.9717649 0.09583759 0.9712809 0.0945931 0.9712809 0.0945931 0.9710389 0.09583759 0.970797 0.0945931 0.970797 0.0945931 0.970555 0.09583759 0.9710389 0.0945931 0.9710389 0.0945931 0.970797 0.09583759 0.9715229 0.0945931 0.9715229 0.0945931 0.9712809 0.09583759 0.970555 0.0945931 0.970555 0.0945931 0.970313 0.09583759 0.9717649 0.0945931 0.9717649 0.0945931 0.9715229 0.09583759 0.9722489 0.0945931 0.9722489 0.0945931 0.9720069 0.09583759 0.9732168 0.0945931 0.9732168 0.0945931 0.9722489 0.09583759 0.970313 0.0945931 0.970313 0.0945931 0.969345 - + @@ -81,11 +81,11 @@ - + -

15 0 0 25 0 1 94 0 2 63 0 3 68 0 4 42 0 5 20 0 6 27 0 7 41 0 8 19 0 9 74 0 10 93 0 11 76 0 12 21 0 13 92 0 14 28 0 15 29 0 16 40 0 17 24 0 18 30 0 19 39 0 20 31 0 21 79 0 22 90 0 23 72 0 24 80 0 25 89 0 26 32 0 27 16 0 28 38 0 29 81 0 30 33 0 31 37 0 32 26 0 33 83 0 34 88 0 35 34 0 36 61 0 37 87 0 38 84 0 39 85 0 40 86 0 41 66 0 42 35 0 43 36 0 44 36 0 45 13 0 46 84 0 47 74 0 48 84 0 49 75 0 50 3 0 51 36 0 52 74 0 53 86 0 54 10 0 55 26 0 56 21 0 57 26 0 58 4 0 59 75 0 60 86 0 61 21 0 62 85 0 63 63 0 64 10 0 65 13 0 66 87 0 67 85 0 68 27 0 69 81 0 70 73 0 71 4 0 72 88 0 73 27 0 74 37 0 75 8 0 76 17 0 77 64 0 78 17 0 79 2 0 80 73 0 81 37 0 82 64 0 83 38 0 84 1 0 85 69 0 86 33 0 87 69 0 88 8 0 89 82 0 90 38 0 91 33 0 92 89 0 93 12 0 94 31 0 95 18 0 96 31 0 97 9 0 98 60 0 99 89 0 100 18 0 101 90 0 102 5 0 103 14 0 104 23 0 105 14 0 106 57 0 107 9 0 108 90 0 109 23 0 110 91 0 111 2 0 112 22 0 113 79 0 114 22 0 115 5 0 116 12 0 117 91 0 118 79 0 119 39 0 120 77 0 121 28 0 122 58 0 123 28 0 124 6 0 125 0 0 126 39 0 127 58 0 128 40 0 129 11 0 130 72 0 131 65 0 132 72 0 133 60 0 134 6 0 135 40 0 136 65 0 137 92 0 138 4 0 139 20 0 140 29 0 141 20 0 142 11 0 143 77 0 144 92 0 145 29 0 146 30 0 147 76 0 148 77 0 149 70 0 150 93 0 151 30 0 152 41 0 153 73 0 154 78 0 155 80 0 156 78 0 157 12 0 158 11 0 159 41 0 160 80 0 161 42 0 162 7 0 163 32 0 164 83 0 165 32 0 166 82 0 167 10 0 168 42 0 169 83 0 170 94 0 171 71 0 172 34 0 173 35 0 174 34 0 175 13 0 176 67 0 177 94 0 178 35 0 179 2 0 180 44 0 181 22 0 182 17 0 183 43 0 184 2 0 185 98 0 186 49 0 187 125 0 188 51 0 189 110 0 190 123 0 191 102 0 192 53 0 193 120 0 194 116 0 195 54 0 196 56 0 197 117 0 198 44 0 199 55 0 200 115 0 201 55 0 202 54 0 203 54 0 204 48 0 205 47 0 206 55 0 207 43 0 208 48 0 209 105 0 210 56 0 211 50 0 212 50 0 213 52 0 214 46 0 215 56 0 216 47 0 217 52 0 218 120 0 219 115 0 220 116 0 221 111 0 222 52 0 223 47 0 224 121 0 225 46 0 226 52 0 227 107 0 228 122 0 229 45 0 230 45 0 231 48 0 232 43 0 233 122 0 234 47 0 235 48 0 236 99 0 237 123 0 238 106 0 239 103 0 240 125 0 241 53 0 242 53 0 243 117 0 244 115 0 245 125 0 246 118 0 247 117 0 248 78 0 249 64 0 250 91 0 251 87 0 252 62 0 253 63 0 254 88 0 255 82 0 256 81 0 257 93 0 258 75 0 259 76 0 260 108 0 261 95 0 262 124 0 263 113 0 264 111 0 265 122 0 266 114 0 267 100 0 268 121 0 269 119 0 270 120 0 271 104 0 272 104 0 273 116 0 274 105 0 275 112 0 276 121 0 277 111 0 278 106 0 279 113 0 280 107 0 281 123 0 282 112 0 283 113 0 284 109 0 285 124 0 286 110 0 287 110 0 288 114 0 289 112 0 290 124 0 291 101 0 292 114 0 293 15 0 294 59 0 295 25 0 296 63 0 297 62 0 298 68 0 299 20 0 300 4 0 301 27 0 302 19 0 303 3 0 304 74 0 305 76 0 306 75 0 307 21 0 308 28 0 309 77 0 310 29 0 311 24 0 312 70 0 313 30 0 314 31 0 315 12 0 316 79 0 317 72 0 318 11 0 319 80 0 320 32 0 321 7 0 322 16 0 323 81 0 324 82 0 325 33 0 326 26 0 327 10 0 328 83 0 329 34 0 330 71 0 331 61 0 332 84 0 333 13 0 334 85 0 335 66 0 336 67 0 337 35 0 338 36 0 339 35 0 340 13 0 341 74 0 342 36 0 343 84 0 344 3 0 345 66 0 346 36 0 347 86 0 348 85 0 349 10 0 350 21 0 351 86 0 352 26 0 353 75 0 354 84 0 355 86 0 356 85 0 357 87 0 358 63 0 359 13 0 360 34 0 361 87 0 362 27 0 363 88 0 364 81 0 365 4 0 366 26 0 367 88 0 368 37 0 369 33 0 370 8 0 371 64 0 372 37 0 373 17 0 374 73 0 375 81 0 376 37 0 377 38 0 378 16 0 379 1 0 380 33 0 381 38 0 382 69 0 383 82 0 384 32 0 385 38 0 386 89 0 387 80 0 388 12 0 389 18 0 390 89 0 391 31 0 392 60 0 393 72 0 394 89 0 395 90 0 396 79 0 397 5 0 398 23 0 399 90 0 400 14 0 401 9 0 402 31 0 403 90 0 404 91 0 405 64 0 406 2 0 407 79 0 408 91 0 409 22 0 410 12 0 411 78 0 412 91 0 413 39 0 414 30 0 415 77 0 416 58 0 417 39 0 418 28 0 419 0 0 420 24 0 421 39 0 422 40 0 423 29 0 424 11 0 425 65 0 426 40 0 427 72 0 428 6 0 429 28 0 430 40 0 431 92 0 432 21 0 433 4 0 434 29 0 435 92 0 436 20 0 437 77 0 438 76 0 439 92 0 440 30 0 441 93 0 442 76 0 443 70 0 444 19 0 445 93 0 446 41 0 447 27 0 448 73 0 449 80 0 450 41 0 451 78 0 452 11 0 453 20 0 454 41 0 455 42 0 456 68 0 457 7 0 458 83 0 459 42 0 460 32 0 461 10 0 462 63 0 463 42 0 464 94 0 465 25 0 466 71 0 467 35 0 468 94 0 469 34 0 470 67 0 471 15 0 472 94 0 473 2 0 474 43 0 475 44 0 476 17 0 477 45 0 478 43 0 479 98 0 480 97 0 481 49 0 482 51 0 483 109 0 484 110 0 485 102 0 486 103 0 487 53 0 488 116 0 489 115 0 490 54 0 491 117 0 492 118 0 493 44 0 494 115 0 495 117 0 496 55 0 497 54 0 498 55 0 499 48 0 500 55 0 501 44 0 502 43 0 503 105 0 504 116 0 505 56 0 506 50 0 507 56 0 508 52 0 509 56 0 510 54 0 511 47 0 512 120 0 513 53 0 514 115 0 515 111 0 516 121 0 517 52 0 518 121 0 519 100 0 520 46 0 521 107 0 522 113 0 523 122 0 524 45 0 525 122 0 526 48 0 527 122 0 528 111 0 529 47 0 530 99 0 531 51 0 532 123 0 533 103 0 534 98 0 535 125 0 536 53 0 537 125 0 538 117 0 539 125 0 540 49 0 541 118 0 542 78 0 543 73 0 544 64 0 545 87 0 546 61 0 547 62 0 548 88 0 549 83 0 550 82 0 551 93 0 552 74 0 553 75 0 554 108 0 555 96 0 556 95 0 557 113 0 558 112 0 559 111 0 560 114 0 561 101 0 562 100 0 563 119 0 564 102 0 565 120 0 566 104 0 567 120 0 568 116 0 569 112 0 570 114 0 571 121 0 572 106 0 573 123 0 574 113 0 575 123 0 576 110 0 577 112 0 578 109 0 579 108 0 580 124 0 581 110 0 582 124 0 583 114 0 584 124 0 585 95 0 586 101 0 587

+

15 0 0 25 0 1 94 0 2 63 0 3 68 0 4 42 0 5 20 0 6 27 0 7 41 0 8 19 0 9 74 0 10 93 0 11 76 0 12 21 0 13 92 0 14 28 0 15 29 0 16 40 0 17 24 0 18 30 0 19 39 0 20 31 0 21 79 0 22 90 0 23 72 0 24 80 0 25 89 0 26 32 0 27 16 0 28 38 0 29 81 0 30 33 0 31 37 0 32 26 0 33 83 0 34 88 0 35 34 0 36 61 0 37 87 0 38 84 0 39 85 0 40 86 0 41 66 0 42 35 0 43 36 0 44 36 0 45 13 0 46 84 0 47 74 0 48 84 0 49 75 0 50 3 0 51 36 0 52 74 0 53 86 0 54 10 0 55 26 0 56 21 0 57 26 0 58 4 0 59 75 0 60 86 0 61 21 0 62 85 0 63 63 0 64 10 0 65 13 0 66 87 0 67 85 0 68 27 0 69 81 0 70 73 0 71 4 0 72 88 0 73 27 0 74 37 0 75 8 0 76 17 0 77 64 0 78 17 0 79 2 0 80 73 0 81 37 0 82 64 0 83 38 0 84 1 0 85 69 0 86 33 0 87 69 0 88 8 0 89 82 0 90 38 0 91 33 0 92 89 0 93 12 0 94 31 0 95 18 0 96 31 0 97 9 0 98 60 0 99 89 0 100 18 0 101 90 0 102 5 0 103 14 0 104 23 0 105 14 0 106 57 0 107 9 0 108 90 0 109 23 0 110 91 0 111 2 0 112 22 0 113 79 0 114 22 0 115 5 0 116 12 0 117 91 0 118 79 0 119 39 0 120 77 0 121 28 0 122 58 0 123 28 0 124 6 0 125 0 0 126 39 0 127 58 0 128 40 0 129 11 0 130 72 0 131 65 0 132 72 0 133 60 0 134 6 0 135 40 0 136 65 0 137 92 0 138 4 0 139 20 0 140 29 0 141 20 0 142 11 0 143 77 0 144 92 0 145 29 0 146 30 0 147 76 0 148 77 0 149 70 0 150 93 0 151 30 0 152 41 0 153 73 0 154 78 0 155 80 0 156 78 0 157 12 0 158 11 0 159 41 0 160 80 0 161 42 0 162 7 0 163 32 0 164 83 0 165 32 0 166 82 0 167 10 0 168 42 0 169 83 0 170 94 0 171 71 0 172 34 0 173 35 0 174 34 0 175 13 0 176 67 0 177 94 0 178 35 0 179 2 0 180 44 0 181 22 0 182 17 0 183 43 0 184 2 0 185 98 0 186 49 0 187 125 0 188 51 0 189 110 0 190 123 0 191 102 0 192 53 0 193 120 0 194 116 0 195 54 0 196 56 0 197 117 0 198 44 0 199 55 0 200 115 0 201 55 0 202 54 0 203 54 0 204 48 0 205 47 0 206 55 0 207 43 0 208 48 0 209 105 0 210 56 0 211 50 0 212 50 0 213 52 0 214 46 0 215 56 0 216 47 0 217 52 0 218 120 0 219 115 0 220 116 0 221 111 0 222 52 0 223 47 0 224 121 0 225 46 0 226 52 0 227 107 0 228 122 0 229 45 0 230 45 0 231 48 0 232 43 0 233 122 0 234 47 0 235 48 0 236 99 0 237 123 0 238 106 0 239 103 0 240 125 0 241 53 0 242 53 0 243 117 0 244 115 0 245 125 0 246 118 0 247 117 0 248 78 0 249 64 0 250 91 0 251 87 0 252 62 0 253 63 0 254 88 0 255 82 0 256 81 0 257 93 0 258 75 0 259 76 0 260 108 0 261 95 0 262 124 0 263 113 0 264 111 0 265 122 0 266 114 0 267 100 0 268 121 0 269 119 0 270 120 0 271 104 0 272 104 0 273 116 0 274 105 0 275 112 0 276 121 0 277 111 0 278 106 0 279 113 0 280 107 0 281 123 0 282 112 0 283 113 0 284 109 0 285 124 0 286 110 0 287 110 0 288 114 0 289 112 0 290 124 0 291 101 0 292 114 0 293 59 1 294 134 1 295 25 1 296 58 2 297 150 2 298 0 2 299 104 3 300 179 3 301 119 3 302 100 3 303 160 3 304 46 3 305 16 1 306 126 1 307 1 1 308 15 4 309 162 4 310 59 4 311 106 4 312 170 4 313 99 4 314 44 2 315 157 2 316 22 2 317 18 2 318 163 2 319 60 2 320 108 1 321 145 1 322 96 1 323 19 4 324 127 4 325 3 4 326 65 2 327 152 2 328 6 2 329 61 1 330 140 1 331 62 1 332 68 1 333 128 1 334 7 1 335 69 3 336 153 3 337 8 3 338 22 3 339 151 3 340 5 3 341 66 4 342 143 4 343 67 4 344 23 2 345 154 2 346 9 2 347 24 4 348 166 4 349 70 4 350 25 1 351 167 1 352 71 1 353 96 3 354 168 3 355 95 3 356 118 4 357 135 4 358 44 4 359 98 2 360 169 2 361 97 2 362 45 4 363 148 4 364 107 4 365 101 3 366 171 3 367 100 3 368 71 1 369 164 1 370 61 1 371 102 2 372 174 2 373 103 2 374 5 3 375 129 3 376 14 3 377 105 3 378 147 3 379 104 3 380 60 2 381 141 2 382 65 2 383 17 1 384 159 1 385 45 1 386 7 1 387 131 1 388 16 1 389 107 4 390 176 4 391 106 4 392 62 1 393 165 1 394 68 1 395 8 3 396 132 3 397 17 3 398 109 1 399 149 1 400 108 1 401 46 3 402 137 3 403 50 3 404 9 2 405 155 2 406 18 2 407 6 2 408 161 2 409 58 2 410 67 4 411 130 4 412 15 4 413 97 4 414 136 4 415 49 4 416 70 4 417 156 4 418 19 4 419 0 4 420 158 4 421 24 4 422 99 1 423 138 1 424 51 1 425 3 4 426 142 4 427 66 4 428 95 3 429 172 3 430 101 3 431 49 4 432 178 4 433 118 4 434 1 3 435 144 3 436 69 3 437 103 2 438 146 2 439 98 2 440 50 3 441 175 3 442 105 3 443 57 2 444 133 2 445 23 2 446 14 3 447 139 3 448 57 3 449 119 2 450 173 2 451 102 2 452 51 1 453 177 1 454 109 1 455 144 0 456 183 0 457 153 0 458 153 0 459 181 0 460 132 0 461 126 0 462 182 0 463 144 0 464 151 0 465 184 0 466 129 0 467 157 0 468 186 0 469 151 0 470 129 0 471 185 0 472 139 0 473 155 0 474 197 0 475 163 0 476 141 0 477 193 0 478 152 0 479 146 0 480 198 0 481 169 0 482 152 0 483 196 0 484 161 0 485 139 0 486 188 0 487 133 0 488 173 0 489 200 0 490 174 0 491 185 0 492 189 0 493 139 0 494 179 0 495 199 0 496 173 0 497 174 0 498 191 0 499 146 0 500 163 0 501 190 0 502 141 0 503 154 0 504 195 0 505 155 0 506 133 0 507 194 0 508 154 0 509 161 0 510 192 0 511 150 0 512 170 0 513 207 0 514 138 0 515 167 0 516 212 0 517 164 0 518 131 0 519 203 0 520 126 0 521 165 0 522 204 0 523 128 0 524 128 0 525 205 0 526 131 0 527 138 0 528 216 0 529 177 0 530 134 0 531 214 0 532 167 0 533 177 0 534 210 0 535 149 0 536 149 0 537 209 0 538 145 0 539 126 0 540 217 0 541 180 0 542 164 0 543 208 0 544 140 0 545 162 0 546 206 0 547 134 0 548 140 0 549 213 0 550 165 0 551 143 0 552 219 0 553 130 0 554 166 0 555 223 0 556 156 0 557 142 0 558 221 0 559 143 0 560 127 0 561 220 0 562 142 0 563 192 0 564 222 0 565 150 0 566 158 0 567 226 0 568 166 0 569 162 0 570 228 0 571 211 0 572 156 0 573 218 0 574 127 0 575 130 0 576 225 0 577 162 0 578 150 0 579 224 0 580 158 0 581 168 0 582 235 0 583 172 0 584 160 0 585 229 0 586 137 0 587 175 0 588 231 0 589 147 0 590 137 0 591 236 0 592 175 0 593 171 0 594 232 0 595 160 0 596 147 0 597 237 0 598 179 0 599 172 0 600 234 0 601 171 0 602 145 0 603 233 0 604 168 0 605 209 0 606 230 0 607 145 0 608 179 0 609 238 0 610 201 0 611 15 0 612 59 0 613 25 0 614 63 0 615 62 0 616 68 0 617 20 0 618 4 0 619 27 0 620 19 0 621 3 0 622 74 0 623 76 0 624 75 0 625 21 0 626 28 0 627 77 0 628 29 0 629 24 0 630 70 0 631 30 0 632 31 0 633 12 0 634 79 0 635 72 0 636 11 0 637 80 0 638 32 0 639 7 0 640 16 0 641 81 0 642 82 0 643 33 0 644 26 0 645 10 0 646 83 0 647 34 0 648 71 0 649 61 0 650 84 0 651 13 0 652 85 0 653 66 0 654 67 0 655 35 0 656 36 0 657 35 0 658 13 0 659 74 0 660 36 0 661 84 0 662 3 0 663 66 0 664 36 0 665 86 0 666 85 0 667 10 0 668 21 0 669 86 0 670 26 0 671 75 0 672 84 0 673 86 0 674 85 0 675 87 0 676 63 0 677 13 0 678 34 0 679 87 0 680 27 0 681 88 0 682 81 0 683 4 0 684 26 0 685 88 0 686 37 0 687 33 0 688 8 0 689 64 0 690 37 0 691 17 0 692 73 0 693 81 0 694 37 0 695 38 0 696 16 0 697 1 0 698 33 0 699 38 0 700 69 0 701 82 0 702 32 0 703 38 0 704 89 0 705 80 0 706 12 0 707 18 0 708 89 0 709 31 0 710 60 0 711 72 0 712 89 0 713 90 0 714 79 0 715 5 0 716 23 0 717 90 0 718 14 0 719 9 0 720 31 0 721 90 0 722 91 0 723 64 0 724 2 0 725 79 0 726 91 0 727 22 0 728 12 0 729 78 0 730 91 0 731 39 0 732 30 0 733 77 0 734 58 0 735 39 0 736 28 0 737 0 0 738 24 0 739 39 0 740 40 0 741 29 0 742 11 0 743 65 0 744 40 0 745 72 0 746 6 0 747 28 0 748 40 0 749 92 0 750 21 0 751 4 0 752 29 0 753 92 0 754 20 0 755 77 0 756 76 0 757 92 0 758 30 0 759 93 0 760 76 0 761 70 0 762 19 0 763 93 0 764 41 0 765 27 0 766 73 0 767 80 0 768 41 0 769 78 0 770 11 0 771 20 0 772 41 0 773 42 0 774 68 0 775 7 0 776 83 0 777 42 0 778 32 0 779 10 0 780 63 0 781 42 0 782 94 0 783 25 0 784 71 0 785 35 0 786 94 0 787 34 0 788 67 0 789 15 0 790 94 0 791 2 0 792 43 0 793 44 0 794 17 0 795 45 0 796 43 0 797 98 0 798 97 0 799 49 0 800 51 0 801 109 0 802 110 0 803 102 0 804 103 0 805 53 0 806 116 0 807 115 0 808 54 0 809 117 0 810 118 0 811 44 0 812 115 0 813 117 0 814 55 0 815 54 0 816 55 0 817 48 0 818 55 0 819 44 0 820 43 0 821 105 0 822 116 0 823 56 0 824 50 0 825 56 0 826 52 0 827 56 0 828 54 0 829 47 0 830 120 0 831 53 0 832 115 0 833 111 0 834 121 0 835 52 0 836 121 0 837 100 0 838 46 0 839 107 0 840 113 0 841 122 0 842 45 0 843 122 0 844 48 0 845 122 0 846 111 0 847 47 0 848 99 0 849 51 0 850 123 0 851 103 0 852 98 0 853 125 0 854 53 0 855 125 0 856 117 0 857 125 0 858 49 0 859 118 0 860 78 0 861 73 0 862 64 0 863 87 0 864 61 0 865 62 0 866 88 0 867 83 0 868 82 0 869 93 0 870 74 0 871 75 0 872 108 0 873 96 0 874 95 0 875 113 0 876 112 0 877 111 0 878 114 0 879 101 0 880 100 0 881 119 0 882 102 0 883 120 0 884 104 0 885 120 0 886 116 0 887 112 0 888 114 0 889 121 0 890 106 0 891 123 0 892 113 0 893 123 0 894 110 0 895 112 0 896 109 0 897 108 0 898 124 0 899 110 0 900 124 0 901 114 0 902 124 0 903 95 0 904 101 0 905 59 1 906 162 1 907 134 1 908 58 2 909 161 2 910 150 2 911 104 3 912 147 3 913 179 3 914 100 3 915 171 3 916 160 3 917 16 1 918 131 1 919 126 1 920 15 4 921 130 4 922 162 4 923 106 4 924 176 4 925 170 4 926 44 2 927 135 2 928 157 2 929 18 2 930 155 2 931 163 2 932 108 1 933 149 1 934 145 1 935 19 4 936 156 4 937 127 4 938 65 2 939 141 2 940 152 2 941 61 1 942 164 1 943 140 1 944 68 1 945 165 1 946 128 1 947 69 3 948 144 3 949 153 3 950 22 3 951 157 3 952 151 3 953 66 4 954 142 4 955 143 4 956 23 2 957 133 2 958 154 2 959 24 4 960 158 4 961 166 4 962 25 1 963 134 1 964 167 1 965 96 3 966 145 3 967 168 3 968 118 4 969 178 4 970 135 4 971 98 2 972 146 2 973 169 2 974 45 4 975 159 4 976 148 4 977 101 3 978 172 3 979 171 3 980 71 1 981 167 1 982 164 1 983 102 2 984 173 2 985 174 2 986 5 3 987 151 3 988 129 3 989 105 3 990 175 3 991 147 3 992 60 2 993 163 2 994 141 2 995 17 1 996 132 1 997 159 1 998 7 1 999 128 1 1000 131 1 1001 107 4 1002 148 4 1003 176 4 1004 62 1 1005 140 1 1006 165 1 1007 8 3 1008 153 3 1009 132 3 1010 109 1 1011 177 1 1012 149 1 1013 46 3 1014 160 3 1015 137 3 1016 9 2 1017 154 2 1018 155 2 1019 6 2 1020 152 2 1021 161 2 1022 67 4 1023 143 4 1024 130 4 1025 97 4 1026 169 4 1027 136 4 1028 70 4 1029 166 4 1030 156 4 1031 0 4 1032 150 4 1033 158 4 1034 99 1 1035 170 1 1036 138 1 1037 3 4 1038 127 4 1039 142 4 1040 95 3 1041 168 3 1042 172 3 1043 49 4 1044 136 4 1045 178 4 1046 1 3 1047 126 3 1048 144 3 1049 103 2 1050 174 2 1051 146 2 1052 50 3 1053 137 3 1054 175 3 1055 57 2 1056 139 2 1057 133 2 1058 14 3 1059 129 3 1060 139 3 1061 119 2 1062 179 2 1063 173 2 1064 51 1 1065 138 1 1066 177 1 1067 144 0 1068 182 0 1069 183 0 1070 153 0 1071 183 0 1072 181 0 1073 126 0 1074 180 0 1075 182 0 1076 151 0 1077 186 0 1078 184 0 1079 157 0 1080 187 0 1081 186 0 1082 129 0 1083 184 0 1084 185 0 1085 155 0 1086 195 0 1087 197 0 1088 141 0 1089 190 0 1090 193 0 1091 146 0 1092 191 0 1093 198 0 1094 152 0 1095 193 0 1096 196 0 1097 139 0 1098 189 0 1099 188 0 1100 173 0 1101 199 0 1102 200 0 1103 185 0 1104 202 0 1105 189 0 1106 179 0 1107 201 0 1108 199 0 1109 174 0 1110 200 0 1111 191 0 1112 163 0 1113 197 0 1114 190 0 1115 154 0 1116 194 0 1117 195 0 1118 133 0 1119 188 0 1120 194 0 1121 161 0 1122 196 0 1123 192 0 1124 170 0 1125 215 0 1126 207 0 1127 167 0 1128 214 0 1129 212 0 1130 131 0 1131 205 0 1132 203 0 1133 165 0 1134 213 0 1135 204 0 1136 128 0 1137 204 0 1138 205 0 1139 138 0 1140 207 0 1141 216 0 1142 134 0 1143 206 0 1144 214 0 1145 177 0 1146 216 0 1147 210 0 1148 149 0 1149 210 0 1150 209 0 1151 126 0 1152 203 0 1153 217 0 1154 164 0 1155 212 0 1156 208 0 1157 162 0 1158 211 0 1159 206 0 1160 140 0 1161 208 0 1162 213 0 1163 143 0 1164 221 0 1165 219 0 1166 166 0 1167 226 0 1168 223 0 1169 142 0 1170 220 0 1171 221 0 1172 127 0 1173 218 0 1174 220 0 1175 192 0 1176 227 0 1177 222 0 1178 158 0 1179 224 0 1180 226 0 1181 162 0 1182 225 0 1183 228 0 1184 156 0 1185 223 0 1186 218 0 1187 130 0 1188 219 0 1189 225 0 1190 150 0 1191 222 0 1192 224 0 1193 168 0 1194 233 0 1195 235 0 1196 160 0 1197 232 0 1198 229 0 1199 175 0 1200 236 0 1201 231 0 1202 137 0 1203 229 0 1204 236 0 1205 171 0 1206 234 0 1207 232 0 1208 147 0 1209 231 0 1210 237 0 1211 172 0 1212 235 0 1213 234 0 1214 145 0 1215 230 0 1216 233 0 1217 209 0 1218 239 0 1219 230 0 1220 179 0 1221 237 0 1222 238 0 1223

 diff --git a/data/test_scene.json b/data/test_scene.json index 75f551a..281c929 100644 --- a/data/test_scene.json +++ b/data/test_scene.json @@ -1,6 +1,6 @@ { "camera" : { - "position" : {"x":0,"y":-400,"z":100}, + "position" : {"x":400,"y":-275,"z":325}, "target" : {"x":140,"y":0,"z":0}, "world_up" : {"x":0,"y":0,"z":1} }, @@ -51,17 +51,12 @@ { "intensity" : 1.0, "color" : {"r":0,"g":0,"b":0}, - "position" : {"x":-1000,"y":0,"z":100} + "position" : {"x":-1000,"y":0,"z":200} }, { "intensity" : 1.0, "color" : {"r":0,"g":0,"b":0}, - "position" : {"x":-400,"y":0,"z":100} - }, - { - "intensity" : 1.0, - "color" : {"r":0,"g":0,"b":0}, - "position" : {"x":200,"y":0,"z":100} + "position" : {"x":200,"y":0,"z":200} } ] } diff --git a/src/gooey.cpp b/src/gooey.cpp index 64a0f77..e65097f 100644 --- a/src/gooey.cpp +++ b/src/gooey.cpp @@ -11,9 +11,17 @@ #include "examples/imgui_impl_sdl.h" #include "examples/imgui_impl_opengl3.h" +#include "camera.h" +#include "hexgrid.h" #include "util.h" #include "gooey.h" + +// forward declarations +void renderRendererWindow(render_state* rs, ImGuiWindowFlags window_flags = 0); +void renderHexgridWindow(hexgrid& grid, ImGuiWindowFlags window_flags = 0); + + bool gooInit(SDL_Handles &handles, v2i vp_dims) { @@ -48,75 +56,118 @@ gooProcessEvent(SDL_Event &event) } void -gooRender(SDL_Handles &handles, hexgrid* grid, bool &is_debug, camera* cam) +gooRender(game_state* gs, render_state* rs) { - assert(grid != nullptr); + assert(gs != nullptr && rs != nullptr); + ImGuiIO& io = ImGui::GetIO(); ImGui_ImplOpenGL3_NewFrame(); - ImGui_ImplSDL2_NewFrame(handles.window); + ImGui_ImplSDL2_NewFrame(rs->handles.window); ImGui::NewFrame(); + ImGui::BeginMainMenuBar(); + if (ImGui::BeginMenu("Test")) { + if (ImGui::MenuItem("Test 1")) {} + ImGui::Separator(); + if (ImGui::BeginMenu("Add Widget")) { + if (ImGui::MenuItem("Renderer")) {} + if (ImGui::MenuItem("Hexgrid")) {} + ImGui::EndMenu(); + } + static bool br = true; + static bool bh = true; + ImGui::Checkbox("Show Renderer Widget", &br); + ImGui::Checkbox("Show Hexgrid Widget", &bh); + + ImGui::EndMenu(); + } + ImGui::SameLine(0, 800); + ImGui::Text("%.3f ms/frame, (%.1f FPS)", 1000.0f / io.Framerate, io.Framerate); + ImGui::EndMainMenuBar(); + ImGuiWindowFlags window_flags = 0; - window_flags |= ImGuiWindowFlags_NoTitleBar; window_flags |= ImGuiWindowFlags_NoScrollbar; window_flags |= ImGuiWindowFlags_NoMove; window_flags |= ImGuiWindowFlags_NoResize; window_flags |= ImGuiWindowFlags_NoCollapse; - ImGui::SetNextWindowPos(ImVec2(0,0)); - ImGui::SetNextWindowSize(ImVec2(300, 720)); + renderRendererWindow(rs, window_flags); + renderHexgridWindow(gs->grid, window_flags); + + ImGui::Render(); + ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData()); +} + + +// internal + +void +renderRendererWindow(render_state* rs, ImGuiWindowFlags window_flags) +{ + ImGui::SetNextWindowPos(ImVec2(0, 20)); + ImGui::SetNextWindowSize(ImVec2(250, 250)); ImGui::SetNextWindowBgAlpha(0.3f); - ImGui::Begin("", nullptr, window_flags); + ImGui::Begin("Renderer", nullptr, window_flags); - ImGuiIO& io = ImGui::GetIO(); - ImGui::Text("%.3f ms/frame, (%.1f FPS)", 1000.0f / io.Framerate, io.Framerate); + ImGui::Checkbox("Debug Render", &rs->is_debug_draw); + + if (ImGui::CollapsingHeader("Camera Position", ImGuiTreeNodeFlags_DefaultOpen)) { + ImGui::Text("x: %f", rs->cam.position.x); + ImGui::Text("y: %f", rs->cam.position.y); + ImGui::Text("z: %f", rs->cam.position.z); + } + + if (ImGui::CollapsingHeader("Camera Forward", ImGuiTreeNodeFlags_DefaultOpen)) { + ImGui::Text("x: %f", rs->cam.forward.x); + ImGui::Text("y: %f", rs->cam.forward.y); + ImGui::Text("z: %f", rs->cam.forward.z); + } + + ImGui::Spacing(); + ImGui::Text("hAngle: %f", rs->cam.hAngle); + ImGui::Text("vAngle: %f", rs->cam.vAngle); + + ImGui::End(); +} + +void +renderHexgridWindow(hexgrid& grid, ImGuiWindowFlags window_flags) +{ + ImGui::SetNextWindowPos(ImVec2(250,20)); + ImGui::SetNextWindowSize(ImVec2(250, 300)); + ImGui::SetNextWindowBgAlpha(0.3f); + ImGui::Begin("Hexgrid", nullptr, window_flags); ImGui::Text("Draw Mode:"); - if (ImGui::RadioButton("None", (grid->draw_mode == NONE))) - grid->draw_mode = NONE; - if (ImGui::RadioButton("Fill", (grid->draw_mode == FILL))) - grid->draw_mode = FILL; - if (ImGui::RadioButton("Line", (grid->draw_mode == LINE))) - grid->draw_mode = LINE; - if (ImGui::RadioButton("Cone Fill", (grid->draw_mode == CONE_FILL))) - grid->draw_mode = CONE_FILL; - - ImGui::Checkbox("Debug Render", &is_debug); - ImGui::SameLine(); ImGui::TextUnformatted(is_debug ? "true" : "false"); + if (ImGui::RadioButton("None", (grid.draw_mode == NONE))) + grid.draw_mode = NONE; + if (ImGui::RadioButton("Fill", (grid.draw_mode == FILL))) + grid.draw_mode = FILL; + if (ImGui::RadioButton("Line", (grid.draw_mode == LINE))) + grid.draw_mode = LINE; + if (ImGui::RadioButton("Cone Fill", (grid.draw_mode == CONE_FILL))) + grid.draw_mode = CONE_FILL; + + ImGui::Separator(); ImGui::Text("is_selecting"); - ImGui::SameLine(); ImGui::TextUnformatted(grid->is_selecting ? "true" : "false"); - - if (ImGui::CollapsingHeader("Camera", ImGuiTreeNodeFlags_DefaultOpen)) { - ImGui::Indent(); - if (ImGui::CollapsingHeader("Camera Position", ImGuiTreeNodeFlags_DefaultOpen)) { - ImGui::Text("x: %f", cam->position.x); - ImGui::Text("y: %f", cam->position.y); - ImGui::Text("z: %f", cam->position.z); - } + ImGui::SameLine(); ImGui::TextUnformatted(grid.is_selecting ? "true" : "false"); - if (ImGui::CollapsingHeader("Camera Forward", ImGuiTreeNodeFlags_DefaultOpen)) { - ImGui::Text("x: %f", cam->forward.x); - ImGui::Text("y: %f", cam->forward.y); - ImGui::Text("z: %f", cam->forward.z); - } - - ImGui::Spacing(); - ImGui::Text("hAngle: %f", cam->hAngle); - ImGui::Text("vAngle: %f", cam->vAngle); - ImGui::Unindent(); + ImGui::Text("current_hex: "); + if (grid.current_hex) { + Hex ch = grid.current_hex->hex; + ImGui::SameLine(); ImGui::Text("%i, %i, %i", ch.q, ch.r, ch.s); } - if (grid->current_hex) { - Hex ch = grid->current_hex->hex; - ImGui::Text("current_hex: %i, %i, %i", ch.q, ch.r, ch.s); - } - if (grid->start_hex) { - Hex sh = grid->start_hex->hex; - ImGui::Text("start_hex: %i, %i, %i", sh.q, sh.r, sh.s); + ImGui::Text("start_hex: "); + if (grid.start_hex) { + Hex sh = grid.start_hex->hex; + ImGui::SameLine(); ImGui::Text("%i, %i, %i", sh.q, sh.r, sh.s); } + ImGui::Separator(); + ImGui::Button("Add Hex"); + ImGui::SameLine(); ImGui::Button("Remove Hex"); + ImGui::TextWrapped("TODO: need to add more state to hexgame.cpp for adding/removing hexes, and modifying entities"); + ImGui::End(); - ImGui::Render(); - ImGui_ImplOpenGL3_RenderDrawData(ImGui::GetDrawData()); } - diff --git a/src/gooey.h b/src/gooey.h index d234e7d..03435fa 100644 --- a/src/gooey.h +++ b/src/gooey.h @@ -1,9 +1,7 @@ #pragma once -#include "camera.h" #include "hexgame.h" -#include "hexgrid.h" #include "renderer.h" bool gooInit(SDL_Handles &handles, v2i vp_dims); @@ -12,5 +10,5 @@ void gooFree(); bool gooProcessEvent(SDL_Event &event); -void gooRender(SDL_Handles &handles, hexgrid* grid, bool &is_debug, camera* cam); +void gooRender(game_state* gs, render_state* rs); diff --git a/src/hexgame.cpp b/src/hexgame.cpp index 32f5cd6..0784cd0 100644 --- a/src/hexgame.cpp +++ b/src/hexgame.cpp @@ -50,19 +50,19 @@ loadSceneFromJson(game_state* s, render_state* rs) slSceneDoc* sd = slLoadFile(DATA_DIR, DEFAULT_SCENE_FILE, SCENE_SCHEMA_FILE); if (sd != nullptr) { - game_state* g = g_game_state; + game_state* gs = g_game_state; render_state* rs = g_render_state; - if (!slParseEntities(sd, g->entities, g->entity_count, MAX_ENTITIES, DATA_DIR)) { + if (!slParseEntities(sd, gs->entities, gs->entity_count, MAX_ENTITIES, DATA_DIR)) { LOG(ERROR) << "Error loading Entities, exiting\n"; return false; } slParseCamera(sd, rs->cam); - slParseHexGrid(sd, g->grid, rs->palette_image); - hgCreateHexes(g->grid); + slParseHexGrid(sd, gs->grid, rs->palette_image); + hgCreateHexes(gs->grid); - if (!slCreateHexRenderGroups(g->grid, rs)) + if (!slCreateHexRenderGroups(gs->grid, rs)) { LOG(ERROR) << "Error creating hex render groups\n"; return false; @@ -245,7 +245,7 @@ processSDLEvents() // TODO: need to check for both io.WantCaptureKeyboard and io.WantCaptureMouse // to fix bug with 'ESC' not passing through while in imgui bool gooey_wants = gooProcessEvent(e); - game_state* g = g_game_state; + game_state* gs = g_game_state; switch (e.type) { @@ -256,27 +256,27 @@ processSDLEvents() switch (e.key.keysym.sym) { case SDLK_ESCAPE: run = false; break; - case SDLK_e: g->is_moveforward = true; break; - case SDLK_s: g->is_moveleft = true; break; - case SDLK_d: g->is_movebackward = true; break; - case SDLK_f: g->is_moveright = true; break; - case SDLK_SPACE: g->is_moveup = true; break; - case SDLK_c: g->is_movedown = true; break; - case SDLK_r: g->is_rotateCW = true; break; - case SDLK_w: g->is_rotateCCW = true; break; + case SDLK_e: gs->is_moveforward = true; break; + case SDLK_s: gs->is_moveleft = true; break; + case SDLK_d: gs->is_movebackward = true; break; + case SDLK_f: gs->is_moveright = true; break; + case SDLK_SPACE: gs->is_moveup = true; break; + case SDLK_c: gs->is_movedown = true; break; + case SDLK_r: gs->is_rotateCW = true; break; + case SDLK_w: gs->is_rotateCCW = true; break; } break; case SDL_KEYUP: switch (e.key.keysym.sym) { - case SDLK_e: g->is_moveforward = false; break; - case SDLK_s: g->is_moveleft = false; break; - case SDLK_d: g->is_movebackward = false; break; - case SDLK_f: g->is_moveright = false; break; - case SDLK_SPACE: g->is_moveup = false; break; - case SDLK_c: g->is_movedown = false; break; - case SDLK_r: g->is_rotateCW = false; break; - case SDLK_w: g->is_rotateCCW = false; break; + case SDLK_e: gs->is_moveforward = false; break; + case SDLK_s: gs->is_moveleft = false; break; + case SDLK_d: gs->is_movebackward = false; break; + case SDLK_f: gs->is_moveright = false; break; + case SDLK_SPACE: gs->is_moveup = false; break; + case SDLK_c: gs->is_movedown = false; break; + case SDLK_r: gs->is_rotateCW = false; break; + case SDLK_w: gs->is_rotateCCW = false; break; } break; case SDL_MOUSEBUTTONDOWN: @@ -284,12 +284,12 @@ processSDLEvents() { if (e.button.button == SDL_BUTTON_LEFT) { - g->grid.is_selecting = true; + gs->grid.is_selecting = true; handleMouseDown(e.button); } else if (e.button.button == SDL_BUTTON_RIGHT) { - g->is_camera_rotate = true; + gs->is_camera_rotate = true; } } break; @@ -297,15 +297,15 @@ processSDLEvents() if (!gooey_wants) { if (e.button.button == SDL_BUTTON_LEFT) - g->grid.is_selecting = false; + gs->grid.is_selecting = false; else if (e.button.button == SDL_BUTTON_RIGHT) - g->is_camera_rotate = false; + gs->is_camera_rotate = false; } break; case SDL_MOUSEMOTION: - if (!gooey_wants && g->grid.is_selecting) + if (!gooey_wants && gs->grid.is_selecting) handleMouseMove(e.motion); - else if(!gooey_wants && g->is_camera_rotate) + else if(!gooey_wants && gs->is_camera_rotate) cameraRotate(g_render_state->cam, e.motion.xrel, e.motion.yrel); break; default: @@ -328,17 +328,17 @@ cleanUp(SDL_Handles &handles) SDL_DestroyWindow(handles.window); SDL_Quit(); - game_state* g = g_game_state; + game_state* gs = g_game_state; if (g_game_state->grid.hex_array) delete g_game_state->grid.hex_array; - for (uint i = 0; i < g->entity_count; i++) { - meFreeMeshGroup(g->entities[i].mesh_group); - rgFree(g->entities[i].ren_group); + for (uint i = 0; i < gs->entity_count; i++) { + meFreeMeshGroup(gs->entities[i].mesh_group); + rgFree(gs->entities[i].ren_group); } - utilSafeFree(g->entities); + utilSafeFree(gs->entities); utilSafeFree(g_render_state); utilSafeFree(g_game_state); @@ -373,20 +373,20 @@ int main(int argc, char* argv[]) while (processSDLEvents()) { frameStart = SDL_GetTicks(); - game_state* g = g_game_state; - render_state* r = g_render_state; + game_state* gs = g_game_state; + render_state* rs = g_render_state; - cameraMove(r->cam, g->is_moveup, g->is_moveleft, g->is_movedown, g->is_moveright, - g->is_moveforward, g->is_movebackward); + cameraMove(rs->cam, gs->is_moveup, gs->is_moveleft, gs->is_movedown, gs->is_moveright, + gs->is_moveforward, gs->is_movebackward); - renRenderFrame(r, g->grid, g->entities, g->entity_count); + renRenderFrame(rs, gs->grid, gs->entities, gs->entity_count); - if (r->is_debug_draw && g->grid.draw_mode == CONE_FILL) - renRenderDebug(r, g_polygon_select_vertices); + if (rs->is_debug_draw && gs->grid.draw_mode == CONE_FILL) + renRenderDebug(rs, g_polygon_select_vertices); - gooRender(r->handles, &g->grid, r->is_debug_draw, &r->cam); + gooRender(gs, rs); - SDL_GL_SwapWindow(r->handles.window); + SDL_GL_SwapWindow(rs->handles.window); // TODO: test SDL_Delay on Win32 //platform_wait_for_vblank(VSYNC_ENABLED);