From: LockedLunatic Date: Tue, 28 Jun 2016 09:34:59 +0000 (+0200) Subject: level done-ish X-Git-Url: https://git.leopard-lacewing.eu/?a=commitdiff_plain;h=0fcb90ddbee7fa202eb2dfd93079ec64408c9ac9;p=cgue_weave.git level done-ish --- diff --git a/Weave/Scene/Scene.cpp b/Weave/Scene/Scene.cpp index 75917db..d6dee07 100644 --- a/Weave/Scene/Scene.cpp +++ b/Weave/Scene/Scene.cpp @@ -381,7 +381,7 @@ void Scene::draw() const motionVecs->getTexture()->useTexture(uBLURVEC); bool firstit = true; - for (int i = 0; i < 2; i++) + for (int i = 0; i < 15; i++) { postRenderPingPong[!postRenderPP]->useBuffer(); diff --git a/Weave/Stage.cpp b/Weave/Stage.cpp index f7dee28..dd94eba 100644 --- a/Weave/Stage.cpp +++ b/Weave/Stage.cpp @@ -193,10 +193,16 @@ Stage::Stage(int num) } } } - + //current_world->addObject(new Level(translate(vec3(-10.86495f, 0.42601f, -11.63417f)) * rotate((float)M_PI_4 * 2.f, vec3(0.f, 0.f, 1.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "Hay", "model_levelTest_2D.png")); + //current_world->addObject(new Level(translate(vec3(-10.86495f, 1.70172f, -11.63417f)) * rotate((float)M_PI_4 * 2.f, vec3(0.f, 0.f, 1.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "Hay", "model_levelTest_2D.png")); + //current_world->addObject(new Level(translate(vec3(-10.86495f, 3.f, -11.63417f)) * rotate((float)M_PI_4 * 2.f, vec3(0.f, 0.f, 1.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "Hay", "model_levelTest_2D.png")); + current_world->addObject(new Level(translate(vec3(-18.18717f, 0.60808f, -11.6f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "Hay", "model_levelTest_2D.png")); + current_world->addObject(new Level(translate(vec3(-18.18717f, 0.60808f, -10.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "Hay", "model_levelTest_2D.png")); + current_world->addObject(new Level(translate(vec3(-18.18717f, 1.6095f, -10.8f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "Hay", "model_levelTest_2D.png")); - lever1 = new Lever(translate(vec3(0.f, 0.0f, 4.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "model_lever_2D.png"); + + lever1 = new Lever(translate(vec3(0.f, 0.2f, 4.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "model_lever_2D.png"); current_world->addObject(lever1); lever1->setAnimationLoop(false); door1 = new Door(translate(vec3(5.20366f, -1.06029f, 4.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "Door", "model_door_2D.png"); @@ -222,7 +228,7 @@ Stage::Stage(int num) - Lever* lever3 = new Lever(translate(vec3(-4.5f, 0.0f, 5.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "model_lever_2D.png"); + Lever* lever3 = new Lever(translate(vec3(-4.5f, 0.2f, 5.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "model_lever_2D.png"); current_world->addObject(lever3); lever3->setAnimationLoop(false); Door* door3 = new Door(translate(vec3(-8.f, -1.06029f, 6.81363f)) * rotate((float)M_PI_4 * 2.f, vec3(0.f, 1.f, 0.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "Door", "model_door_2D.png"); @@ -243,19 +249,26 @@ Stage::Stage(int num) - lever2 = new Lever(translate(vec3(12.0f, 0.0f, 4.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "model_lever_2D.png"); + lever2 = new Lever(translate(vec3(12.0f, 0.2f, 4.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "lever", "model_lever_2D.png"); current_world->addObject(lever2); lever2->setAnimationLoop(false); - Door* door7 = new Door(translate(vec3(-6.45007f, -1.06029f, -12.13228f)) * rotate((float)M_PI_4 * 2.f, vec3(0.f, 1.f, 0.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "Door", "model_door_2D.png"); + Door* door7 = new Door(translate(vec3(-6.45007f, -1.06029f, -12.f)) * rotate((float)M_PI_4 * 2.f, vec3(0.f, 1.f, 0.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "Door", "model_door_2D.png"); current_world->addObject(door7); door7->setAnimationLoop(false); - door7->setup(-1.5708f, vec3(0, 1, 0), 1); - Door* door8 = new Door(translate(vec3(-16.27875f, -1.06029f, -12.13228f)) * rotate((float)M_PI_4 * 2.f, vec3(0.f, 1.f, 0.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "Door", "model_door_2D.png"); + door7->setup(-2.7f, vec3(0, 1, 0), 1); + door7->timeresistant = true; + Door* door8 = new Door(translate(vec3(-16.27875f, -1.06029f, -12.f)) * rotate((float)M_PI_4 * 2.f, vec3(0.f, 1.f, 0.f)), vec4(3.0f, 3.f, 0.4f, 1.5f), "Door", "model_door_2D.png"); current_world->addObject(door8); door8->setAnimationLoop(false); - door8->setup(-1.5708f, vec3(0, 1, 0), 1); + door8->setup(-2.7f, vec3(0, 1, 0), 1); lever2->setup(door7); lever2->setup(door8); + + + current_world->addObject(new Boar(translate(vec3(-14.85444f, 0.1f, -19.04243f)) * rotate(-0.5f, vec3(0, 1, 0)))); + current_world->addObject(new Boar(translate(vec3(-5.81069f, 0.1f, -16.65352f)) * rotate(-1.8f, vec3(0, 1, 0)))); + current_world->addObject(new Boar(translate(vec3(7.84026f, 0.1f, -13.1128f)) * rotate(0.9f, vec3(0, 1, 0)))); + current_world->addObject(new Boar(translate(vec3(10.39981f, 0.1f, -10.26097f)) * rotate(1.6f, vec3(0, 1, 0)))); break; } } diff --git a/models/level_3.blend b/models/level_3.blend index d91fb52..a24d514 100644 Binary files a/models/level_3.blend and b/models/level_3.blend differ diff --git a/models/level_3.blend1 b/models/level_3.blend1 index ed5e68c..a7f76c0 100644 Binary files a/models/level_3.blend1 and b/models/level_3.blend1 differ diff --git a/models/level_3.dae b/models/level_3.dae index 6e17bef..5919123 100644 --- a/models/level_3.dae +++ b/models/level_3.dae @@ -5,8 +5,8 @@ Blender User Blender 2.77.0 commit date:2016-04-05, commit time:18:12, hash:abf6f08 - 2016-06-28T10:53:19 - 2016-06-28T10:53:19 + 2016-06-28T11:19:05 + 2016-06-28T11:19:05 Z_UP @@ -359,7 +359,7 @@ - 18.11115 -14.31878 5.861036 -16.74847 -14.38196 5.863756 18.14698 9.25962 5.861035 -16.74848 9.276385 5.863757 18.1196 5.811702 14.22825 -16.74848 5.811699 14.22825 18.1196 -2.552786 17.69293 -16.74848 -2.552789 17.69293 18.1196 -10.91727 14.22825 -16.74847 -10.91728 14.22825 18.11115 -14.31878 -5.861034 -16.75472 -14.31462 -5.861034 -16.75312 9.252384 -5.861036 18.14698 9.25962 -5.861036 -16.74848 1.390269 6.585386 -16.74848 -6.495847 6.585386 -16.75419 -6.458952 -5.861035 -16.75365 1.396716 -5.861036 + 18.11115 -14.31878 5.861036 -16.74847 -14.38196 5.863756 18.14698 9.25962 5.861035 -16.74848 9.276385 5.863757 18.1196 5.811702 14.22825 -16.74848 5.811699 14.22825 18.1196 -2.552786 17.69293 -16.74848 -2.552789 17.69293 18.1196 -10.91727 14.22825 -16.74847 -10.91728 14.22825 18.11115 -14.31878 -5.861034 -16.75472 -14.31462 -5.861034 -16.75312 9.252384 -5.861036 18.14698 9.25962 -5.861036 -16.74848 1.390269 3.91745 -16.74848 -6.495847 3.91745 -16.75419 -6.458952 -5.861035 -16.75365 1.396716 -5.861036 @@ -369,7 +369,7 @@ - 4.73932e-4 0.9245765 0.3809962 0 0.3826833 0.9238796 0 -0.3826833 0.9238796 0 -0.9263768 0.3765981 0.001812458 -0.9999985 0 0.9999989 -0.001519381 0 4.80425e-4 1 0 -1 -4.26227e-5 4.58536e-4 -1 -5.77638e-7 0 0.9999992 5.03362e-4 -0.001214921 -1 3.82444e-5 4.15619e-4 0 0.9238796 0.3826835 -1.54082e-7 0.3826833 0.9238796 0 -0.3826833 0.9238797 0.001704335 -0.9238782 0.3826831 -1.1931e-4 -0.9999836 -0.005743324 0.9999989 -0.001519262 0 -2.07348e-4 0.999998 -0.002046883 -1 6.79228e-5 5.32829e-4 -1 0 0 -1 0 0 -1 0 0 0.9999954 -0.001519322 0.002645432 0.9999999 -2.09663e-4 -5.05908e-4 -1 6.77649e-5 3.9549e-4 + 4.73932e-4 0.9245765 0.3809962 0 0.3826833 0.9238796 0 -0.3826833 0.9238796 0 -0.9263768 0.3765981 0.001812458 -0.9999985 0 0.9999989 -0.001519381 0 4.80425e-4 1 0 -0.9999999 1.31216e-4 5.33195e-4 -1 0 0 0.9999992 5.03362e-4 -0.001214921 -1 -9.76621e-5 3.95829e-4 0 0.9238796 0.3826835 -1.54082e-7 0.3826833 0.9238796 0 -0.3826833 0.9238797 0.001704335 -0.9238782 0.3826831 -1.1931e-4 -0.9999836 -0.005743324 0.9999989 -0.001519262 0 -2.07348e-4 0.999998 -0.002046883 -0.9999998 6.75561e-5 5.84057e-4 -1 4.19735e-7 0 -1 0 0 -1 -9.01434e-7 0 0.9999954 -0.001519322 0.002645432 0.9999999 -2.09663e-4 -5.05908e-4 -1 6.83319e-5 5.29036e-4 @@ -379,7 +379,7 @@ - 0.7294408 0.4026927 0.5565676 0.9981268 0.7294406 0.9986009 0.5565556 0.402686 0.4585115 0.9980884 0.5565676 0.9981268 1 0.9981465 0.9022532 0.4026588 0.9022533 0.9980995 0.9022532 0.4026588 0.7296274 0.9979444 0.9022533 0.9980995 0.448051 0.9993818 0.2242982 0.4040126 0.448051 0.4040852 0.4584999 0.4026477 0.6866806 0 0.6866807 0.4026477 0.2239893 0.4040126 0 0.9999269 1.42582e-4 0.4040188 0.4584996 0.2687116 0.2302658 0.4040126 0.2302657 0.2693417 0.2302657 0.2693417 0.06744325 0.3448463 0 0.2020063 0.9169994 0.2017202 0.8495561 0.3445602 0.6866807 0.4026477 0.2302656 0 0.4584996 0.1345607 0.2302657 0.1346709 0.7294408 0.4026927 0.5565556 0.402686 0.5565676 0.9981268 0.5565556 0.402686 0.4584997 0.4026477 0.4585115 0.9980884 1 0.9981465 1 0.4027057 0.9022532 0.4026588 0.9022532 0.4026588 0.7294408 0.4026477 0.7296274 0.9979444 0.448051 0.9993818 0.2239893 0.9994155 0.2242982 0.4040126 0.4584999 0.4026477 0.4584997 0 0.6866806 0 0.2239893 0.4040126 0.2239893 1 0 0.9999269 0.4584996 0.2687116 0.4584997 0.4028625 0.2302658 0.4040126 0 0.2020063 0.06744319 0.05916631 0.2302657 0.1346709 0.06744319 0.05916631 0.2302656 0 0.2302657 0.1346709 0.2302658 0.4040126 0.06744325 0.3448463 0.2302657 0.2693417 0 0.2020063 0.2302657 0.1346709 0.2302657 0.2693417 0.6866807 0.4026477 0.6866806 0 0.8495563 0.05888038 0.8495563 0.05888038 0.9169994 0.2017202 0.6866807 0.4026477 0.2302656 0 0.4584996 4.09817e-4 0.4584996 0.1345607 + 0.7294408 0.4026927 0.5565676 0.9981268 0.7294406 0.9986009 0.5565556 0.402686 0.4585115 0.9980884 0.5565676 0.9981268 1 0.9981465 0.9022532 0.4026588 0.9022533 0.9980995 0.9022532 0.4026588 0.7296274 0.9979444 0.9022533 0.9980995 0.448051 0.9993818 0.2242982 0.4040126 0.448051 0.4040852 0.4584999 0.4026477 0.6866806 0 0.6866807 0.4026477 0.2239893 0.4040126 0 0.9999269 1.42582e-4 0.4040188 0.2302657 0.2693417 0.4584997 0.4028625 0.2302658 0.4040126 0.2302657 0.1346709 0.2302657 0.2693417 0 0.2020063 0.9169994 0.2017202 0.8495561 0.3445602 0.6866807 0.4026477 0.4584996 4.09817e-4 0.2302657 0.1346709 0.2302656 0 0.7294408 0.4026927 0.5565556 0.402686 0.5565676 0.9981268 0.5565556 0.402686 0.4584997 0.4026477 0.4585115 0.9980884 1 0.9981465 1 0.4027057 0.9022532 0.4026588 0.9022532 0.4026588 0.7294408 0.4026477 0.7296274 0.9979444 0.448051 0.9993818 0.2239893 0.9994155 0.2242982 0.4040126 0.4584999 0.4026477 0.4584997 0 0.6866806 0 0.2239893 0.4040126 0.2239893 1 0 0.9999269 0.2302657 0.2693417 0.4584996 0.2687116 0.4584997 0.4028625 0 0.2020063 0.06744319 0.05916631 0.2302657 0.1346709 0.2302656 0 0.2302657 0.1346709 0.06744319 0.05916631 0.2302657 0.2693417 0.2302658 0.4040126 0.06744325 0.3448463 0.06744325 0.3448463 0 0.2020063 0.2302657 0.2693417 0.6866807 0.4026477 0.6866806 0 0.8495563 0.05888038 0.8495563 0.05888038 0.9169994 0.2017202 0.6866807 0.4026477 0.4584996 4.09817e-4 0.4584996 0.1345607 0.2302657 0.1346709 @@ -395,14 +395,14 @@ 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 -

3 0 0 4 0 1 2 0 2 5 1 3 6 1 4 4 1 5 6 2 6 9 2 7 8 2 8 9 3 9 0 3 10 8 3 11 1 4 12 10 4 13 0 4 14 10 5 15 2 5 16 0 5 17 13 6 18 3 6 19 2 6 20 16 7 21 1 7 22 15 7 23 15 8 24 9 8 25 7 8 26 6 9 27 8 9 28 0 9 29 3 10 30 17 10 31 14 10 32 3 11 33 5 11 34 4 11 35 5 12 36 7 12 37 6 12 38 6 13 39 7 13 40 9 13 41 9 14 42 1 14 43 0 14 44 1 15 45 11 15 46 10 15 47 10 16 48 13 16 49 2 16 50 13 17 51 12 17 52 3 17 53 16 18 54 11 18 55 1 18 56 7 19 57 5 19 58 14 19 59 5 20 60 3 20 61 14 20 62 1 21 63 9 21 64 15 21 65 7 19 66 14 19 67 15 19 68 0 22 69 2 22 70 4 22 71 4 23 72 6 23 73 0 23 74 3 24 75 12 24 76 17 24 77

+

3 0 0 4 0 1 2 0 2 5 1 3 6 1 4 4 1 5 6 2 6 9 2 7 8 2 8 9 3 9 0 3 10 8 3 11 1 4 12 10 4 13 0 4 14 10 5 15 2 5 16 0 5 17 13 6 18 3 6 19 2 6 20 15 7 21 11 7 22 1 7 23 14 8 24 15 8 25 7 8 26 6 9 27 8 9 28 0 9 29 12 10 30 14 10 31 3 10 32 3 11 33 5 11 34 4 11 35 5 12 36 7 12 37 6 12 38 6 13 39 7 13 40 9 13 41 9 14 42 1 14 43 0 14 44 1 15 45 11 15 46 10 15 47 10 16 48 13 16 49 2 16 50 13 17 51 12 17 52 3 17 53 15 18 54 16 18 55 11 18 56 7 8 57 5 8 58 14 8 59 3 19 60 14 19 61 5 19 62 15 20 63 1 20 64 9 20 65 9 21 66 7 21 67 15 21 68 0 22 69 2 22 70 4 22 71 4 23 72 6 23 73 0 23 74 12 24 75 17 24 76 14 24 77

- 18.11115 -14.31878 5.861036 -16.74847 -14.38196 5.863756 18.14698 9.25962 5.861035 -16.74848 9.276385 5.863757 18.1196 5.811702 14.22825 -16.74848 5.811699 14.22825 18.1196 -2.552786 17.69293 -16.74848 -2.552789 17.69293 18.1196 -10.91727 14.22825 -16.74847 -10.91728 14.22825 18.11115 -14.31878 -5.861034 -16.75472 -14.31462 -5.861034 -16.75312 9.252384 -5.861036 18.14698 9.25962 -5.861036 -16.74848 1.390269 6.585386 -16.74848 -6.495847 6.585386 -16.75419 -6.458952 -5.861035 -16.75365 1.396716 -5.861036 + 18.11115 -14.31878 5.861036 -16.74847 -14.38196 5.863756 18.14698 9.25962 5.861035 -16.74848 9.276385 5.863757 18.1196 5.811702 14.22825 -16.74848 5.811699 14.22825 18.1196 -2.552786 17.69293 -16.74848 -2.552789 17.69293 18.1196 -10.91727 14.22825 -16.74847 -10.91728 14.22825 18.11115 -14.31878 -5.861034 -16.75472 -14.31462 -5.861034 -16.75312 9.252384 -5.861036 18.14698 9.25962 -5.861036 -16.74848 1.390269 3.91745 -16.74848 -6.495847 3.91745 -16.75419 -6.458952 -5.861035 -16.75365 1.396716 -5.861036 @@ -412,9 +412,9 @@ - -4.73938e-4 -0.9245765 -0.3809963 0 -0.3826833 -0.9238796 0 0.3826833 -0.9238797 0 0.9263768 -0.376598 1.1931e-4 0.9999836 0.005743324 -0.9999989 0.001519381 0 -4.80425e-4 -1 0 1 4.25839e-5 -4.58536e-4 1 0 0 -0.9999999 2.09554e-4 5.05908e-4 1 -6.77649e-5 -3.9549e-4 0 -0.9238796 -0.3826835 1.93343e-7 -0.3826833 -0.9238796 0 0.3826833 -0.9238796 -0.001704335 0.9238781 -0.382683 -0.001812458 0.9999985 0 -0.9999989 0.001519322 0 2.07348e-4 -0.999998 0.002046883 1 -6.79384e-5 -5.32829e-4 1 3.85092e-7 0 1 0 0 -0.9999954 0.001519322 -0.002645432 -0.9999992 -5.03362e-4 0.001214921 1 -3.82444e-5 -4.15619e-4 + -4.73938e-4 -0.9245765 -0.3809963 0 -0.3826833 -0.9238796 0 0.3826833 -0.9238797 0 0.9263768 -0.376598 1.1931e-4 0.9999836 0.005743324 -0.9999989 0.001519381 0 -4.80425e-4 -1 0 0.9999998 -6.75561e-5 -5.84057e-4 1 0 0 -0.9999999 2.09554e-4 5.05908e-4 1 9.77446e-5 -3.95829e-4 0 -0.9238796 -0.3826835 1.93343e-7 -0.3826833 -0.9238796 0 0.3826833 -0.9238796 -0.001704335 0.9238781 -0.382683 -0.001812458 0.9999985 0 -0.9999989 0.001519322 0 2.07348e-4 -0.999998 0.002046883 0.9999999 -1.31216e-4 -5.33195e-4 1 -4.19735e-7 0 1 6.00956e-7 0 1 0 0 -0.9999954 0.001519322 -0.002645432 -0.9999992 -5.03362e-4 0.001214921 0.9999999 -6.81427e-5 -5.29035e-4 - + @@ -422,7 +422,7 @@ - 0.5565676 0.9981268 0.7294408 0.4026927 0.7294406 0.9986009 0.4585115 0.9980884 0.5565556 0.402686 0.5565676 0.9981268 1 0.9981465 0.9022532 0.4026588 1 0.4027057 0.7296274 0.9979444 0.9022532 0.4026588 0.9022533 0.9980995 0.448051 0.9993818 0.2242982 0.4040126 0.2239893 0.9994155 0.6866806 0 0.4584999 0.4026477 0.6866807 0.4026477 0 0.9999269 0.2239893 0.4040126 1.42582e-4 0.4040188 0.2302658 0.4040126 0.4584996 0.2687116 0.2302657 0.2693417 0 0.2020063 0.2302657 0.2693417 0.2302657 0.1346709 0.6866807 0.4026477 0.9169994 0.2017202 0.8495563 0.05888038 0.2302656 0 0.4584996 0.1345607 0.4584996 4.09817e-4 0.5565676 0.9981268 0.5565556 0.402686 0.7294408 0.4026927 0.4585115 0.9980884 0.4584997 0.4026477 0.5565556 0.402686 1 0.9981465 0.9022533 0.9980995 0.9022532 0.4026588 0.7296274 0.9979444 0.7294408 0.4026477 0.9022532 0.4026588 0.448051 0.9993818 0.448051 0.4040852 0.2242982 0.4040126 0.6866806 0 0.4584997 0 0.4584999 0.4026477 0 0.9999269 0.2239893 1 0.2239893 0.4040126 0.2302658 0.4040126 0.4584997 0.4028625 0.4584996 0.2687116 0.2302656 0 0.06744319 0.05916631 0.2302657 0.1346709 0 0.2020063 0.06744325 0.3448463 0.2302657 0.2693417 0.06744325 0.3448463 0.2302658 0.4040126 0.2302657 0.2693417 0.2302657 0.1346709 0.06744319 0.05916631 0 0.2020063 0.8495563 0.05888038 0.6866806 0 0.6866807 0.4026477 0.6866807 0.4026477 0.8495561 0.3445602 0.9169994 0.2017202 0.2302656 0 0.2302657 0.1346709 0.4584996 0.1345607 + 0.5565676 0.9981268 0.7294408 0.4026927 0.7294406 0.9986009 0.4585115 0.9980884 0.5565556 0.402686 0.5565676 0.9981268 1 0.9981465 0.9022532 0.4026588 1 0.4027057 0.7296274 0.9979444 0.9022532 0.4026588 0.9022533 0.9980995 0.448051 0.9993818 0.2242982 0.4040126 0.2239893 0.9994155 0.6866806 0 0.4584999 0.4026477 0.6866807 0.4026477 0 0.9999269 0.2239893 0.4040126 1.42582e-4 0.4040188 0.2302657 0.2693417 0.4584997 0.4028625 0.4584996 0.2687116 0 0.2020063 0.2302657 0.2693417 0.2302657 0.1346709 0.6866807 0.4026477 0.9169994 0.2017202 0.8495563 0.05888038 0.2302657 0.1346709 0.4584996 4.09817e-4 0.2302656 0 0.5565676 0.9981268 0.5565556 0.402686 0.7294408 0.4026927 0.4585115 0.9980884 0.4584997 0.4026477 0.5565556 0.402686 1 0.9981465 0.9022533 0.9980995 0.9022532 0.4026588 0.7296274 0.9979444 0.7294408 0.4026477 0.9022532 0.4026588 0.448051 0.9993818 0.448051 0.4040852 0.2242982 0.4040126 0.6866806 0 0.4584997 0 0.4584999 0.4026477 0 0.9999269 0.2239893 1 0.2239893 0.4040126 0.2302657 0.2693417 0.2302658 0.4040126 0.4584997 0.4028625 0.2302656 0 0.06744319 0.05916631 0.2302657 0.1346709 0 0.2020063 0.06744325 0.3448463 0.2302657 0.2693417 0.2302658 0.4040126 0.2302657 0.2693417 0.06744325 0.3448463 0.2302657 0.1346709 0.06744319 0.05916631 0 0.2020063 0.8495563 0.05888038 0.6866806 0 0.6866807 0.4026477 0.6866807 0.4026477 0.8495561 0.3445602 0.9169994 0.2017202 0.2302657 0.1346709 0.4584996 0.1345607 0.4584996 4.09817e-4 @@ -438,14 +438,14 @@ 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 -

4 0 0 3 0 1 2 0 2 6 1 3 5 1 4 4 1 5 6 2 6 9 2 7 7 2 8 0 3 9 9 3 10 8 3 11 1 4 12 10 4 13 11 4 14 2 5 15 10 5 16 0 5 17 3 6 18 13 6 19 2 6 20 1 7 21 16 7 22 15 7 23 7 8 24 15 8 25 14 8 26 0 9 27 6 9 28 4 9 29 3 10 30 17 10 31 12 10 32 4 11 33 5 11 34 3 11 35 6 12 36 7 12 37 5 12 38 6 13 39 8 13 40 9 13 41 0 14 42 1 14 43 9 14 44 1 15 45 0 15 46 10 15 47 2 16 48 13 16 49 10 16 50 3 17 51 12 17 52 13 17 53 1 18 54 11 18 55 16 18 56 3 8 57 5 8 58 14 8 59 7 19 60 9 19 61 15 19 62 9 20 63 1 20 64 15 20 65 14 8 66 5 8 67 7 8 68 4 21 69 2 21 70 0 21 71 0 22 72 8 22 73 6 22 74 3 23 75 14 23 76 17 23 77

+

4 0 0 3 0 1 2 0 2 6 1 3 5 1 4 4 1 5 6 2 6 9 2 7 7 2 8 0 3 9 9 3 10 8 3 11 1 4 12 10 4 13 11 4 14 2 5 15 10 5 16 0 5 17 3 6 18 13 6 19 2 6 20 15 7 21 11 7 22 16 7 23 7 8 24 15 8 25 14 8 26 0 9 27 6 9 28 4 9 29 14 10 30 12 10 31 3 10 32 4 11 33 5 11 34 3 11 35 6 12 36 7 12 37 5 12 38 6 13 39 8 13 40 9 13 41 0 14 42 1 14 43 9 14 44 1 15 45 0 15 46 10 15 47 2 16 48 13 16 49 10 16 50 3 17 51 12 17 52 13 17 53 15 18 54 1 18 55 11 18 56 3 19 57 5 19 58 14 19 59 7 20 60 9 20 61 15 20 62 1 21 63 15 21 64 9 21 65 14 8 66 5 8 67 7 8 68 4 22 69 2 22 70 0 22 71 0 23 72 8 23 73 6 23 74 14 24 75 17 24 76 12 24 77

- 18.11115 -14.31878 5.861036 -16.74847 -14.38196 5.863756 18.14698 9.25962 5.861035 -16.74848 9.276385 5.863757 18.1196 5.811702 14.22825 -16.74848 5.811699 14.22825 18.1196 -2.552786 17.69293 -16.74848 -2.552789 17.69293 18.1196 -10.91727 14.22825 -16.74847 -10.91728 14.22825 18.11115 -14.31878 -5.861034 -16.75472 -14.31462 -5.861034 -16.75312 9.252384 -5.861036 18.14698 9.25962 -5.861036 -16.74848 1.390269 6.585386 -16.74848 -6.495847 6.585386 -16.75419 -6.458952 -5.861035 -16.75365 1.396716 -5.861036 + 18.11115 -14.31878 5.861036 -16.74847 -14.38196 5.863756 18.14698 9.25962 5.861035 -16.74848 9.276385 5.863757 18.1196 5.811702 14.22825 -16.74848 5.811699 14.22825 18.1196 -2.552786 17.69293 -16.74848 -2.552789 17.69293 18.1196 -10.91727 14.22825 -16.74847 -10.91728 14.22825 18.11115 -14.31878 -5.861034 -16.75472 -14.31462 -5.861034 -16.75312 9.252384 -5.861036 18.14698 9.25962 -5.861036 -16.74848 1.390269 4.050847 -16.74848 -6.495847 4.050847 -16.75419 -6.458952 -5.861035 -16.75365 1.396716 -5.861036 @@ -455,7 +455,7 @@ - -4.73938e-4 -0.9245765 -0.3809963 0 -0.3826833 -0.9238796 0 0.3826833 -0.9238797 0 0.9263768 -0.376598 1.1931e-4 0.9999836 0.005743324 -0.9999989 0.001519381 0 -4.80425e-4 -1 0 1 4.25839e-5 -4.58536e-4 1 0 0 -0.9999999 2.09554e-4 5.05908e-4 1 -6.77649e-5 -3.9549e-4 0 -0.9238796 -0.3826835 1.93343e-7 -0.3826833 -0.9238796 0 0.3826833 -0.9238796 -0.001704335 0.9238781 -0.382683 -0.001812458 0.9999985 0 -0.9999989 0.001519322 0 2.07348e-4 -0.999998 0.002046883 1 -6.79384e-5 -5.32829e-4 1 3.85092e-7 0 1 0 0 -0.9999954 0.001519322 -0.002645432 -0.9999992 -5.03362e-4 0.001214921 1 -3.82444e-5 -4.15619e-4 + -4.73938e-4 -0.9245765 -0.3809963 0 -0.3826833 -0.9238796 0 0.3826833 -0.9238797 0 0.9263768 -0.376598 1.1931e-4 0.9999836 0.005743324 -0.9999989 0.001519381 0 -4.80425e-4 -1 0 0.9999999 -6.70389e-5 -5.76197e-4 1 0 0 -0.9999999 2.09554e-4 5.05908e-4 1 9.08069e-5 -3.95816e-4 0 -0.9238796 -0.3826835 1.93343e-7 -0.3826833 -0.9238796 0 0.3826833 -0.9238796 -0.001704335 0.9238781 -0.382683 -0.001812458 0.9999985 0 -0.9999989 0.001519322 0 2.07348e-4 -0.999998 0.002046883 1 -1.22281e-4 -5.33143e-4 1 6.07632e-7 0 1 0 0 -0.9999954 0.001519322 -0.002645432 -0.9999992 -5.03362e-4 0.001214921 1 -6.76175e-5 -5.21916e-4 @@ -465,7 +465,7 @@ - 0.5565676 0.9981268 0.7294408 0.4026927 0.7294406 0.9986009 0.4585115 0.9980884 0.5565556 0.402686 0.5565676 0.9981268 1 0.9981465 0.9022532 0.4026588 1 0.4027057 0.7296274 0.9979444 0.9022532 0.4026588 0.9022533 0.9980995 0.448051 0.9993818 0.2242982 0.4040126 0.2239893 0.9994155 0.6866806 0 0.4584999 0.4026477 0.6866807 0.4026477 0 0.9999269 0.2239893 0.4040126 1.42582e-4 0.4040188 0.2302658 0.4040126 0.4584996 0.2687116 0.2302657 0.2693417 0 0.2020063 0.2302657 0.2693417 0.2302657 0.1346709 0.6866807 0.4026477 0.9169994 0.2017202 0.8495563 0.05888038 0.2302656 0 0.4584996 0.1345607 0.4584996 4.09817e-4 0.5565676 0.9981268 0.5565556 0.402686 0.7294408 0.4026927 0.4585115 0.9980884 0.4584997 0.4026477 0.5565556 0.402686 1 0.9981465 0.9022533 0.9980995 0.9022532 0.4026588 0.7296274 0.9979444 0.7294408 0.4026477 0.9022532 0.4026588 0.448051 0.9993818 0.448051 0.4040852 0.2242982 0.4040126 0.6866806 0 0.4584997 0 0.4584999 0.4026477 0 0.9999269 0.2239893 1 0.2239893 0.4040126 0.2302658 0.4040126 0.4584997 0.4028625 0.4584996 0.2687116 0.2302656 0 0.06744319 0.05916631 0.2302657 0.1346709 0 0.2020063 0.06744325 0.3448463 0.2302657 0.2693417 0.06744325 0.3448463 0.2302658 0.4040126 0.2302657 0.2693417 0.2302657 0.1346709 0.06744319 0.05916631 0 0.2020063 0.8495563 0.05888038 0.6866806 0 0.6866807 0.4026477 0.6866807 0.4026477 0.8495561 0.3445602 0.9169994 0.2017202 0.2302656 0 0.2302657 0.1346709 0.4584996 0.1345607 + 0.5565676 0.9981268 0.7294408 0.4026927 0.7294406 0.9986009 0.4585115 0.9980884 0.5565556 0.402686 0.5565676 0.9981268 1 0.9981465 0.9022532 0.4026588 1 0.4027057 0.7296274 0.9979444 0.9022532 0.4026588 0.9022533 0.9980995 0.448051 0.9993818 0.2242982 0.4040126 0.2239893 0.9994155 0.6866806 0 0.4584999 0.4026477 0.6866807 0.4026477 0 0.9999269 0.2239893 0.4040126 1.42582e-4 0.4040188 0.2302657 0.2693417 0.4584997 0.4028625 0.4584996 0.2687116 0 0.2020063 0.2302657 0.2693417 0.2302657 0.1346709 0.6866807 0.4026477 0.9169994 0.2017202 0.8495563 0.05888038 0.2302657 0.1346709 0.4584996 4.09817e-4 0.2302656 0 0.5565676 0.9981268 0.5565556 0.402686 0.7294408 0.4026927 0.4585115 0.9980884 0.4584997 0.4026477 0.5565556 0.402686 1 0.9981465 0.9022533 0.9980995 0.9022532 0.4026588 0.7296274 0.9979444 0.7294408 0.4026477 0.9022532 0.4026588 0.448051 0.9993818 0.448051 0.4040852 0.2242982 0.4040126 0.6866806 0 0.4584997 0 0.4584999 0.4026477 0 0.9999269 0.2239893 1 0.2239893 0.4040126 0.2302657 0.2693417 0.2302658 0.4040126 0.4584997 0.4028625 0.2302656 0 0.06744319 0.05916631 0.2302657 0.1346709 0 0.2020063 0.06744325 0.3448463 0.2302657 0.2693417 0.2302658 0.4040126 0.2302657 0.2693417 0.06744325 0.3448463 0.2302657 0.1346709 0.06744319 0.05916631 0 0.2020063 0.8495563 0.05888038 0.6866806 0 0.6866807 0.4026477 0.6866807 0.4026477 0.8495561 0.3445602 0.9169994 0.2017202 0.2302657 0.1346709 0.4584996 0.1345607 0.4584996 4.09817e-4 @@ -481,14 +481,14 @@ 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 -

4 0 0 3 0 1 2 0 2 6 1 3 5 1 4 4 1 5 6 2 6 9 2 7 7 2 8 0 3 9 9 3 10 8 3 11 1 4 12 10 4 13 11 4 14 2 5 15 10 5 16 0 5 17 3 6 18 13 6 19 2 6 20 1 7 21 16 7 22 15 7 23 7 8 24 15 8 25 14 8 26 0 9 27 6 9 28 4 9 29 3 10 30 17 10 31 12 10 32 4 11 33 5 11 34 3 11 35 6 12 36 7 12 37 5 12 38 6 13 39 8 13 40 9 13 41 0 14 42 1 14 43 9 14 44 1 15 45 0 15 46 10 15 47 2 16 48 13 16 49 10 16 50 3 17 51 12 17 52 13 17 53 1 18 54 11 18 55 16 18 56 3 8 57 5 8 58 14 8 59 7 19 60 9 19 61 15 19 62 9 20 63 1 20 64 15 20 65 14 8 66 5 8 67 7 8 68 4 21 69 2 21 70 0 21 71 0 22 72 8 22 73 6 22 74 3 23 75 14 23 76 17 23 77

+

4 0 0 3 0 1 2 0 2 6 1 3 5 1 4 4 1 5 6 2 6 9 2 7 7 2 8 0 3 9 9 3 10 8 3 11 1 4 12 10 4 13 11 4 14 2 5 15 10 5 16 0 5 17 3 6 18 13 6 19 2 6 20 15 7 21 11 7 22 16 7 23 7 8 24 15 8 25 14 8 26 0 9 27 6 9 28 4 9 29 14 10 30 12 10 31 3 10 32 4 11 33 5 11 34 3 11 35 6 12 36 7 12 37 5 12 38 6 13 39 8 13 40 9 13 41 0 14 42 1 14 43 9 14 44 1 15 45 0 15 46 10 15 47 2 16 48 13 16 49 10 16 50 3 17 51 12 17 52 13 17 53 15 18 54 1 18 55 11 18 56 3 8 57 5 8 58 14 8 59 7 19 60 9 19 61 15 19 62 1 20 63 15 20 64 9 20 65 14 8 66 5 8 67 7 8 68 4 21 69 2 21 70 0 21 71 0 22 72 8 22 73 6 22 74 14 23 75 17 23 76 12 23 77

- 18.11115 -14.31878 5.861036 -16.74847 -14.38196 5.863756 18.14698 9.25962 5.861035 -16.74848 9.276385 5.863757 18.1196 5.811702 14.22825 -16.74848 5.811699 14.22825 18.1196 -2.552786 17.69293 -16.74848 -2.552789 17.69293 18.1196 -10.91727 14.22825 -16.74847 -10.91728 14.22825 18.11115 -14.31878 -5.861034 -16.75472 -14.31462 -5.861034 -16.75312 9.252384 -5.861036 18.14698 9.25962 -5.861036 -16.74848 1.390269 6.585386 -16.74848 -6.495847 6.585386 -16.75419 -6.458952 -5.861035 -16.75365 1.396716 -5.861036 + 18.11115 -14.31878 5.861036 -16.74847 -14.38196 5.863756 18.14698 9.25962 5.861035 -16.74848 9.276385 5.863757 18.1196 5.811702 14.22825 -16.74848 5.811699 14.22825 18.1196 -2.552786 17.69293 -16.74848 -2.552789 17.69293 18.1196 -10.91727 14.22825 -16.74847 -10.91728 14.22825 18.11115 -14.31878 -5.861034 -16.75472 -14.31462 -5.861034 -16.75312 9.252384 -5.861036 18.14698 9.25962 -5.861036 -16.74848 1.390269 4.050847 -16.74848 -6.495847 4.050847 -16.75419 -6.458952 -5.861035 -16.75365 1.396716 -5.861036 @@ -498,9 +498,9 @@ - 4.73932e-4 0.9245765 0.3809962 0 0.3826833 0.9238796 0 -0.3826833 0.9238796 0 -0.9263768 0.3765981 0.001812458 -0.9999985 0 0.9999989 -0.001519381 0 4.80425e-4 1 0 -1 -4.26227e-5 4.58536e-4 -1 -5.77638e-7 0 0.9999992 5.03362e-4 -0.001214921 -1 3.82444e-5 4.15619e-4 0 0.9238796 0.3826835 -1.54082e-7 0.3826833 0.9238796 0 -0.3826833 0.9238797 0.001704335 -0.9238782 0.3826831 -1.1931e-4 -0.9999836 -0.005743324 0.9999989 -0.001519262 0 -2.07348e-4 0.999998 -0.002046883 -1 6.79228e-5 5.32829e-4 -1 0 0 -1 0 0 -1 0 0 0.9999954 -0.001519322 0.002645432 0.9999999 -2.09663e-4 -5.05908e-4 -1 6.77649e-5 3.9549e-4 + 4.73932e-4 0.9245765 0.3809962 0 0.3826833 0.9238796 0 -0.3826833 0.9238796 0 -0.9263768 0.3765981 0.001812458 -0.9999985 0 0.9999989 -0.001519381 0 4.80425e-4 1 0 -1 1.22281e-4 5.33143e-4 -1 0 0 0.9999992 5.03362e-4 -0.001214921 -1 -9.07656e-5 3.95816e-4 0 0.9238796 0.3826835 -1.54082e-7 0.3826833 0.9238796 0 -0.3826833 0.9238797 0.001704335 -0.9238782 0.3826831 -1.1931e-4 -0.9999836 -0.005743324 0.9999989 -0.001519262 0 -2.07348e-4 0.999998 -0.002046883 -0.9999999 6.70389e-5 5.76197e-4 -1 0 0 -1 -6.07632e-7 0 0.9999954 -0.001519322 0.002645432 0.9999999 -2.09663e-4 -5.05908e-4 -1 6.78042e-5 5.21916e-4 - + @@ -508,7 +508,7 @@ - 0.7294408 0.4026927 0.5565676 0.9981268 0.7294406 0.9986009 0.5565556 0.402686 0.4585115 0.9980884 0.5565676 0.9981268 1 0.9981465 0.9022532 0.4026588 0.9022533 0.9980995 0.9022532 0.4026588 0.7296274 0.9979444 0.9022533 0.9980995 0.448051 0.9993818 0.2242982 0.4040126 0.448051 0.4040852 0.4584999 0.4026477 0.6866806 0 0.6866807 0.4026477 0.2239893 0.4040126 0 0.9999269 1.42582e-4 0.4040188 0.4584996 0.2687116 0.2302658 0.4040126 0.2302657 0.2693417 0.2302657 0.2693417 0.06744325 0.3448463 0 0.2020063 0.9169994 0.2017202 0.8495561 0.3445602 0.6866807 0.4026477 0.2302656 0 0.4584996 0.1345607 0.2302657 0.1346709 0.7294408 0.4026927 0.5565556 0.402686 0.5565676 0.9981268 0.5565556 0.402686 0.4584997 0.4026477 0.4585115 0.9980884 1 0.9981465 1 0.4027057 0.9022532 0.4026588 0.9022532 0.4026588 0.7294408 0.4026477 0.7296274 0.9979444 0.448051 0.9993818 0.2239893 0.9994155 0.2242982 0.4040126 0.4584999 0.4026477 0.4584997 0 0.6866806 0 0.2239893 0.4040126 0.2239893 1 0 0.9999269 0.4584996 0.2687116 0.4584997 0.4028625 0.2302658 0.4040126 0 0.2020063 0.06744319 0.05916631 0.2302657 0.1346709 0.06744319 0.05916631 0.2302656 0 0.2302657 0.1346709 0.2302658 0.4040126 0.06744325 0.3448463 0.2302657 0.2693417 0 0.2020063 0.2302657 0.1346709 0.2302657 0.2693417 0.6866807 0.4026477 0.6866806 0 0.8495563 0.05888038 0.8495563 0.05888038 0.9169994 0.2017202 0.6866807 0.4026477 0.2302656 0 0.4584996 4.09817e-4 0.4584996 0.1345607 + 0.7294408 0.4026927 0.5565676 0.9981268 0.7294406 0.9986009 0.5565556 0.402686 0.4585115 0.9980884 0.5565676 0.9981268 1 0.9981465 0.9022532 0.4026588 0.9022533 0.9980995 0.9022532 0.4026588 0.7296274 0.9979444 0.9022533 0.9980995 0.448051 0.9993818 0.2242982 0.4040126 0.448051 0.4040852 0.4584999 0.4026477 0.6866806 0 0.6866807 0.4026477 0.2239893 0.4040126 0 0.9999269 1.42582e-4 0.4040188 0.2302657 0.2693417 0.4584997 0.4028625 0.2302658 0.4040126 0.2302657 0.1346709 0.2302657 0.2693417 0 0.2020063 0.9169994 0.2017202 0.8495561 0.3445602 0.6866807 0.4026477 0.4584996 4.09817e-4 0.2302657 0.1346709 0.2302656 0 0.7294408 0.4026927 0.5565556 0.402686 0.5565676 0.9981268 0.5565556 0.402686 0.4584997 0.4026477 0.4585115 0.9980884 1 0.9981465 1 0.4027057 0.9022532 0.4026588 0.9022532 0.4026588 0.7294408 0.4026477 0.7296274 0.9979444 0.448051 0.9993818 0.2239893 0.9994155 0.2242982 0.4040126 0.4584999 0.4026477 0.4584997 0 0.6866806 0 0.2239893 0.4040126 0.2239893 1 0 0.9999269 0.2302657 0.2693417 0.4584996 0.2687116 0.4584997 0.4028625 0 0.2020063 0.06744319 0.05916631 0.2302657 0.1346709 0.2302656 0 0.2302657 0.1346709 0.06744319 0.05916631 0.2302657 0.2693417 0.2302658 0.4040126 0.06744325 0.3448463 0.06744325 0.3448463 0 0.2020063 0.2302657 0.2693417 0.6866807 0.4026477 0.6866806 0 0.8495563 0.05888038 0.8495563 0.05888038 0.9169994 0.2017202 0.6866807 0.4026477 0.4584996 4.09817e-4 0.4584996 0.1345607 0.2302657 0.1346709 @@ -524,7 +524,7 @@ 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 -

3 0 0 4 0 1 2 0 2 5 1 3 6 1 4 4 1 5 6 2 6 9 2 7 8 2 8 9 3 9 0 3 10 8 3 11 1 4 12 10 4 13 0 4 14 10 5 15 2 5 16 0 5 17 13 6 18 3 6 19 2 6 20 16 7 21 1 7 22 15 7 23 15 8 24 9 8 25 7 8 26 6 9 27 8 9 28 0 9 29 3 10 30 17 10 31 14 10 32 3 11 33 5 11 34 4 11 35 5 12 36 7 12 37 6 12 38 6 13 39 7 13 40 9 13 41 9 14 42 1 14 43 0 14 44 1 15 45 11 15 46 10 15 47 10 16 48 13 16 49 2 16 50 13 17 51 12 17 52 3 17 53 16 18 54 11 18 55 1 18 56 7 19 57 5 19 58 14 19 59 5 20 60 3 20 61 14 20 62 1 21 63 9 21 64 15 21 65 7 19 66 14 19 67 15 19 68 0 22 69 2 22 70 4 22 71 4 23 72 6 23 73 0 23 74 3 24 75 12 24 76 17 24 77

+

3 0 0 4 0 1 2 0 2 5 1 3 6 1 4 4 1 5 6 2 6 9 2 7 8 2 8 9 3 9 0 3 10 8 3 11 1 4 12 10 4 13 0 4 14 10 5 15 2 5 16 0 5 17 13 6 18 3 6 19 2 6 20 15 7 21 11 7 22 1 7 23 14 8 24 15 8 25 7 8 26 6 9 27 8 9 28 0 9 29 12 10 30 14 10 31 3 10 32 3 11 33 5 11 34 4 11 35 5 12 36 7 12 37 6 12 38 6 13 39 7 13 40 9 13 41 9 14 42 1 14 43 0 14 44 1 15 45 11 15 46 10 15 47 10 16 48 13 16 49 2 16 50 13 17 51 12 17 52 3 17 53 15 18 54 16 18 55 11 18 56 7 8 57 5 8 58 14 8 59 3 8 60 14 8 61 5 8 62 15 19 63 1 19 64 9 19 65 9 20 66 7 20 67 15 20 68 0 21 69 2 21 70 4 21 71 4 22 72 6 22 73 0 22 74 12 23 75 17 23 76 14 23 77

diff --git a/shader/blurDirectional2_FS.hlsl b/shader/blurDirectional2_FS.hlsl index 1fdb8d0..fc75c25 100644 --- a/shader/blurDirectional2_FS.hlsl +++ b/shader/blurDirectional2_FS.hlsl @@ -8,7 +8,7 @@ uniform sampler2D uColorTexture; uniform sampler2D uBlurVec; uniform float uDeltaT = 1.f; -uniform int uSamples = 5; +uniform int uSamples = 15; uniform bool uSymetric = true; void main()