Swimming in water and changed the texture pack to Sphax PureBDCraft

Swimming in lava is prohibited, it's dangerous!

Author: Vogtinator

chunk.cpp

@@ -493,7 +493,7 @@ bool Chunk::intersects(AABB &other)
     return false;
 }
 
-bool Chunk::intersectsRay(GLFix rx, GLFix ry, GLFix rz, GLFix dx, GLFix dy, GLFix dz, GLFix &dist, Position &pos, AABB::SIDE &side)
+bool Chunk::intersectsRay(GLFix rx, GLFix ry, GLFix rz, GLFix dx, GLFix dy, GLFix dz, GLFix &dist, Position &pos, AABB::SIDE &side, bool ignore_water)
 {
     GLFix shortest_dist;
     if(aabb.intersectsRay(rx, ry, rz, dx, dy, dz, shortest_dist) == AABB::NONE)
@@ -522,7 +522,7 @@ bool Chunk::intersectsRay(GLFix rx, GLFix ry, GLFix rz, GLFix dx, GLFix dy, GLFi
 
                 BLOCK_WDATA block = blocks[x][y][z];
 
-                if(block == BLOCK_AIR)
+                if(block == BLOCK_AIR || (getBLOCK(block) == BLOCK_WATER && ignore_water))
                     continue;
 
                 AABB test = aabb;

chunk.h

@@ -35,7 +35,7 @@ class Chunk
     void setGlobalBlockRelative(const int x, const int y, const int z, const BLOCK_WDATA block);
     AABB &getAABB() { return aabb; }
     bool intersects(AABB &other);
-    bool intersectsRay(GLFix x, GLFix y, GLFix z, GLFix dx, GLFix dy, GLFix dz, GLFix &dist, Position &pos, AABB::SIDE &side);
+    bool intersectsRay(GLFix x, GLFix y, GLFix z, GLFix dx, GLFix dy, GLFix dz, GLFix &dist, Position &pos, AABB::SIDE &side, bool ignore_water);
     void generate();
     bool saveToFile(FILE *file);
     bool loadFromFile(FILE *file);

license.txt

@@ -1,6 +1,6 @@
 Author: Fabian Vogt
-License: GPLv3: http://www.gnu.org/licenses/gpl-3.0.en.html
+License: GPLv3: http://www.gnu.org/licenses/gpl-3.0.en.html (Code only, not the resources)
 
-The terrain.png file has been downloaded from http://www.minecraftforum.net/topic/301268-16x146-and-146-sonicrumpets-mine-co-adventures-epicly-beautiful-textures/.
-The loading screen wallpaper is from http://wall.alphacoders.com/big.php?i=413114 and has been created by "miroha"
+The terrain.png file has been downloaded from http://bdcraft.net/purebdcraft-minecraft and is licensed under the Creative Commons Attribution 3.0 License.
+The loading screen wallpaper is from http://wall.alphacoders.com/big.php?i=413114 and has been created by "miroha".
 The PerlinNoise class is from https://github.com/sol-prog/Perlin_Noise and licensed under the GPL v3.

main.cpp

@@ -225,6 +225,7 @@ int main(int argc, char *argv[])
     bool key_held_down = true, can_jump = false, tp_had_contact = false, menu_held_down = true;
     int tp_last_x = 0, tp_last_y = 0;
     GLFix vy = 0; //Y-Velocity for gravity and jumps
+    bool in_water = false;
     Position selection_pos; AABB::SIDE selection_side; Position selection_pos_abs; bool do_test = true; //For intersectsRay
 
     //Resize the glass texture for use as selection overlay in the inventory
@@ -401,7 +402,10 @@ int main(int argc, char *argv[])
                 can_jump = world.intersect(aabb_moved);
 
                 if(!can_jump)
+                {
                     y += vy;
+                    aabb = aabb_moved;
+                }
                 else if(vy > GLFix(0))
                 {
                     can_jump = false;
@@ -411,6 +415,11 @@ int main(int argc, char *argv[])
                     vy = 0;
 
                 vy -= 5;
+
+                in_water = getBLOCK(world.getBlock((x / BLOCK_SIZE).floor(), ((y + eye_pos) / BLOCK_SIZE).floor(), (z / BLOCK_SIZE).floor())) == BLOCK_WATER;
+
+                if(in_water)
+                    can_jump = true;
             }
 
             if(keyPressed(KEY_NSPIRE_5) && can_jump) //Jump
@@ -484,7 +493,7 @@ int main(int argc, char *argv[])
             {
                 GLFix dx = fast_sin(yr)*fast_cos(xr), dy = -fast_sin(xr), dz = fast_cos(yr)*fast_cos(xr);
                 GLFix dist;
-                if(!world.intersectsRay(x, y + eye_pos, z, dx, dy, dz, selection_pos, selection_side, dist))
+                if(!world.intersectsRay(x, y + eye_pos, z, dx, dy, dz, selection_pos, selection_side, dist, in_water))
                     selection_side = AABB::NONE;
                 else
                     selection_pos_abs = {x + dx * dist, y + eye_pos + dy * dist, z + dz * dist};
@@ -532,7 +541,7 @@ int main(int argc, char *argv[])
                         {
                             //Only set the block if there's air
                             const BLOCK_WDATA current_block = world.getBlock(pos.x, pos.y, pos.z);
-                            if(current_block == BLOCK_AIR)
+                            if(current_block == BLOCK_AIR || (in_water && getBLOCK(current_block) == BLOCK_WATER))
                             {
                                 if(!global_block_renderer.isOriented(inventory_entries[current_inventory_slot]))
                                     world.changeBlock(pos.x, pos.y, pos.z, inventory_entries[current_inventory_slot]);

textures/terrain.h

@@ -143,7 +143,7 @@ bool World::intersect(AABB &other) const
     return false;
 }
 
-bool World::intersectsRay(GLFix x, GLFix y, GLFix z, GLFix dx, GLFix dy, GLFix dz, Position &result, AABB::SIDE &side, GLFix &dist) const
+bool World::intersectsRay(GLFix x, GLFix y, GLFix z, GLFix dx, GLFix dy, GLFix dz, Position &result, AABB::SIDE &side, GLFix &dist, bool ignore_water) const
 {
     dist = GLFix::maxValue();
     Position pos;
@@ -152,7 +152,7 @@ bool World::intersectsRay(GLFix x, GLFix y, GLFix z, GLFix dx, GLFix dy, GLFix d
         GLFix new_dist;
         AABB::SIDE new_side;
 
-        if(c->intersectsRay(x, y, z, dx, dy, dz, new_dist, pos, new_side))
+        if(c->intersectsRay(x, y, z, dx, dy, dz, new_dist, pos, new_side, ignore_water))
         {
             if(new_dist > dist)
                 continue;

textures/terrain.png

@@ -25,7 +25,7 @@ class World
     void setPosition(int x, int y, int z);
     bool blockAction(const int x, const int y, const int z);
     bool intersect(AABB &other) const;
-    bool intersectsRay(GLFix x, GLFix y, GLFix z, GLFix dx, GLFix dy, GLFix dz, Position &result, AABB::SIDE &side, GLFix &dist) const;
+    bool intersectsRay(GLFix x, GLFix y, GLFix z, GLFix dx, GLFix dy, GLFix dz, Position &result, AABB::SIDE &side, GLFix &dist, bool ignore_water) const;
     const PerlinNoise &noiseGenerator() const;
     void clear();
     bool loadFromFile(FILE *file);