diff --git a/Levels/ObjectSetups/BackupLevel1.png b/Levels/ObjectSetups/BackupLevel1.png index 6e8cddb..c5c6050 100644 Binary files a/Levels/ObjectSetups/BackupLevel1.png and b/Levels/ObjectSetups/BackupLevel1.png differ diff --git a/Levels/ObjectSetups/BackupLevel1.xcf b/Levels/ObjectSetups/BackupLevel1.xcf new file mode 100644 index 0000000..39981b7 Binary files /dev/null and b/Levels/ObjectSetups/BackupLevel1.xcf differ diff --git a/Levels/ObjectSetups/BackupLevel1.xml b/Levels/ObjectSetups/BackupLevel1.xml index 6a61333..1c36bb4 100644 --- a/Levels/ObjectSetups/BackupLevel1.xml +++ b/Levels/ObjectSetups/BackupLevel1.xml @@ -1,3 +1,1511 @@ + + 1.0 + 0.0 + 0.0 + 0.0 + false + 210.500000 + 0.0 + -220.500000 + 1 + 200 + 20 + + - + 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 + 199 + 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 + 198 + 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 + 197 + 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 + 196 + 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 + 195 + 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 + 194 + 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 + 193 + 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 + 192 + 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 + 191 + 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 + 190 + 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 + 189 + 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 + 188 + 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 + 187 + 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 + 186 + 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 + 185 + 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 + 184 + 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 + 183 + 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 + 182 + 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 + 181 + 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 + 180 + 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 + 179 + 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 + 178 + 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 + 177 + 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 + 176 + 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 + 175 + 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 + 174 + 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 + 173 + 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 + 172 + 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 + 171 + 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 + 170 + 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 + 169 + 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 + 168 + 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 + 167 + 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 + 166 + 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 + 165 + 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 + 164 + 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 + 163 + 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 + 162 + 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 + 161 + 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 + 160 + 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 + 159 + 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 + 158 + 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 + 157 + 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 + 156 + 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 + 155 + 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 + 154 + 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 + 153 + 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 + 152 + 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 + 151 + 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 + 150 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 210.500000 + 0.0 + -220.500000 + 1 + 150 + 20 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + 1.0 1.0 @@ -25,28 +1533,7 @@ skydome.png - - bla - 15.0 - 14.0 - 0.0 - 4.0 - false - 1 - 100 - 0 - 0 - - - - - - 0.0 - 0.0 - 0.0 - 1.0 - false - 0 - 0 - 0 - - - + + 0.9 + 100.0 + diff --git a/Levels/ObjectSetups/Compositions.xml b/Levels/ObjectSetups/Compositions.xml index bf97041..c20cadc 100644 --- a/Levels/ObjectSetups/Compositions.xml +++ b/Levels/ObjectSetups/Compositions.xml @@ -123,6 +123,19 @@ + + + 140 + + block.obj + 0.0 + 10.0 + 2.0 + 1.5 + 0.0 + + + @@ -136,7 +149,7 @@ 3.0 Player 1.5 - 0.1 + 0.3 0.7 diff --git a/Levels/ObjectSetups/Level1.png b/Levels/ObjectSetups/Level1.png index c5c6050..ffeb13f 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 new file mode 100644 index 0000000..d3931d2 Binary files /dev/null and b/Levels/ObjectSetups/Level1.xcf differ diff --git a/Levels/ObjectSetups/Level1.xml b/Levels/ObjectSetups/Level1.xml index 24f41f4..bb74ce0 100644 --- a/Levels/ObjectSetups/Level1.xml +++ b/Levels/ObjectSetups/Level1.xml @@ -4,42 +4,27 @@ 0.0 0.0 false - 5.500000 + 210.500000 0.0 - 5.500000 - 1 - 5 + -220.500000 + 2 + 11 20 - deleteRandomObjectToTheRight - 10.0 - 14.0 - 5.0 + - + 0 + 0 + 0 - - - 3.0 + 1.0 false 0 - deleteRandomObject + - 0 0 0 - - deleteMarbleAtTorch - 0.0 - 0.0 - 0.0 - 1 - 3 - 2.5 - false - 0 - deleteObject - 1 - 5 - 0 - @@ -48,17 +33,191 @@ 0.0 0.0 false - 5.500000 - 1.0 - -5.500000 - 1 + 187.500000 + 0.0 + -126.500000 + 2 + 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 + -127.500000 + 2 + 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 + -128.500000 + 2 + 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 + -129.500000 + 2 + 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 + -130.500000 + 2 + 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 + -131.500000 + 2 + 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 + -132.500000 + 2 4 - 40 + 140 - - 0.0 - 0.0 - 0.0 + 0 + 0 + 0 - - 1.0 @@ -77,17 +236,17 @@ 0.0 0.0 false - 0.500000 - 1.0 - 5.500000 - 1 + 187.500000 + 0.0 + -133.500000 + 2 3 - 80 + 140 - - 0.0 - 0.0 - 0.0 + 0 + 0 + 0 - - 1.0 @@ -106,17 +265,17 @@ 0.0 0.0 false - -1.500000 - 1.0 - -4.500000 - 1 + 187.500000 + 0.0 + -134.500000 + 2 2 - 40 + 140 - - 0.0 - 0.0 - 0.0 + 0 + 0 + 0 - - 1.0 @@ -135,17 +294,1670 @@ 0.0 0.0 false - -4.500000 - 1.0 - 1.500000 - 1 + 187.500000 + 0.0 + -135.500000 + 2 1 - 40 + 140 - - 0.0 - 0.0 - 0.0 + 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 + 2 + 0 + 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 + 254 + 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 + 253 + 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 + 252 + 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 + 251 + 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 + 250 + 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 + 249 + 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 + 248 + 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 + 247 + 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 + 246 + 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 + 245 + 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 + 244 + 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 + 243 + 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 + 242 + 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 + 241 + 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 + 240 + 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 + 239 + 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 + 238 + 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 + 237 + 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 + 236 + 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 + 235 + 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 + 234 + 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 + 233 + 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 + 232 + 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 + 231 + 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 + 230 + 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 + 229 + 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 + 228 + 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 + 227 + 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 + 226 + 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 + 225 + 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 + 224 + 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 + 223 + 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 + 222 + 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 + 221 + 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 + 220 + 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 + 219 + 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 + 218 + 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 + 217 + 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 + 216 + 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 + 215 + 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 + 214 + 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 + 213 + 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 + 212 + 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 + 211 + 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 + 210 + 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 + 209 + 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 + 208 + 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 + 207 + 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 + 206 + 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 + 205 + 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 + 204 + 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 + 203 + 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 + 202 + 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 + 201 + 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 + 200 + 140 + + - + 0 + 0 + 0 + - + - + 1.0 + false + 0 + - + 0 + 0 + 0 + + + + + 1.0 + 0.0 + 0.0 + 0.0 + false + 210.500000 + 0.0 + -220.500000 + 1 + 200 + 20 + + - + 0 + 0 + 0 - - 1.0 diff --git a/Levels/heightmapLvl1.png b/Levels/heightmapLvl1.png index ec1d600..17d0873 100644 Binary files a/Levels/heightmapLvl1.png and b/Levels/heightmapLvl1.png differ diff --git a/Levels/heightmapLvl1.xcf b/Levels/heightmapLvl1.xcf index b1418f7..40e3d3a 100644 Binary files a/Levels/heightmapLvl1.xcf and b/Levels/heightmapLvl1.xcf differ diff --git a/level.cc b/level.cc index 824e6ca..5d24e37 100644 --- a/level.cc +++ b/level.cc @@ -81,7 +81,7 @@ void Level::load() { Material terrainMaterial = Material("seamlessTerrain.png", 0.1f, 0.8f, 0.2f, 3.0f); //Create object Object* terrainObject = new Object(terrainModel, terrainMaterial, - glm::vec3(-0.5f*(float)this->terrain.getHeightmapHeight(), 0.0f, -0.5f*(float)this->terrain.getHeightmapWidth()), + glm::vec3(-0.5*(float)this->terrain.getHeightmapHeight(), 0.0f, -0.5f*(float)this->terrain.getHeightmapWidth()), glm::vec3(0.0f, 0.0f, 0.0f)); objects.push_back(terrainObject); diff --git a/terrain.cc b/terrain.cc index bc9f202..8bb540e 100644 --- a/terrain.cc +++ b/terrain.cc @@ -22,7 +22,7 @@ void Terrain::load() { for(unsigned int rowNum = 0; rowNum < this->heightmapHeight; rowNum++){ //read in the heightmap this->heightmap[rowNum] = new float[this->heightmapWidth]; for(unsigned int columnNum = 0; columnNum < this->heightmapWidth; columnNum++){ - this->heightmap[rowNum][columnNum] = (float)(image[(rowNum*heightmapWidth+columnNum)*4]) / 8; //<--heightmap is scaled here + this->heightmap[rowNum][columnNum] = (float)(image[(rowNum*heightmapWidth+columnNum)*4]) / 6; //<--heightmap is scaled here } }