diff --git a/Levels/ObjectSetups/BackupLevel1.xml b/Levels/ObjectSetups/BackupLevel1.xml index e69de29..730bf7e 100644 --- a/Levels/ObjectSetups/BackupLevel1.xml +++ b/Levels/ObjectSetups/BackupLevel1.xml @@ -0,0 +1,1974 @@ + + 1.0 + 0.0 + 0.0 + 0.0 + false + 210.500000 + 0.0 + -220.500000 + 1 + 67 + 20 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -126.500000 + 1 + 66 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -127.500000 + 1 + 65 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -128.500000 + 1 + 64 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -129.500000 + 1 + 63 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -130.500000 + 1 + 62 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -131.500000 + 1 + 61 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -132.500000 + 1 + 60 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -133.500000 + 1 + 59 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -134.500000 + 1 + 58 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -135.500000 + 1 + 57 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -136.500000 + 1 + 56 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -137.500000 + 1 + 55 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -138.500000 + 1 + 54 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -139.500000 + 1 + 53 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -140.500000 + 1 + 52 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -141.500000 + 1 + 51 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -142.500000 + 1 + 50 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -143.500000 + 1 + 49 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -144.500000 + 1 + 48 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -145.500000 + 1 + 47 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -146.500000 + 1 + 46 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -147.500000 + 1 + 45 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -148.500000 + 1 + 44 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -149.500000 + 1 + 43 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -150.500000 + 1 + 42 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -151.500000 + 1 + 41 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -152.500000 + 1 + 40 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -153.500000 + 1 + 39 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -154.500000 + 1 + 38 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -155.500000 + 1 + 37 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -156.500000 + 1 + 36 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -157.500000 + 1 + 35 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -158.500000 + 1 + 34 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -159.500000 + 1 + 33 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -160.500000 + 1 + 32 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -161.500000 + 1 + 31 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -162.500000 + 1 + 30 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -163.500000 + 1 + 29 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -164.500000 + 1 + 28 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -165.500000 + 1 + 27 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -166.500000 + 1 + 26 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -167.500000 + 1 + 25 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -168.500000 + 1 + 24 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -169.500000 + 1 + 23 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -170.500000 + 1 + 22 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -171.500000 + 1 + 21 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -172.500000 + 1 + 20 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -173.500000 + 1 + 19 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -174.500000 + 1 + 18 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -175.500000 + 1 + 17 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -176.500000 + 1 + 16 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -177.500000 + 1 + 15 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -178.500000 + 1 + 14 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -179.500000 + 1 + 13 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -180.500000 + 1 + 12 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -181.500000 + 1 + 11 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -182.500000 + 1 + 10 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -183.500000 + 1 + 9 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -184.500000 + 1 + 8 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -185.500000 + 1 + 7 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -186.500000 + 1 + 6 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -187.500000 + 1 + 5 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -188.500000 + 1 + 4 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -189.500000 + 1 + 3 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -190.500000 + 1 + 2 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 187.500000 + 0.0 + -191.500000 + 1 + 1 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 1.0 + 1.0 + + + + 0.10 + 0.14 + 0.14 + 1.0 + + + + -1.0 + 1.5 + 1.0 + 1.0 + 1.0 + 0.9 + 0.2 + + + + skydome.png + + + + 0.9 + 100.0 + diff --git a/Levels/ObjectSetups/Level1.png b/Levels/ObjectSetups/Level1.png index fe4597a..c3b8cdd 100644 Binary files a/Levels/ObjectSetups/Level1.png and b/Levels/ObjectSetups/Level1.png differ diff --git a/Levels/ObjectSetups/Level1.xcf b/Levels/ObjectSetups/Level1.xcf index 6d76e80..af2b9df 100644 Binary files a/Levels/ObjectSetups/Level1.xcf and b/Levels/ObjectSetups/Level1.xcf differ diff --git a/Levels/ObjectSetups/Level1.xml b/Levels/ObjectSetups/Level1.xml index 730bf7e..a0c871e 100644 --- a/Levels/ObjectSetups/Level1.xml +++ b/Levels/ObjectSetups/Level1.xml @@ -8,7 +8,7 @@ 0.0 -220.500000 1 - 67 + 134 20 - @@ -27,6 +27,35 @@ + + 1.0 + 0.0 + 0.0 + 0.0 + false + 205.500000 + 0.0 + -220.500000 + 1 + 133 + 80 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + 1.0 0.0 @@ -37,7 +66,7 @@ 0.0 -126.500000 1 - 66 + 132 140 - @@ -66,7 +95,7 @@ 0.0 -127.500000 1 - 65 + 131 140 - @@ -95,7 +124,7 @@ 0.0 -128.500000 1 - 64 + 130 140 - @@ -124,7 +153,7 @@ 0.0 -129.500000 1 - 63 + 129 140 - @@ -153,7 +182,7 @@ 0.0 -130.500000 1 - 62 + 128 140 - @@ -182,7 +211,7 @@ 0.0 -131.500000 1 - 61 + 127 140 - @@ -211,7 +240,7 @@ 0.0 -132.500000 1 - 60 + 126 140 - @@ -240,7 +269,7 @@ 0.0 -133.500000 1 - 59 + 125 140 - @@ -269,7 +298,7 @@ 0.0 -134.500000 1 - 58 + 124 140 - @@ -298,7 +327,7 @@ 0.0 -135.500000 1 - 57 + 123 140 - @@ -327,7 +356,7 @@ 0.0 -136.500000 1 - 56 + 122 140 - @@ -356,7 +385,7 @@ 0.0 -137.500000 1 - 55 + 121 140 - @@ -385,7 +414,7 @@ 0.0 -138.500000 1 - 54 + 120 140 - @@ -414,7 +443,7 @@ 0.0 -139.500000 1 - 53 + 119 140 - @@ -443,7 +472,7 @@ 0.0 -140.500000 1 - 52 + 118 140 - @@ -472,7 +501,7 @@ 0.0 -141.500000 1 - 51 + 117 140 - @@ -501,7 +530,7 @@ 0.0 -142.500000 1 - 50 + 116 140 - @@ -530,7 +559,7 @@ 0.0 -143.500000 1 - 49 + 115 140 - @@ -559,7 +588,7 @@ 0.0 -144.500000 1 - 48 + 114 140 - @@ -588,7 +617,7 @@ 0.0 -145.500000 1 - 47 + 113 140 - @@ -617,7 +646,7 @@ 0.0 -146.500000 1 - 46 + 112 140 - @@ -646,7 +675,7 @@ 0.0 -147.500000 1 - 45 + 111 140 - @@ -675,7 +704,7 @@ 0.0 -148.500000 1 - 44 + 110 140 - @@ -704,7 +733,7 @@ 0.0 -149.500000 1 - 43 + 109 140 - @@ -733,7 +762,7 @@ 0.0 -150.500000 1 - 42 + 108 140 - @@ -762,7 +791,7 @@ 0.0 -151.500000 1 - 41 + 107 140 - @@ -791,7 +820,7 @@ 0.0 -152.500000 1 - 40 + 106 140 - @@ -820,7 +849,7 @@ 0.0 -153.500000 1 - 39 + 105 140 - @@ -849,7 +878,7 @@ 0.0 -154.500000 1 - 38 + 104 140 - @@ -878,7 +907,7 @@ 0.0 -155.500000 1 - 37 + 103 140 - @@ -907,7 +936,7 @@ 0.0 -156.500000 1 - 36 + 102 140 - @@ -936,7 +965,7 @@ 0.0 -157.500000 1 - 35 + 101 140 - @@ -965,7 +994,7 @@ 0.0 -158.500000 1 - 34 + 100 140 - @@ -994,7 +1023,7 @@ 0.0 -159.500000 1 - 33 + 99 140 - @@ -1023,7 +1052,7 @@ 0.0 -160.500000 1 - 32 + 98 140 - @@ -1052,7 +1081,7 @@ 0.0 -161.500000 1 - 31 + 97 140 - @@ -1081,7 +1110,7 @@ 0.0 -162.500000 1 - 30 + 96 140 - @@ -1110,7 +1139,7 @@ 0.0 -163.500000 1 - 29 + 95 140 - @@ -1139,7 +1168,7 @@ 0.0 -164.500000 1 - 28 + 94 140 - @@ -1168,7 +1197,7 @@ 0.0 -165.500000 1 - 27 + 93 140 - @@ -1197,7 +1226,7 @@ 0.0 -166.500000 1 - 26 + 92 140 - @@ -1226,7 +1255,7 @@ 0.0 -167.500000 1 - 25 + 91 140 - @@ -1255,7 +1284,7 @@ 0.0 -168.500000 1 - 24 + 90 140 - @@ -1284,7 +1313,7 @@ 0.0 -169.500000 1 - 23 + 89 140 - @@ -1313,7 +1342,7 @@ 0.0 -170.500000 1 - 22 + 88 140 - @@ -1342,7 +1371,7 @@ 0.0 -171.500000 1 - 21 + 87 140 - @@ -1371,7 +1400,7 @@ 0.0 -172.500000 1 - 20 + 86 140 - @@ -1400,7 +1429,7 @@ 0.0 -173.500000 1 - 19 + 85 140 - @@ -1429,7 +1458,7 @@ 0.0 -174.500000 1 - 18 + 84 140 - @@ -1458,7 +1487,7 @@ 0.0 -175.500000 1 - 17 + 83 140 - @@ -1487,7 +1516,7 @@ 0.0 -176.500000 1 - 16 + 82 140 - @@ -1516,7 +1545,7 @@ 0.0 -177.500000 1 - 15 + 81 140 - @@ -1545,7 +1574,7 @@ 0.0 -178.500000 1 - 14 + 80 140 - @@ -1574,7 +1603,7 @@ 0.0 -179.500000 1 - 13 + 79 140 - @@ -1603,7 +1632,7 @@ 0.0 -180.500000 1 - 12 + 78 140 - @@ -1632,7 +1661,7 @@ 0.0 -181.500000 1 - 11 + 77 140 - @@ -1661,7 +1690,7 @@ 0.0 -182.500000 1 - 10 + 76 140 - @@ -1690,7 +1719,7 @@ 0.0 -183.500000 1 - 9 + 75 140 - @@ -1719,7 +1748,7 @@ 0.0 -184.500000 1 - 8 + 74 140 - @@ -1748,7 +1777,7 @@ 0.0 -185.500000 1 - 7 + 73 140 - @@ -1777,7 +1806,7 @@ 0.0 -186.500000 1 - 6 + 72 140 - @@ -1806,7 +1835,7 @@ 0.0 -187.500000 1 - 5 + 71 140 - @@ -1835,7 +1864,7 @@ 0.0 -188.500000 1 - 4 + 70 140 - @@ -1864,7 +1893,7 @@ 0.0 -189.500000 1 - 3 + 69 140 - @@ -1893,7 +1922,7 @@ 0.0 -190.500000 1 - 2 + 68 140 - @@ -1922,7 +1951,7 @@ 0.0 -191.500000 1 - 1 + 67 140 - @@ -1941,6 +1970,35 @@ + + 1.0 + 0.0 + 0.0 + 0.0 + false + 210.500000 + 0.0 + -220.500000 + 1 + 67 + 20 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + 1.0 1.0 diff --git a/Shader/phong.fsh b/Shader/phong.fsh index 7c5ead4..0f566c9 100644 --- a/Shader/phong.fsh +++ b/Shader/phong.fsh @@ -47,11 +47,12 @@ vec2 poissonDisk[16] = vec2[]( ); float sampleDirectionalShadow(sampler2DShadow shadowMap, vec4 shadowCoord) { + float nearPlane = 0.1; float visibility = 1.0; float bias = 0.001*tan(acos(clamp(dot(vNormal, -directionalLightVector), 0.0, 1.0))); bias = clamp(bias, 0.0, 0.01); for (int i=0; i<4; i++) { - visibility -= directionalIntensity/16*(1.0-texture(shadowMap, vec3(shadowCoord.xy + poissonDisk[i]/700.0, (shadowCoord.z - bias)/shadowCoord.w))); + visibility -= directionalIntensity/16*(1.0-texture(shadowMap, vec3(shadowCoord.xy + poissonDisk[i]/700.0, shadowCoord.z - bias))); } if (visibility == 1.0-(directionalIntensity/16)*4) { @@ -59,7 +60,7 @@ float sampleDirectionalShadow(sampler2DShadow shadowMap, vec4 shadowCoord) { } else if (visibility != 1.0) { for (int i=0; i<12; i++) { - visibility -= directionalIntensity/16*(1.0-texture(shadowMap, vec3(shadowCoord.xy + poissonDisk[i]/700.0, (shadowCoord.z - bias)/shadowCoord.w))); + visibility -= directionalIntensity/16*(1.0-texture(shadowMap, vec3(shadowCoord.xy + poissonDisk[i]/700.0, shadowCoord.z - bias))); } } return visibility;