dmuratshin 9 years ago
parent
commit
31d33e4812

+ 3 - 0
oxygine/src/DebugActor.cpp

@@ -196,7 +196,10 @@ namespace oxygine
         va_end(args);
         va_end(args);
 
 
         if (DebugActor::instance)
         if (DebugActor::instance)
+        {
             DebugActor::instance->_debugText += buff;
             DebugActor::instance->_debugText += buff;
+            DebugActor::instance->_debugText += "\n";
+        }
     }
     }
 
 
     void DebugActor::_btnClicked(Event* ev)
     void DebugActor::_btnClicked(Event* ev)

+ 10 - 8
oxygine/src/STDMaterial.cpp

@@ -183,16 +183,18 @@ namespace oxygine
                 scale = scale * tf->getFontSize2Scale() / tf->getFont()->getSize();
                 scale = scale * tf->getFontSize2Scale() / tf->getFont()->getSize();
 
 
             float contrast = 3.0 + 30 * scale / 3.7f;
             float contrast = 3.0 + 30 * scale / 3.7f;
-            float offset = 0.35f + 0.05f * scale / 3.7f;
-            offset = 0.35f;
+            float offset = 0.5f + 0.05f * scale / 3.7f;
+            offset = 0.5f;
 
 
 
 
-            if (scale < 0.7f)
-            {
-                contrast /= 1.5f;
-                //contrast = 3;
-                offset = 0.25;
-            }
+            if (0)
+                if (scale < 0.7f)
+                {
+                    contrast /= 1.5f;
+                    //contrast = 3;
+                    offset = 0.25;
+                }
+
 
 
             float outline = offset - tf->getOutline();
             float outline = offset - tf->getOutline();
             _renderer->beginSDFont(contrast, offset, tf->getOutlineColor(), outline);
             _renderer->beginSDFont(contrast, offset, tf->getOutlineColor(), outline);

File diff suppressed because it is too large
+ 0 - 0
oxygine/src/core/system_data.cpp


+ 2 - 0
oxygine/src/dev_tools/TreeInspectorPreview.h

@@ -147,6 +147,8 @@ namespace oxygine
                 const cached_batch& b = *i;
                 const cached_batch& b = *i;
                 if (!b.program)
                 if (!b.program)
                     break;
                     break;
+                if (!b.vdecl)
+                    break;
 
 
                 size_t num = b.vertices.size() / b.vdecl->size;
                 size_t num = b.vertices.size() / b.vdecl->size;
 
 

Some files were not shown because too many files changed in this diff