min

examples/Demo/data/xmls/res.xml

@@ -44,7 +44,7 @@
 	</atlas>
 
 	<atlas clamp2edge="false"> 
-		<image file="tiled.png" trim="false" extend="false"/>
+		<image file="tiled.png" trim="false" extend="false" border="0"/>
 	</atlas>	
 	
 	<set load = "false" /> <!--do not load next atlasses by default-->

examples/Demo/src/TestColorFont.h

@@ -2,7 +2,7 @@
 #include "test.h"
 
 
-class ColoredShaderMat : public STDMaterialX
+class ColoredShaderMat : public STDMaterial
 {
 public:
     MATX(ColoredShaderMat);
@@ -12,13 +12,13 @@ public:
 
     void rehash(size_t& hash) const override
     {
-        STDMaterialX::rehash(hash);
+        STDMaterial::rehash(hash);
         hash_combine(hash, uniformBlack.x, uniformBlack.y, uniformBlack.z, uniformBlack.w);
     }
 
     static bool cmp(const ColoredShaderMat& a, const ColoredShaderMat& b)
     {
-        if (!STDMaterialX::cmp(a, b))
+        if (!STDMaterial::cmp(a, b))
             return false;
 
         return a.uniformBlack == b.uniformBlack;
@@ -26,7 +26,7 @@ public:
 
     void xapply() override
     {
-        STDMaterialX::xapply();
+        STDMaterial::xapply();
         IVideoDriver::instance->setUniform("_black", uniformBlack);
     }
 };

examples/Demo/src/TestOpenGL.h

@@ -75,7 +75,7 @@ public:
 
     void doRender(const RenderState& rs)
     {
-        MaterialX::null->apply();
+        Material::null->apply();
 
 
         glEnable(GL_BLEND);

examples/Demo/src/TestSignedDistanceFont.h

@@ -2,7 +2,7 @@
 #include "test.h"
 
 DECLARE_SMART(SDFMaterial, spSDFMaterial);
-class SDFMaterial : public STDMaterialX
+class SDFMaterial : public STDMaterial
 {
 public:
     MATX(SDFMaterial);
@@ -62,7 +62,7 @@ public:
 
     static bool cmp(const SDFMaterial& a, const SDFMaterial& b)
     {
-        if (!STDMaterialX::cmp(a, b))
+        if (!STDMaterial::cmp(a, b))
             return false;
 
         return a.outlineColor == b.outlineColor && a.offset == b.offset && a.outline == b.outline;
@@ -70,7 +70,7 @@ public:
 
     void xapply() override
     {
-        STDMaterialX::xapply();
+        STDMaterial::xapply();
 
         const AffineTransform& tr = STDRenderer::getCurrent()->getTransform();
         float scale = sqrt(tr.a * tr.a + tr.c * tr.c);

examples/Demo/src/TestTiled.h

@@ -23,7 +23,7 @@ public:
     int height;
 
     spNativeTexture nt;
-    spSTDMaterialX mat;
+    spSTDMaterial mat;
 
     int tileWidth;
     int tileHeight;
@@ -85,7 +85,7 @@ public:
 
 
 
-        mat = new STDMaterialX;
+        mat = new STDMaterial;
         mat->_base = nt;
         mat->_blend = blend_premultiplied_alpha;
     }

examples/Demo/src/TestUserShader.h

@@ -2,7 +2,7 @@
 #include "test.h"
 
 
-class CustomUniformMat : public STDMaterialX
+class CustomUniformMat : public STDMaterial
 {
 public:
     MATX(CustomUniformMat);
@@ -12,13 +12,13 @@ public:
 
     void rehash(size_t& hash) const override
     {
-        STDMaterialX::rehash(hash);
+        STDMaterial::rehash(hash);
         hash_combine(hash, uniform.x, uniform.y, uniform.z, uniform.w);
     }
 
     static bool cmp(const CustomUniformMat& a, const CustomUniformMat& b)
     {
-        if (!STDMaterialX::cmp(a, b))
+        if (!STDMaterial::cmp(a, b))
             return false;
 
         return a.uniform == b.uniform;
@@ -26,7 +26,7 @@ public:
 
     void xapply() override
     {
-        STDMaterialX::xapply();
+        STDMaterial::xapply();
         IVideoDriver::instance->setUniform("userValue", uniform);
     }
 };