Tune caves

[oweals/minetest.git] / src / utility.cpp

diff --git a/src/utility.cpp b/src/utility.cpp
index 87c81cb2abdba5cd2526b281ab20f39efb2f2952..7c87b9ae4f06e326279c20ac0d31a030964ba724 100644 (file)
--- a/src/utility.cpp
+++ b/src/utility.cpp
@@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "sha1.h"
 #include "base64.h"
 #include "log.h"
+#include <iomanip>
 
 TimeTaker::TimeTaker(const char *name, u32 *result)
 {
@@ -172,27 +173,6 @@ int myrand_range(int min, int max)
        return (myrand()%(max-min+1))+min;
 }
 
-#ifndef SERVER
-// Sets the color of all vertices in the mesh
-void setMeshVerticesColor(scene::IMesh* mesh, video::SColor& color)
-{
-       if(mesh == NULL)
-               return;
-       
-       u16 mc = mesh->getMeshBufferCount();
-       for(u16 j=0; j<mc; j++)
-       {
-               scene::IMeshBuffer *buf = mesh->getMeshBuffer(j);
-               video::S3DVertex *vertices = (video::S3DVertex*)buf->getVertices();
-               u16 vc = buf->getVertexCount();
-               for(u16 i=0; i<vc; i++)
-               {
-                       vertices[i].Color = color;
-               }
-       }
-}
-#endif
-
 /*
        blockpos: position of block in block coordinates
        camera_pos: position of camera in nodes
@@ -228,7 +208,7 @@ bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir,
                return true;
 
        // If block is far away, it's not in sight
-       if(d > range * BS)
+       if(d > range)
                return false;
 
        // Maximum radius of a block
@@ -255,6 +235,100 @@ bool isBlockInSight(v3s16 blockpos_b, v3f camera_pos, v3f camera_dir,
        return true;
 }
 
+// Creates a string encoded in JSON format (almost equivalent to a C string literal)
+std::string serializeJsonString(const std::string &plain)
+{
+       std::ostringstream os(std::ios::binary);
+       os<<"\"";
+       for(size_t i = 0; i < plain.size(); i++)
+       {
+               char c = plain[i];
+               switch(c)
+               {
+                       case '"': os<<"\\\""; break;
+                       case '\\': os<<"\\\\"; break;
+                       case '/': os<<"\\/"; break;
+                       case '\b': os<<"\\b"; break;
+                       case '\f': os<<"\\f"; break;
+                       case '\n': os<<"\\n"; break;
+                       case '\r': os<<"\\r"; break;
+                       case '\t': os<<"\\t"; break;
+                       default:
+                       {
+                               if(c >= 32 && c <= 126)
+                               {
+                                       os<<c;
+                               }
+                               else
+                               {
+                                       u32 cnum = (u32) (u8) c;
+                                       os<<"\\u"<<std::hex<<std::setw(4)<<std::setfill('0')<<cnum;
+                               }
+                               break;
+                       }
+               }
+       }
+       os<<"\"";
+       return os.str();
+}
+
+// Reads a string encoded in JSON format
+std::string deSerializeJsonString(std::istream &is)
+{
+       std::ostringstream os(std::ios::binary);
+       char c, c2;
+
+       // Parse initial doublequote
+       is >> c;
+       if(c != '"')
+               throw SerializationError("JSON string must start with doublequote");
+
+       // Parse characters
+       for(;;)
+       {
+               c = is.get();
+               if(is.eof())
+                       throw SerializationError("JSON string ended prematurely");
+               if(c == '"')
+               {
+                       return os.str();
+               }
+               else if(c == '\\')
+               {
+                       c2 = is.get();
+                       if(is.eof())
+                               throw SerializationError("JSON string ended prematurely");
+                       switch(c2)
+                       {
+                               default:  os<<c2; break;
+                               case 'b': os<<'\b'; break;
+                               case 'f': os<<'\f'; break;
+                               case 'n': os<<'\n'; break;
+                               case 'r': os<<'\r'; break;
+                               case 't': os<<'\t'; break;
+                               case 'u':
+                               {
+                                       char hexdigits[4+1];
+                                       is.read(hexdigits, 4);
+                                       if(is.eof())
+                                               throw SerializationError("JSON string ended prematurely");
+                                       hexdigits[4] = 0;
+                                       std::istringstream tmp_is(hexdigits, std::ios::binary);
+                                       int hexnumber;
+                                       tmp_is >> std::hex >> hexnumber;
+                                       os<<((char)hexnumber);
+                                       break;
+                               }
+                       }
+               }
+               else
+               {
+                       os<<c;
+               }
+       }
+       return os.str();
+}
+
 // Get an sha-1 hash of the player's name combined with
 // the password entered. That's what the server uses as
 // their password. (Exception : if the password field is