Update header names

diff --git a/mesh2c.cpp b/mesh2c.cpp
index c68e63a9248d9c361fbea205522dc77cdf20098e..864fa936c26a74030cb8c230e20128055db7d594 100644 (file)
--- a/mesh2c.cpp
+++ b/mesh2c.cpp
@@ -1,7 +1,7 @@
 #include <msp/core/getopt.h>
 #include <msp/gl/mesh.h>
 #include <msp/io/print.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 
 using namespace std;
 using namespace Msp;

diff --git a/source/bloom.cpp b/source/bloom.cpp
index 0ff0c5da34210c2b155150934603dc0fbec2ef5c..f1b570bfb7205e395f139d4a90941192a3e4d2e6 100644 (file)
--- a/source/bloom.cpp
+++ b/source/bloom.cpp
@@ -1,5 +1,5 @@
 #include <cmath>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "blend.h"
 #include "bloom.h"
 #include "meshbuilder.h"

diff --git a/source/extension.cpp b/source/extension.cpp
index f18067989a8ba97c1a71759ad6a323c00ebdb2fd..e47bbe197c5e7d924e3e7da49799beba76a26867 100644 (file)
--- a/source/extension.cpp
+++ b/source/extension.cpp
@@ -3,7 +3,7 @@
 #define GLX_GLXEXT_PROTOTYPES
 #include <GL/glx.h>
 #endif
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include <msp/strings/utils.h>
 #include "arb_shader_objects.h"
 #include "arb_vertex_buffer_object.h"

diff --git a/source/object.cpp b/source/object.cpp
index d573fdd4975695eddfd3d164eca0128d97936937..70c2aeeec8b616dbda605255f7463f87fd795add 100644 (file)
--- a/source/object.cpp
+++ b/source/object.cpp
@@ -1,5 +1,5 @@
 #include <msp/datafile/collection.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "except.h"
 #include "material.h"
 #include "mesh.h"

diff --git a/source/pixelformat.h b/source/pixelformat.h
index 4e71b9f0e7f4c1a1069f284a8f420b266f98288b..d98b45f889e7df666ef2e87e9f56a4091fc412d4 100644 (file)
--- a/source/pixelformat.h
+++ b/source/pixelformat.h
@@ -2,7 +2,7 @@
 #define MSP_GL_PIXELFORMAT_H_
 
 #include <istream>
-#include <msp/gbase/pixelformat.h>
+#include <msp/graphics/pixelformat.h>
 #include "gl.h"
 #include <GL/glext.h>
 

diff --git a/source/renderpass.cpp b/source/renderpass.cpp
index 4ab07347824ef68765a72becd9e35f9a1151fe28..82ca7a3972f28e1d11bd1fde2a4ffb5bf19cbd28 100644 (file)
--- a/source/renderpass.cpp
+++ b/source/renderpass.cpp
@@ -1,6 +1,6 @@
 #include <msp/core/refptr.h>
 #include <msp/datafile/collection.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "material.h"
 #include "renderpass.h"
 #include "program.h"

diff --git a/source/technique.cpp b/source/technique.cpp
index d963bea46c60f0d386439eac8ba6fb9ef8a967d3..2a8928a0db557581999c6691bf482a6be118573f 100644 (file)
--- a/source/technique.cpp
+++ b/source/technique.cpp
@@ -1,6 +1,6 @@
 #include <msp/core/refptr.h>
 #include <msp/datafile/collection.h>
-#include <msp/strings/formatter.h>
+#include <msp/strings/format.h>
 #include "material.h"
 #include "program.h"
 #include "programdata.h"

diff --git a/source/texture2d.h b/source/texture2d.h
index 5395fefd33355f2aa08a3080e286d1b5edc8d5d8..05fbbce2e80b6362e576077ca4fe019311576f46 100644 (file)
--- a/source/texture2d.h
+++ b/source/texture2d.h
@@ -2,7 +2,7 @@
 #define MSP_GL_TEXTURE2D_H_
 
 #include <string>
-#include <msp/gbase/image.h>
+#include <msp/graphics/image.h>
 #include "datatype.h"
 #include "pixelformat.h"
 #include "texture.h"

diff --git a/source/texture3d.cpp b/source/texture3d.cpp
index 11fcf5263c602cdf895e28ca481036de8dd4fcbe..e716c901b53f408820123130dec62fc3db109eea 100644 (file)
--- a/source/texture3d.cpp
+++ b/source/texture3d.cpp
@@ -1,5 +1,5 @@
 #include <cmath>
-#include <msp/gbase/image.h>
+#include <msp/graphics/image.h>
 #include "bindable.h"
 #include "except.h"
 #include "extension.h"

diff --git a/viewer.cpp b/viewer.cpp
index 001aee69fbc29c89c34ee7f32cea10c1e287876a..e6826bf052d41ae9744ac20083e47378263479de 100644 (file)
--- a/viewer.cpp
+++ b/viewer.cpp
@@ -1,7 +1,7 @@
 #include <cmath>
 #include <msp/core/application.h>
 #include <msp/fs/utils.h>
-#include <msp/gbase/simplewindow.h>
+#include <msp/graphics/simplewindow.h>
 #include <msp/gl/blend.h>
 #include <msp/gl/camera.h>
 #include <msp/gl/framebuffer.h>