Properly and efficiently use split utility headers

src/CMakeLists.txt

@@ -199,7 +199,6 @@ set(common_SRCS
  mapsector.cpp
  map.cpp
  player.cpp
- utility.cpp
  test.cpp
  sha1.cpp
  base64.cpp

src/camera.cpp

@@ -33,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "gamedef.h"
 #include "sound.h"
 #include "event.h"
+#include "util/numeric.h"
 
 Camera::Camera(scene::ISceneManager* smgr, MapDrawControl& draw_control,
  IGameDef *gamedef):
@@ -234,17 +235,17 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize,
 
  #if 1
  f32 bobknob = 1.2;
- f32 bobtmp = sin(pow(bobfrac, bobknob) * PI);
- //f32 bobtmp2 = cos(pow(bobfrac, bobknob) * PI);
+ f32 bobtmp = sin(pow(bobfrac, bobknob) * M_PI);
+ //f32 bobtmp2 = cos(pow(bobfrac, bobknob) * M_PI);
 
  v3f bobvec = v3f(
- 0.3 * bobdir * sin(bobfrac * PI),
+ 0.3 * bobdir * sin(bobfrac * M_PI),
  -0.28 * bobtmp * bobtmp,
  0.);
 
  //rel_cam_pos += 0.2 * bobvec;
  //rel_cam_target += 0.03 * bobvec;
- //rel_cam_up.rotateXYBy(0.02 * bobdir * bobtmp * PI);
+ //rel_cam_up.rotateXYBy(0.02 * bobdir * bobtmp * M_PI);
  float f = 1.0;
  f *= g_settings->getFloat("view_bobbing_amount");
  rel_cam_pos += bobvec * f;
@@ -253,10 +254,10 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize,
  rel_cam_target.Z -= 0.005 * bobvec.Z * f;
  //rel_cam_target.X -= 0.005 * bobvec.X * f;
  //rel_cam_target.Y -= 0.005 * bobvec.Y * f;
- rel_cam_up.rotateXYBy(-0.03 * bobdir * bobtmp * PI * f);
+ rel_cam_up.rotateXYBy(-0.03 * bobdir * bobtmp * M_PI * f);
  #else
- f32 angle_deg = 1 * bobdir * sin(bobfrac * PI);
- f32 angle_rad = angle_deg * PI / 180;
+ f32 angle_deg = 1 * bobdir * sin(bobfrac * M_PI);
+ f32 angle_rad = angle_deg * M_PI / 180;
  f32 r = 0.05;
  v3f off = v3f(
  r * sin(angle_rad),
@@ -289,7 +290,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize,
 
  // FOV and aspect ratio
  m_aspect = (f32)screensize.X / (f32) screensize.Y;
- m_fov_y = fov_degrees * PI / 180.0;
+ m_fov_y = fov_degrees * M_PI / 180.0;
  // Increase vertical FOV on lower aspect ratios (<16:10)
  m_fov_y *= MYMAX(1.0, MYMIN(1.4, sqrt(16./10. / m_aspect)));
  // WTF is this? It can't be right
@@ -320,22 +321,22 @@ void Camera::update(LocalPlayer* player, f32 frametime, v2u32 screensize,
  if (m_digging_button != -1)
  {
  f32 digfrac = m_digging_anim;
- wield_position.X -= 30 * sin(pow(digfrac, 0.8f) * PI);
- wield_position.Y += 15 * sin(digfrac * 2 * PI);
+ wield_position.X -= 30 * sin(pow(digfrac, 0.8f) * M_PI);
+ wield_position.Y += 15 * sin(digfrac * 2 * M_PI);
  wield_position.Z += 5 * digfrac;
 
  // Euler angles are PURE EVIL, so why not use quaternions?
  core::quaternion quat_begin(wield_rotation * core::DEGTORAD);
  core::quaternion quat_end(v3f(90, -10, -130) * core::DEGTORAD);
  core::quaternion quat_slerp;
- quat_slerp.slerp(quat_begin, quat_end, sin(digfrac * PI));
+ quat_slerp.slerp(quat_begin, quat_end, sin(digfrac * M_PI));
  quat_slerp.toEuler(wield_rotation);
  wield_rotation *= core::RADTODEG;
  }
  else {
  f32 bobfrac = my_modf(m_view_bobbing_anim);
- wield_position.X -= sin(bobfrac*PI*2.0) * 3.0;
- wield_position.Y += sin(my_modf(bobfrac*2.0)*PI) * 3.0;
+ wield_position.X -= sin(bobfrac*M_PI*2.0) * 3.0;
+ wield_position.Y += sin(my_modf(bobfrac*2.0)*M_PI) * 3.0;
  }
  m_wieldnode->setPosition(wield_position);
  m_wieldnode->setRotation(wield_rotation);
@@ -538,7 +539,7 @@ void Camera::drawWieldedTool()
  // Draw the wielded node (in a separate scene manager)
  scene::ICameraSceneNode* cam = m_wieldmgr->getActiveCamera();
  cam->setAspectRatio(m_cameranode->getAspectRatio());
- cam->setFOV(72.0*PI/180.0);
+ cam->setFOV(72.0*M_PI/180.0);
  cam->setNearValue(0.1);
  cam->setFarValue(100);
  m_wieldmgr->drawAll();

src/camera.h

@@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "inventory.h"
 #include "mesh.h"
 #include "tile.h"
-#include "utility.h"
+#include "util/numeric.h"
 #include <ICameraSceneNode.h>
 
 class LocalPlayer;

src/chat.cpp

@@ -19,10 +19,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "chat.h"
 #include "debug.h"
-#include "utility.h"
 #include <cassert>
 #include <cctype>
 #include <sstream>
+#include "util/string.h"
+#include "util/numeric.h"
 
 ChatBuffer::ChatBuffer(u32 scrollback):
  m_scrollback(scrollback),

src/client.cpp

@@ -18,7 +18,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "client.h"
-#include "utility.h"
 #include <iostream>
 #include "clientserver.h"
 #include "jmutexautolock.h"

src/client.h

@@ -28,12 +28,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <set>
 #include <vector>
 #include "clientobject.h"
-#include "utility.h" // For IntervalLimiter
 #include "gamedef.h"
 #include "inventorymanager.h"
 #include "filesys.h"
 #include "filecache.h"
 #include "localplayer.h"
+#include "util/pointedthing.h"
 
 struct MeshMakeData;
 class MapBlockMesh;

src/clientmap.cpp

@@ -46,7 +46,7 @@ ClientMap::ClientMap(
  m_control(control),
  m_camera_position(0,0,0),
  m_camera_direction(0,0,1),
- m_camera_fov(PI)
+ m_camera_fov(M_PI)
 {
  m_camera_mutex.Init();
  assert(m_camera_mutex.IsInitialized());

src/clientserver.h

@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CLIENTSERVER_HEADER
 #define CLIENTSERVER_HEADER
 
-#include "utility.h"
+#include "util/serialize.h"
 
 /*
  changes by PROTOCOL_VERSION:

src/connection.cpp

@@ -22,10 +22,22 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serialization.h"
 #include "log.h"
 #include "porting.h"
+#include "util/serialize.h"
+#include "util/numeric.h"
+#include "util/string.h"
 
 namespace con
 {
 
+static u16 readPeerId(u8 *packetdata)
+{
+ return readU16(&packetdata[4]);
+}
+static u8 readChannel(u8 *packetdata)
+{
+ return readU8(&packetdata[6]);
+}
+
 BufferedPacket makePacket(Address &address, u8 *data, u32 datasize,
  u32 protocol_id, u16 sender_peer_id, u8 channel)
 {

src/connection.h

@@ -20,14 +20,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef CONNECTION_HEADER
 #define CONNECTION_HEADER
 
-#include <iostream>
-#include <fstream>
-#include "debug.h"
-#include "common_irrlicht.h"
+#include "irrlichttypes.h"
 #include "socket.h"
-#include "utility.h"
 #include "exceptions.h"
 #include "constants.h"
+#include "util/pointer.h"
+#include "util/container.h"
+#include "util/thread.h"
+#include <iostream>
+#include <fstream>
 
 namespace con
 {
@@ -107,15 +108,6 @@ class ProcessedSilentlyException : public BaseException
  {}
 };
 
-inline u16 readPeerId(u8 *packetdata)
-{
- return readU16(&packetdata[4]);
-}
-inline u8 readChannel(u8 *packetdata)
-{
- return readU8(&packetdata[6]);
-}
-
 #define SEQNUM_MAX 65535
 inline bool seqnum_higher(u16 higher, u16 lower)
 {

src/constants.h

@@ -28,8 +28,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
  Some things here are legacy crap.
 */
 
-#define PI 3.14159
-
 /*
  Connection
 */

src/content_cao.cpp

@@ -30,13 +30,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "clientobject.h"
 #include "content_object.h"
 #include "mesh.h"
-#include "utility.h" // For IntervalLimiter
 #include "itemdef.h"
 #include "tool.h"
 #include "content_cso.h"
 #include "sound.h"
 #include "nodedef.h"
 #include "localplayer.h"
+#include "util/numeric.h" // For IntervalLimiter
+#include "util/serialize.h"
+
 class Settings;
 struct ToolCapabilities;
 
@@ -935,7 +937,7 @@ class GenericCAO : public ClientActiveObject
  }
  }
  if(fabs(m_prop.automatic_rotate) > 0.001){
- m_yaw += dtime * m_prop.automatic_rotate * 180 / PI;
+ m_yaw += dtime * m_prop.automatic_rotate * 180 / M_PI;
  updateNodePos();
  }
  }
@@ -961,7 +963,7 @@ class GenericCAO : public ClientActiveObject
  else if(cam_to_entity.Y < -0.75)
  col += 4;
  else{
- float mob_dir = atan2(cam_to_entity.Z, cam_to_entity.X) / PI * 180.;
+ float mob_dir = atan2(cam_to_entity.Z, cam_to_entity.X) / M_PI * 180.;
  float dir = mob_dir - m_yaw;
  dir = wrapDegrees_180(dir);
  //infostream<<"id="<<m_id<<" dir="<<dir<<std::endl;

src/content_mapblock.cpp

@@ -25,6 +25,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "nodedef.h"
 #include "tile.h"
 #include "gamedef.h"
+#include "util/numeric.h"
+#include "util/serialize.h"
+#include "util/directiontables.h"
 
 // Create a cuboid.
 // collector - the MeshCollector for the resulting polygons

src/content_mapnode.cpp

@@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes.h"
 #include "mapnode.h"
 #include "nodedef.h"
-#include "utility.h"
 #include "nameidmapping.h"
 #include <map>
 

src/content_nodemeta.cpp

@@ -20,7 +20,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "content_nodemeta.h"
 #include "inventory.h"
 #include "log.h"
-#include "utility.h"
+#include "util/serialize.h"
+#include "util/string.h"
+#include "constants.h" // MAP_BLOCKSIZE
 #include <sstream>
 
 #define NODEMETA_GENERIC 1

src/content_sao.cpp

@@ -29,6 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "player.h"
 #include "scriptapi.h"
 #include "genericobject.h"
+#include "util/serialize.h"
 
 core::map<u16, ServerActiveObject::Factory> ServerActiveObject::m_types;
 

src/craftdef.cpp

@@ -23,9 +23,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "log.h"
 #include <sstream>
 #include <set>
-#include "utility.h"
 #include "gamedef.h"
 #include "inventory.h"
+#include "util/serialize.h"
 
 // Check if input matches recipe
 // Takes recipe groups into account

src/environment.h

@@ -35,8 +35,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "player.h"
 #include "map.h"
 #include <ostream>
-#include "utility.h"
 #include "activeobject.h"
+#include "util/container.h"
+#include "util/numeric.h"
 
 class Server;
 class ServerEnvironment;

src/filecache.cpp

@@ -23,12 +23,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "clientserver.h"
 #include "log.h"
 #include "filesys.h"
-#include "utility.h"
 #include "hex.h"
 #include "sha1.h"
 #include <string>
 #include <iostream>
 #include <fstream>
+#include <sstream>
 
 bool FileCache::loadByPath(const std::string &path, std::ostream &os)
 {

src/genericobject.cpp

@@ -18,8 +18,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 */
 
 #include "genericobject.h"
-#include "utility.h"
 #include <sstream>
+#include "util/serialize.h"
 
 std::string gob_cmd_set_properties(const ObjectProperties &prop)
 {

src/guiConfirmMenu.h

@@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "common_irrlicht.h"
 #include "modalMenu.h"
-#include "utility.h"
 #include <string>
 
 struct ConfirmDest

src/guiCreateWorld.cpp

@@ -27,8 +27,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <IGUIStaticText.h>
 #include <IGUIFont.h>
 #include <IGUIListBox.h>
-
 #include "gettext.h"
+#include "util/string.h"
 
 enum
 {

src/guiCreateWorld.h

@@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "common_irrlicht.h"
 #include "modalMenu.h"
-#include "utility.h"
 #include <string>
 #include "subgame.h"
 

src/guiDeathScreen.h

@@ -22,7 +22,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "common_irrlicht.h"
 #include "modalMenu.h"
-#include "utility.h"
 #include <string>
 
 class IRespawnInitiator

src/guiInventoryMenu.cpp

@@ -30,6 +30,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <IGUIFont.h>
 #include "log.h"
 #include "tile.h" // ITextureSource
+#include "util/string.h"
+#include "util/numeric.h"
 
 void drawItemStack(video::IVideoDriver *driver,
  gui::IGUIFont *font,

src/guiInventoryMenu.h

@@ -24,7 +24,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "common_irrlicht.h"
 #include "inventory.h"
 #include "inventorymanager.h"
-#include "utility.h"
 #include "modalMenu.h"
 
 class IGameDef;