HUGE RENAME

log:: renamed to logs::
to avoid conflicts with NDK/EMSCRIPTEN math.h file
ox version set to 9

examples/DemoBox2D/src/Box2DDebugDraw.cpp

@@ -129,7 +129,7 @@ void Box2DDraw::createPolygonVertices(const b2Vec2* vertices, int32 vertexCount)
 {
     if (vertexCount > MAX_VERTICES)
     {
-        log::warning("need more vertices");
+        logs::warning("need more vertices");
         return;
     }
 

examples/HelloWorld/src/example.cpp

@@ -42,7 +42,7 @@ public:
 
         button->addEventListener(TouchEvent::CLICK, [](Event * e)->void
         {
-            log::messageln("button clicked");
+            logs::messageln("button clicked");
         });
 
 #endif

examples/Match3/src/Board.cpp

@@ -238,7 +238,7 @@ void Board::touched(Event* event)
 {
     TouchEvent* te = safeCast<TouchEvent*>(event);
     Vector2 pos = te->localPosition;
-    //log::messageln("%d - %d: %.2f, %.2f", event->target->getObjectID(), event->currentTarget->getObjectID(), pos.x, pos.y);
+    //logs::messageln("%d - %d: %.2f, %.2f", event->target->getObjectID(), event->currentTarget->getObjectID(), pos.x, pos.y);
     Point spacePos;
     spacePos.x = (int)(pos.x / JewelSize.x);
     spacePos.y = (int)(pos.y / JewelSize.y);

oxygine/src/oxygine/AsyncTask.cpp

@@ -4,8 +4,8 @@
 
 namespace oxygine
 {
-#define LOGD(...)  (log::messageln("at: %s (%d) %s",    getName().c_str(), getObjectID(), __VA_ARGS__))
-#define LOGD2(...) (log::messageln("at: %s (%d) %s %s", getName().c_str(), getObjectID(), __VA_ARGS__))
+#define LOGD(...)  (logs::messageln("at: %s (%d) %s",    getName().c_str(), getObjectID(), __VA_ARGS__))
+#define LOGD2(...) (logs::messageln("at: %s (%d) %s %s", getName().c_str(), getObjectID(), __VA_ARGS__))
 
     AsyncTask::AsyncTask() : _status(status_not_started), _mainThreadSync(false)
     {
@@ -33,7 +33,7 @@ namespace oxygine
         _status = status_inprogress;
 
         //todo! replace with LOGD
-        log::messageln("at: %s (%d) %s %s", getName().c_str(), getObjectID(), "run:", _getRunInfo().c_str());
+        logs::messageln("at: %s (%d) %s %s", getName().c_str(), getObjectID(), "run:", _getRunInfo().c_str());
 
         bool ok = _prerun();
 

oxygine/src/oxygine/Clock.cpp

@@ -98,7 +98,7 @@ namespace oxygine
         if (_counter > 0)
             dt = 0;//todo destTime == srcTime ??
 
-        //log::messageln("dt: %x %d", this, dt);
+        //logs::messageln("dt: %x %d", this, dt);
         _destTime += dt;
 
         _lastUpdateTime = time;

oxygine/src/oxygine/Draggable.cpp

@@ -227,7 +227,7 @@ namespace oxygine
 
     void printVec(const char* str, const Vector2& v)
     {
-        log::messageln("%s: %.2f, %.2f", str, v.x, v.y);
+        logs::messageln("%s: %.2f, %.2f", str, v.x, v.y);
     }
 
 

oxygine/src/oxygine/HttpRequestTask.cpp

@@ -210,12 +210,12 @@ namespace oxygine
 
     void HttpRequestTask::_onError()
     {
-        log::warning("http request error (%d): %s", _responseCode , _url.c_str());
+        logs::warning("http request error (%d): %s", _responseCode , _url.c_str());
     }
 
     void HttpRequestTask::_onComplete()
     {
-        log::messageln("http request done (%d): %s", _responseCode, _url.c_str());
+        logs::messageln("http request done (%d): %s", _responseCode, _url.c_str());
     }
 
     void HttpRequestTask::_dispatchComplete()
@@ -259,7 +259,7 @@ namespace oxygine
             unsigned int written = file::write(_fhandle, data, (unsigned int)size);
             if (written != size)
             {
-                log::messageln("WRITE FILE ERROR %d %d", written, size);
+                logs::messageln("WRITE FILE ERROR %d %d", written, size);
                 _writeFileError = true;
                 return;
             }

oxygine/src/oxygine/Image.cpp

@@ -22,7 +22,7 @@ extern "C"
 #endif // OX_HAVE_LIBJPEG
 };
 
-//#define  LOGD(...)  log::messageln(__VA_ARGS__)
+//#define  LOGD(...)  logs::messageln(__VA_ARGS__)
 #define  LOGD(...)
 
 namespace oxygine
@@ -181,7 +181,7 @@ namespace oxygine
             }
             break;
             default:
-                log::error("unknown file format to read size");
+                logs::error("unknown file format to read size");
                 return false;
         }
 
@@ -340,7 +340,7 @@ namespace oxygine
         }
         else
         {
-            log::error("png error");
+            logs::error("png error");
             png_error(png_ptr, "pngReaderCallback failed");
         }
     }
@@ -401,7 +401,7 @@ namespace oxygine
             if (color_type == PNG_COLOR_MASK_ALPHA)
             {
                 srcFormat = TF_L8;
-                log::warning("unsupported png file pixel format");
+                logs::warning("unsupported png file pixel format");
             }
 
             if (color_type == PNG_COLOR_TYPE_RGB)
@@ -669,7 +669,7 @@ namespace oxygine
                             tf = header->bitmaskAlpha ? TF_PVRTC_4RGBA : TF_PVRTC_4RGB;
                             break;
                         default:
-                            log::error("unknown pvr2 flag format");
+                            logs::error("unknown pvr2 flag format");
                     }
 
                     _image.format = tf;
@@ -715,7 +715,7 @@ namespace oxygine
                     }
                     else
                     {
-                        log::warning("tga 32bpp only supported");
+                        logs::warning("tga 32bpp only supported");
                     }
                     break;
                 }
@@ -732,7 +732,7 @@ namespace oxygine
             }
         }
 
-        log::warning("Image. can't unpack data unknown file format");
+        logs::warning("Image. can't unpack data unknown file format");
 
         init(16, 16, TF_R8G8B8A8);
         fillZero();

oxygine/src/oxygine/Input.cpp

@@ -3,7 +3,7 @@
 #include "core/log.h"
 #include <string.h>
 
-//#define LOGD(...) oxygine::log::message("input: "); oxygine::log::messageln(__VA_ARGS__)
+//#define LOGD(...) oxygine::logs::message("input: "); oxygine::logs::messageln(__VA_ARGS__)
 #define LOGD(...) ((void)0)
 
 namespace oxygine
@@ -136,7 +136,7 @@ namespace oxygine
             return firstEmptySlotIndex + 1;
         }
 
-        //log::warning("can't find touch id %d", id);
+        //logs::warning("can't find touch id %d", id);
         return -1;
     }
 

oxygine/src/oxygine/InputText.cpp

@@ -76,7 +76,7 @@ namespace oxygine
         _cursor->detach();
         _active = 0;
         _textActor = 0;
-        //log::messageln("InputText::stop  %x", this);
+        //logs::messageln("InputText::stop  %x", this);
         releaseRef();
     }
 
@@ -177,7 +177,7 @@ namespace oxygine
                 }
 
                 SDL_TextInputEvent& te = event->text;
-                //log::messageln("text: %d %d %d %d", (int)(te.text[0]), (int)(te.text[1]), (int)(te.text[2]), (int)(te.text[3]));
+                //logs::messageln("text: %d %d %d %d", (int)(te.text[0]), (int)(te.text[1]), (int)(te.text[2]), (int)(te.text[3]));
 
                 int newCode = 0;
                 getNextCode(newCode, te.text);
@@ -206,7 +206,7 @@ namespace oxygine
             break;
             case SDL_KEYDOWN:
             {
-                //log::messageln("SDL_KEYDOWN");
+                //logs::messageln("SDL_KEYDOWN");
                 switch (event->key.keysym.sym)
                 {
                     case SDLK_BACKSPACE:

oxygine/src/oxygine/PostProcess.cpp

@@ -146,11 +146,11 @@ namespace oxygine
 
     void RenderTargetsManager::print()
     {
-        log::messageln("print");
+        logs::messageln("print");
         for (size_t i = 0, sz = _free.size(); i < sz; ++i)
         {
             spNativeTexture t = _free[i];
-            log::messageln("texture %d %d", t->getWidth(), t->getHeight());
+            logs::messageln("texture %d %d", t->getWidth(), t->getHeight());
         }
     }
     bool RenderTargetsManager::isGood(const spNativeTexture& t, int w, int h, TextureFormat tf) const

oxygine/src/oxygine/ThreadLoader.cpp

@@ -85,7 +85,7 @@ namespace oxygine
         for (ress::iterator i = _ress.begin(); i != _ress.end(); ++i)
         {
             Resource* res = *i;
-            //log::messageln("loading res: %s", res->getName().c_str());
+            //logs::messageln("loading res: %s", res->getName().c_str());
             res->load();
         }
 

oxygine/src/oxygine/actor/DebugActor.cpp

@@ -51,7 +51,7 @@ namespace oxygine
         if (resSystem)
             return;
 
-        log::messageln("DebugActor::initialize");
+        logs::messageln("DebugActor::initialize");
 
         zp.setPrefix("system/");
         zp.add(system_data, system_size);
@@ -483,7 +483,7 @@ namespace oxygine
         cr->setTransform(tr);
         getStage()->addChild(cr);
         std::string dmp = actor->dump(0);
-        log::messageln(">>>>>>>>>>>>>>>>>>>>\ntouched actor '%s' local pos: (%.0f,%.0f), pos: (%.0f,%.0f)\n%s",
+        logs::messageln(">>>>>>>>>>>>>>>>>>>>\ntouched actor '%s' local pos: (%.0f,%.0f), pos: (%.0f,%.0f)\n%s",
                        actor->getName().c_str(),
                        te->localPosition.x, te->localPosition.y,
                        te->position.x, te->position.y,
@@ -492,7 +492,7 @@ namespace oxygine
         actor = actor->getParent();
         while (actor)
         {
-            log::messageln("parent: %s", actor->getName().c_str());
+            logs::messageln("parent: %s", actor->getName().c_str());
             actor = actor->getParent();
         }
     }

oxygine/src/oxygine/actor/SlidingActor.cpp

@@ -135,7 +135,7 @@ namespace oxygine
 
         //static float ml = 0;
         //ml = max(_speed.length(), ml);
-        //log::messageln("sp: %.2f", ml);
+        //logs::messageln("sp: %.2f", ml);
 
         int ct = getTimeMS();
         if (_lastIterTime + NUM * fdt < ct)
@@ -144,7 +144,7 @@ namespace oxygine
         if (_drag.isDragging())
         {
             Vector2 pos = _content->getPosition();
-            //log::messageln("%d) pos %.2f %.2f", _current, pos.x, pos.y);
+            //logs::messageln("%d) pos %.2f %.2f", _current, pos.x, pos.y);
             _prev[_current].pos = pos;
             _prev[_current].tm = ct;
             _current = (_current + 1) % NUM;

oxygine/src/oxygine/actor/TextField.cpp

@@ -172,7 +172,7 @@ namespace oxygine
 
     void TextField::matChanged()
     {
-        log::warning("not optimal");
+        logs::warning("not optimal");
         if (_flags & flag_rebuild)
             return;
 

oxygine/src/oxygine/core/NativeTexture.cpp

@@ -11,7 +11,7 @@ namespace oxygine
 
     void NativeTexture::dumpCreatedTextures()
     {
-        log::messageln("created native textures dump:");
+        logs::messageln("created native textures dump:");
         std::vector<spNativeTexture> t = getCreatedTextures();
 
         int n = 0;
@@ -19,11 +19,11 @@ namespace oxygine
         {
             spNativeTexture nt = *i;
 
-            log::message("%d)", n);
+            logs::message("%d)", n);
             ++n;
             nt->dumpObject();
         }
-        log::messageln("----");
+        logs::messageln("----");
     }
 
     std::vector<spNativeTexture> NativeTexture::getCreatedTextures()

oxygine/src/oxygine/core/Object.cpp

@@ -248,7 +248,7 @@ namespace oxygine
         }
 
 
-        log::messageln("id = %d, name = '%s', typeid = '%s', refs = %s", this->__id, name.c_str(), typeid(*this).name(), refs);
+        logs::messageln("id = %d, name = '%s', typeid = '%s', refs = %s", this->__id, name.c_str(), typeid(*this).name(), refs);
     }
 
     void ObjectBase::dumpCreatedObjects()
@@ -256,18 +256,18 @@ namespace oxygine
 #ifdef OXYGINE_DEBUG_TRACE_LEAKS
         MutexAutoLock m(getMutex());
 
-        log::messageln("\n\n\nallocated objects:");
+        logs::messageln("\n\n\nallocated objects:");
         int n = 0;
         __createdObjects& objs = __getCreatedObjects();
         for (__createdObjects::iterator i = objs.begin(); i != objs.end(); ++i)
         {
             ObjectBase* object = *i;
-            //log::message("%d)", n);
+            //logs::message("%d)", n);
             object->dumpObject();
 
             ++n;
         }
-        log::message("total: %d -----------------------------\n\n\n", (int)objs.size());
+        logs::message("total: %d -----------------------------\n\n\n", (int)objs.size());
 #endif
     }
 

oxygine/src/oxygine/core/STDFileSystem.cpp

@@ -12,7 +12,7 @@
 
 
 
-//#define LOGD(...) oxygine::log::messageln(__VA_ARGS__)
+//#define LOGD(...) oxygine::logs::messageln(__VA_ARGS__)
 #define LOGD(...) ((void)0)
 
 #if 0

oxygine/src/oxygine/core/ThreadDispatcher.cpp

@@ -11,7 +11,7 @@ namespace oxygine
         pthread_t pt = pthread_self();
         return ((size_t*)(&pt))[0];
     }
-#define  LOGDN(format, ...)  log::messageln("ThreadMessages(%lu)::" format, threadID(), __VA_ARGS__)
+#define  LOGDN(format, ...)  logs::messageln("ThreadMessages(%lu)::" format, threadID(), __VA_ARGS__)
 
 #else
 #define  LOGDN(...)  ((void)0)

oxygine/src/oxygine/core/ZipFileSystem.cpp

@@ -449,7 +449,7 @@ namespace oxygine
 
         void ZipFileSystem::add(const char* zip)
         {
-            log::messageln("ZipFileSystem::add %s", zip);
+            logs::messageln("ZipFileSystem::add %s", zip);
             _zips.add(zip);
         }
 

oxygine/src/oxygine/core/android/HttpRequestJavaTask.cpp

@@ -29,7 +29,7 @@ namespace oxygine
         JNI_NOT_NULL(jInit);
         env->CallStaticVoidMethod(_jHttpRequestsClass, jInit);
 
-        log::messageln("initialized HttpRequestJavaTask");
+        logs::messageln("initialized HttpRequestJavaTask");
     }
 
     void HttpRequestTask::release()

oxygine/src/oxygine/core/android/jniUtils.cpp

@@ -164,7 +164,7 @@ namespace oxygine
 
     void            jniMoveTaskToBack()
     {
-        log::messageln("jniMoveTaskToBack");
+        logs::messageln("jniMoveTaskToBack");
         try
         {
             JNIEnv* env = jniGetEnv();

oxygine/src/oxygine/core/emscripten/HttpRequestEmscriptenTask.cpp

@@ -42,7 +42,7 @@ namespace oxygine
 
     void HttpRequestEmscriptenTask::_onprogress(int a, int b)
     {
-        //log::messageln(" HttpRequestEmscriptenTask::_onprogress %d %d", a, b);
+        //logs::messageln(" HttpRequestEmscriptenTask::_onprogress %d %d", a, b);
         int delta = a - _receivedContentSize;
         _receivedContentSize = a;
         _expectedContentSize = b;

oxygine/src/oxygine/core/file.cpp

@@ -24,7 +24,7 @@
 
 #include <sys/stat.h>
 
-//#define LOGD(...) oxygine::log::messageln(__VA_ARGS__)
+//#define LOGD(...) oxygine::logs::messageln(__VA_ARGS__)
 #define LOGD(...)
 
 
@@ -50,8 +50,8 @@ namespace oxygine
             //_nfsWrite.setPath("data-ram/");
 
 #elif __ANDROID__
-            log::messageln("internal %s", SDL_AndroidGetInternalStoragePath());
-            log::messageln("external %s", SDL_AndroidGetExternalStoragePath());
+            logs::messageln("internal %s", SDL_AndroidGetInternalStoragePath());
+            logs::messageln("external %s", SDL_AndroidGetExternalStoragePath());
             _nfsWrite.setPath(SDL_AndroidGetInternalStoragePath());
 #elif OXYGINE_EDITOR
 #elif __APPLE__
@@ -100,7 +100,7 @@ namespace oxygine
 
 #ifdef OX_DEBUG
             if (!strstr(mode, "b"))
-                log::warning("file::open for file '%s' should be called with 'b' (means binary) flag", file_.c_str());
+                logs::warning("file::open for file '%s' should be called with 'b' (means binary) flag", file_.c_str());
 #endif
             //OX_ASSERT(_openedFiles == 0);
             LOGD("open file: %s %s", file_.c_str(), mode);

oxygine/src/oxygine/core/gl/NativeTextureGLES.cpp

@@ -78,7 +78,7 @@ namespace oxygine
                 pixel.compressed = true;
                 break;
             default:
-                log::error("unknown format: %d\n", format);
+                logs::error("unknown format: %d\n", format);
                 OX_ASSERT(!"unknown format");
         }
         return pixel;
@@ -144,11 +144,11 @@ namespace oxygine
             //printf("created fbo: %d\n", fbo);
 
             unsigned int status = oxglCheckFramebufferStatus(GL_FRAMEBUFFER);
-            //log::message("fbo status %d\n", status);
+            //logs::message("fbo status %d\n", status);
             //GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES
             if (status != GL_FRAMEBUFFER_COMPLETE)
             {
-                log::error("status != GL_FRAMEBUFFER_COMPLETE_OES");
+                logs::error("status != GL_FRAMEBUFFER_COMPLETE_OES");
             }
 
             glViewport(0, 0, w, h);
@@ -156,7 +156,7 @@ namespace oxygine
             glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
             oxglBindFramebuffer(GL_FRAMEBUFFER, prevFBO);
-            //log::message("fbo bind\n");
+            //logs::message("fbo bind\n");
 
             glBindTexture(GL_TEXTURE_2D, 0);
 

oxygine/src/oxygine/core/gl/ShaderProgramGL.cpp

@@ -98,7 +98,7 @@ namespace oxygine
 #ifndef   EMSCRIPTEN
         if (!gles)
         {
-            //log::messageln("not gles version");
+            //logs::messageln("not gles version");
 
             static const char nonGLES[] =
                 "#define lowp\n"
@@ -142,7 +142,7 @@ namespace oxygine
 
         if (success)
         {
-            log::messageln("compiled shader: %s", log.c_str());
+            logs::messageln("compiled shader: %s", log.c_str());
         }
         else
         {
@@ -172,7 +172,7 @@ namespace oxygine
 
         if (success)
         {
-            //log::messageln("compiled shader: %s", log.c_str());
+            //logs::messageln("compiled shader: %s", log.c_str());
             oxglDetachShader(p, vs);
             oxglDetachShader(p, fs);
             if (deleteAttachedShaders)
@@ -183,7 +183,7 @@ namespace oxygine
         }
         else
         {
-            log::error("can't link gl program: %s", log.c_str());
+            logs::error("can't link gl program: %s", log.c_str());
             oxglDeleteProgram(p);
             p = 0;
         }

oxygine/src/oxygine/core/gl/VideoDriverGL.cpp

@@ -97,7 +97,7 @@ namespace oxygine
         glGetIntegerv(GL_VIEWPORT, vp);
 
         r = Rect(vp[0], vp[1], vp[2], vp[3]);;
-        //log::messageln("vp %d %d %d %d", vp[0], vp[1], vp[2], vp[3]);
+        //logs::messageln("vp %d %d %d %d", vp[0], vp[1], vp[2], vp[3]);
         CHECKGL();
     }
 
@@ -133,7 +133,7 @@ namespace oxygine
 
     void VideoDriverGL::_begin(const Rect& viewport, const Color* clearColor)
     {
-        //  log::messageln("begin %d %d %d %d", viewport.pos.x, viewport.pos.y, viewport.size.x, viewport.size.y);
+        //  logs::messageln("begin %d %d %d %d", viewport.pos.x, viewport.pos.y, viewport.size.x, viewport.size.y);
         glViewport(viewport.getX(), viewport.getY(), viewport.getWidth(), viewport.getHeight());
         glDisable(GL_SCISSOR_TEST);
         if (clearColor)

oxygine/src/oxygine/core/gl/oxgl.cpp

@@ -253,7 +253,7 @@ namespace oxygine
         int gl_error = glGetError();
         if (gl_error != GL_NO_ERROR)
         {
-            log::error("OpenGL error: %#x\n", gl_error);
+            logs::error("OpenGL error: %#x\n", gl_error);
             if (gl_error == GL_OUT_OF_MEMORY)
             {
                 exit(0);

oxygine/src/oxygine/core/ios/HttpRequestCocoaTask.mm

@@ -224,7 +224,7 @@ namespace oxygine
         NSValue *taskValue = [NSValue valueWithPointer:this];
         objc_setAssociatedObject(task, &taskKey, taskValue, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
         
-        //log::messageln("created task session: %x", task);
+        //logs::messageln("created task session: %x", task);
         
         [task resume];
     }

oxygine/src/oxygine/core/log.cpp

@@ -33,7 +33,7 @@ namespace oxygine
     const int SIZE = 4096;
 #endif
 
-    namespace log
+    namespace logs
     {
         int getTime()
         {

oxygine/src/oxygine/core/log.h

@@ -4,7 +4,7 @@
 
 namespace oxygine
 {
-    namespace log
+    namespace logs
     {
         /**By default logging is enabled*/
         void enable();
@@ -14,7 +14,7 @@ namespace oxygine
         typedef void (*error_handler)(const char* txt);
         typedef void (*out_handler)(const char* txt);
 
-        /*run your callback if log::error was called*/
+        /*run your callback if logs::error was called*/
         void setErrorHandler(error_handler);
 
         void setOutHandler(out_handler);

oxygine/src/oxygine/core/oxygine.cpp

@@ -155,7 +155,7 @@ namespace oxygine
                 return;
 
 #if OXYGINE_SDL
-            log::messageln("focus lost");
+            logs::messageln("focus lost");
             SDL_GL_DeleteContext(_context);
             _context = 0;
 #endif
@@ -167,7 +167,7 @@ namespace oxygine
                 return;
 
 #if OXYGINE_SDL
-            log::messageln("lost context");
+            logs::messageln("lost context");
             if (!_context)
             {
                 _context = SDL_GL_CreateContext(_window);
@@ -233,11 +233,11 @@ namespace oxygine
 
             t += "arch " + std::string(ABI);
 
-            log::messageln("build settings %s", t.c_str());
+            logs::messageln("build settings %s", t.c_str());
 
             init0();
 
-            log::messageln("initialize oxygine");
+            logs::messageln("initialize oxygine");
             if (desc_ptr)
                 desc = *desc_ptr;
 
@@ -248,7 +248,7 @@ namespace oxygine
 
 #ifdef OXYGINE_SDL
 
-            log::messageln("SDL build");
+            logs::messageln("SDL build");
 
 
             SDL_SetHint(SDL_HINT_VIDEO_ALLOW_SCREENSAVER, desc.allow_screensaver ? "1" : "0");
@@ -306,7 +306,7 @@ namespace oxygine
 
             //SDL_DisplayMode mode;
             //SDL_GetCurrentDisplayMode(0, &mode);
-            //log::messageln("display mode: %d %d", mode.w, mode.h);
+            //logs::messageln("display mode: %d %d", mode.w, mode.h);
 
             if (desc.w == -1 && desc.h == -1)
             {
@@ -332,13 +332,13 @@ namespace oxygine
             desc.h = -1;
 #endif
 
-            log::messageln("creating window %d %d", desc.w, desc.h);
+            logs::messageln("creating window %d %d", desc.w, desc.h);
 
             _window = SDL_CreateWindow(desc.title, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, desc.w, desc.h, flags);
 
             if (!_window)
             {
-                log::error("can't create window: %s", SDL_GetError());
+                logs::error("can't create window: %s", SDL_GetError());
 #ifdef __ANDROID__
                 jniRestartApp();
 #endif
@@ -347,7 +347,7 @@ namespace oxygine
             _context = SDL_GL_CreateContext(_window);
             if (!_context)
             {
-                log::error("can't create gl context: %s", SDL_GetError());
+                logs::error("can't create gl context: %s", SDL_GetError());
 #ifdef __ANDROID__
                 jniRestartApp();
 #endif
@@ -406,7 +406,7 @@ namespace oxygine
 #endif
 
             Point size = getDisplaySize();
-            log::messageln("display size: %d %d", size.x, size.y);
+            logs::messageln("display size: %d %d", size.x, size.y);
 
             IVideoDriver::instance = new VideoDriverGLES20();
 
@@ -443,7 +443,7 @@ namespace oxygine
             TextField::setDefaultFont(DebugActor::resSystem->getResFont("system"));
 #endif
 #endif
-            log::messageln("oxygine initialized");
+            logs::messageln("oxygine initialized");
         }
 
 #if OXYGINE_SDL
@@ -486,22 +486,22 @@ namespace oxygine
 
         void reset()
         {
-            log::messageln("core::reset()");
+            logs::messageln("core::reset()");
             clearPostProcessItems();
             Restorable::releaseAll();
             PostProcess::freeShaders();
             STDRenderer::reset();
             IVideoDriver::instance->reset();
-            log::messageln("core::reset() done");
+            logs::messageln("core::reset() done");
         }
 
         void restore()
         {
-            log::messageln("core::restore()");
+            logs::messageln("core::restore()");
             IVideoDriver::instance->restore();
             STDRenderer::restore();
             Restorable::restoreAll();
-            log::messageln("core::restore() done");
+            logs::messageln("core::restore() done");
         }
 
         bool isReady2Render()
@@ -522,7 +522,7 @@ namespace oxygine
             {
                 if (!focus)
                 {
-                    //log::messageln("!focus");
+                    //logs::messageln("!focus");
                     return false;
                 }
 
@@ -543,7 +543,7 @@ namespace oxygine
             }
             else
             {
-                log::messageln("!ready");
+                logs::messageln("!ready");
             }
 
             return ready;
@@ -567,7 +567,7 @@ namespace oxygine
                 int status = SDL_GL_MakeCurrent(wnd, _context);
                 if (status)
                 {
-                    log::error("SDL_GL_MakeCurrent(): %s", SDL_GetError());
+                    logs::error("SDL_GL_MakeCurrent(): %s", SDL_GetError());
                 }
                 SDL_GL_SwapWindow(wnd);
             }
@@ -608,7 +608,7 @@ namespace oxygine
                 switch (event.type)
                 {
                     case SDL_QUIT:
-                        log::messageln("SDL_QUIT");
+                        logs::messageln("SDL_QUIT");
                         done = true;
                         break;
                     case SDL_WINDOWEVENT:
@@ -620,7 +620,7 @@ namespace oxygine
                         active = true;
                         */
 
-                        log::messageln("SDL_WINDOWEVENT %d", (int)event.window.event);
+                        logs::messageln("SDL_WINDOWEVENT %d", (int)event.window.event);
 
                         if (event.window.event == SDL_WINDOWEVENT_MINIMIZED)
                             active = false;
@@ -645,7 +645,7 @@ namespace oxygine
                             if (focus)
                                 focusAcquired();
 
-                            log::messageln("focus: %d", (int)focus);
+                            logs::messageln("focus: %d", (int)focus);
                             Event ev(focus ? Stage::ACTIVATE : Stage::DEACTIVATE);
 
                             spStage stage = getStageByWindow(event.window.windowID);
@@ -658,7 +658,7 @@ namespace oxygine
                                 focusLost();
 #endif
                         }
-                        //log::messageln("SDL_SYSWMEVENT %d", (int)event.window.event);
+                        //logs::messageln("SDL_SYSWMEVENT %d", (int)event.window.event);
                         break;
                     }
                     case SDL_MOUSEWHEEL:
@@ -701,7 +701,7 @@ namespace oxygine
                     {
                         if (_useTouchAPI)
                         {
-                            //log::messageln("SDL_FINGERMOTION");
+                            //logs::messageln("SDL_FINGERMOTION");
                             Vector2 pos = convertTouch(event);
                             PointerState* ps = input->getTouchByID((int64_t)event.tfinger.fingerId);
                             if (ps)
@@ -716,7 +716,7 @@ namespace oxygine
                     {
                         if (_useTouchAPI)
                         {
-                            //log::messageln("SDL_FINGER");
+                            //logs::messageln("SDL_FINGER");
                             Vector2 pos = convertTouch(event);
                             PointerState* ps = input->getTouchByID((int64_t)event.tfinger.fingerId);
                             if (ps)
@@ -747,7 +747,7 @@ namespace oxygine
 
 #if OXYGINE_SDL
 
-            //log::messageln("update");
+            //logs::messageln("update");
 
             bool done = false;
             SDL_Event event;
@@ -766,7 +766,7 @@ namespace oxygine
 
         void release()
         {
-            log::messageln("core::release");
+            logs::messageln("core::release");
 
 #ifndef OXYGINE_EDITOR
             InputText::stopAnyInput();
@@ -849,7 +849,7 @@ namespace oxygine
 
         void requestQuit()
         {
-            log::messageln("requestQuit");
+            logs::messageln("requestQuit");
 #ifdef OXYGINE_SDL
             SDL_Event ev;
             ev.type = SDL_QUIT;
@@ -879,7 +879,7 @@ namespace oxygine
             SDL_GL_GetDrawableSize(_window, &w, &h);
             return Point(w, h);
 #else
-            log::warning("getDisplaySize not implemented");
+            logs::warning("getDisplaySize not implemented");
             return Point(0, 0);
 #endif
         }
@@ -893,11 +893,11 @@ namespace oxygine
         switch (ep)
         {
             case ep_show_error:
-                log::error_va(format, args);
+                logs::error_va(format, args);
                 OX_ASSERT_NL(!"handleErrorPolicy error.");
                 break;
             case ep_show_warning:
-                log::warning_va(format, args);
+                logs::warning_va(format, args);
                 break;
             case ep_ignore_error:
                 break;
@@ -942,7 +942,7 @@ namespace oxygine
 #ifdef OXYGINE_SDL
         SDL_Delay(time);
 #else
-        log::warning("sleep not implemented");
+        logs::warning("sleep not implemented");
 #endif
     }
 }

oxygine/src/oxygine/oxygine-include.h

@@ -88,12 +88,12 @@
 void emscStackTrace();
 #endif
 
-namespace oxygine { namespace log { void error(const char* format, ...); } }
+namespace oxygine { namespace logs { void error(const char* format, ...); } }
 
-#define OX_LOG_ERROR(x)     if (!(x)) {oxygine::log::error("Assert! %s in %s:%d", #x, __FILE__, __LINE__);}
+#define OX_LOG_ERROR(x)     if (!(x)) {oxygine::logs::error("Assert! %s in %s:%d", #x, __FILE__, __LINE__);}
 
 
-//assert without log::error
+//assert without logs::error
 #ifdef OXYGINE_QT
 #   define OX_ASSERT_NL(x) { if (!(x)) __asm("int3"); Q_ASSERT(x);}
 #elif !OX_DEBUG || EMSCRIPTEN
@@ -113,7 +113,7 @@ namespace oxygine { namespace log { void error(const char* format, ...); } }
 
 #define OXYGINE_RENDERER 5
 
-#define OXYGINE_VERSION 8
+#define OXYGINE_VERSION 9
 
 #ifdef __GNUC__
 #   define OXYGINE_DEPRECATED __attribute__((deprecated))

oxygine/src/oxygine/res/ResAtlas.cpp

@@ -5,7 +5,7 @@
 #include "../Image.h"
 #include "../core/VideoDriver.h"
 
-//#define  LOGD(...)  log::messageln(__VA_ARGS__)
+//#define  LOGD(...)  logs::messageln(__VA_ARGS__)
 #define  LOGD(...)
 
 namespace oxygine

oxygine/src/oxygine/res/Resources.cpp

@@ -11,7 +11,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-//#define FS_LOG(...) log::warning(__VA_ARGS__)
+//#define FS_LOG(...) logs::warning(__VA_ARGS__)
 #define FS_LOG(...) {}
 
 namespace oxygine
@@ -100,7 +100,7 @@ namespace oxygine
         for (resources::iterator i = _resources.begin(); i != _resources.end(); ++i)
         {
             Resource* res = (*i).get();
-            //log::messageln("loading res: %s", res->getName().c_str());
+            //logs::messageln("loading res: %s", res->getName().c_str());
             res->load(context);
             //if (cb)
             //  cb(res);
@@ -186,7 +186,7 @@ namespace oxygine
 
         if (!sz)
         {
-            log::error("can't load xml file: '%s'", xmlFile.c_str());
+            logs::error("can't load xml file: '%s'", xmlFile.c_str());
             OX_ASSERT(!"can't find xml file");
             return false;
         }
@@ -257,7 +257,7 @@ namespace oxygine
             registeredResources::iterator i = std::lower_bound(_registeredResources.begin(), _registeredResources.end(), type);
             if (i == _registeredResources.end() || strcmp(i->id, type))
             {
-                log::error("unknown resource. type: '%s' id: '%s'", type, Resource::extractID(context.walker.getNode(), "", "").c_str());
+                logs::error("unknown resource. type: '%s' id: '%s'", type, Resource::extractID(context.walker.getNode(), "", "").c_str());
                 OX_ASSERT(!"unknown resource type");
                 continue;
             }
@@ -319,7 +319,7 @@ namespace oxygine
                 OX_ASSERT(_resourcesMap.find(shortName) == _resourcesMap.end());
                 if (_resourcesMap.find(shortName) != _resourcesMap.end())
                 {
-                    log::error("short resource name '%s' conflicts with '%s'", r->getName().c_str(), _resourcesMap[shortName]->getName().c_str());
+                    logs::error("short resource name '%s' conflicts with '%s'", r->getName().c_str(), _resourcesMap[shortName]->getName().c_str());
                 }
 #endif
 
@@ -331,21 +331,21 @@ namespace oxygine
 
     void Resources::print() const
     {
-        log::message("resources:\n");
+        logs::message("resources:\n");
         for (resourcesMap::const_iterator i = _resourcesMap.cbegin(); i != _resourcesMap.cend(); ++i)
         {
             spResource res = i->second;
-            log::message("%s\n", res->getName().c_str());
+            logs::message("%s\n", res->getName().c_str());
         }
 
         /*
         unsigned n = _resourcesMap.bucket_count();
 
         for (unsigned i=0; i<n; ++i) {
-            log::message("bucket %d: ", i);
+            logs::message("bucket %d: ", i);
             for (auto it = _resourcesMap.begin(i); it!=_resourcesMap.end(i); ++it)
-                log::message("%s, ", it->first.c_str());
-            log::messageln(" ");
+                logs::message("%s, ", it->first.c_str());
+            logs::messageln(" ");
         }
         */
     }

oxygine/src/oxygine/text_utils/Aligner.cpp

@@ -12,7 +12,7 @@ namespace oxygine
         Aligner::Aligner(const TextStyle& Style, spSTDMaterial mt, const Font* font, float gscale, const Vector2& size): width((int)size.x), height((int)size.y), _x(0), _y(0), _lineWidth(0),
             bounds(0, 0, 0, 0), style(Style), _scale(gscale), _font(font), mat(mt)
         {
-            //log::messageln("gscale %f, adjScale %f globscale %f, %d %f", gscale, _globalScale, _fontSize, fs);
+            //logs::messageln("gscale %f, adjScale %f globscale %f, %d %f", gscale, _globalScale, _fontSize, fs);
             _line.reserve(50);
             _lineSkip = (int)(_font->getBaselineDistance() * style.baselineScale) + style.linesOffset;
             options = Style.options;

oxygine/src/oxygine/tween/TweenAnim.cpp

@@ -75,7 +75,7 @@ namespace oxygine
         static int ltime = 0;
         if (lastFrame != frame)
         {
-            log::messageln("%d frame %d", getTimeMS() - ltime, frame);
+            logs::messageln("%d frame %d", getTimeMS() - ltime, frame);
             ltime = getTimeMS();
         }
         lastFrame = frame;

oxygine/src/oxygine/tween/TweenGlow.cpp

@@ -95,7 +95,7 @@ namespace oxygine
 
 
             int alpha = lerp(0, 255, _progress);
-            //log::messageln("tween alpha %d", alpha);
+            //logs::messageln("tween alpha %d", alpha);
 
             Color c = _color.withAlpha(64).premultiplied();
             driver->setShaderProgram(PostProcess::shaderBlurV);

oxygine/src/oxygine/tween/TweenOutline.cpp

@@ -103,7 +103,7 @@ namespace oxygine
 
 
             int alpha = lerp(0, 255, _progress);
-            //log::messageln("tween alpha %d", alpha);
+            //logs::messageln("tween alpha %d", alpha);
 
             Color c;
             if (_pp._options._flags & PostProcessOptions::flag_singleR2T)

oxygine/src/oxygine/utils/stringUtils.cpp

@@ -177,7 +177,7 @@ namespace oxygine
                 *dest = c;
 
                 //*(dest + 1) = 0;
-                //log::message(copy);
+                //logs::message(copy);
 
                 ++src;
                 ++dest;
@@ -296,7 +296,7 @@ namespace oxygine
         SDL_free(s);
         return str;
 #else
-        log::warning("utf8tows not implemented correctly!");
+        logs::warning("utf8tows not implemented correctly!");
 
         std::wstring ws;
         ws.reserve(n);
@@ -334,7 +334,7 @@ namespace oxygine
         SDL_free(s);
         return str;
 #else
-        log::warning("utf8tows not implemented correctly!");
+        logs::warning("utf8tows not implemented correctly!");
         std::string s;
         int i = 0;
         while (wchar_t t = wstr[i])