minor

oxygine/SDL/win32/oxygine.vcxproj

@@ -303,7 +303,6 @@
     <ClInclude Include="..\..\src\res\Resource.h" />
     <ClInclude Include="..\..\src\res\Resources.h" />
     <ClInclude Include="..\..\src\res\ResStarlingAtlas.h" />
-    <ClInclude Include="..\..\src\RootActor.h" />
     <ClInclude Include="..\..\src\Serializable.h" />
     <ClInclude Include="..\..\src\Stage.h" />
     <ClInclude Include="..\..\src\Serialize.h" />
@@ -320,7 +319,6 @@
     <ClInclude Include="..\..\src\Tween.h" />
     <ClInclude Include="..\..\src\TweenAlphaFade.h" />
     <ClInclude Include="..\..\src\TweenAnim.h" />
-    <ClInclude Include="..\..\src\Tweener.h" />
     <ClInclude Include="..\..\src\TweenGlow.h" />
     <ClInclude Include="..\..\src\TweenOutline.h" />
     <ClInclude Include="..\..\src\TweenQueue.h" />

oxygine/SDL/win32/oxygine.vcxproj.filters

@@ -629,9 +629,6 @@
     <ClInclude Include="..\..\src\TextStyle.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\Tweener.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\UpdateState.h">
       <Filter>src</Filter>
     </ClInclude>
@@ -701,9 +698,6 @@
     <ClInclude Include="..\..\src\oxygine_include.h">
       <Filter>src</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\RootActor.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\TweenAnim.h">
       <Filter>src</Filter>
     </ClInclude>

oxygine/src/STDRenderer.cpp

@@ -184,7 +184,6 @@ namespace oxygine
         invisible->init(im, false);
         invisible->setLinearFilter(false);
 
-        setDefaultSettings();
         _restored = true;
     }
 
@@ -230,20 +229,6 @@ namespace oxygine
         }
     }
 
-    void STDRenderer::setDefaultSettings()
-    {
-        /*
-        _blend = blend_disabled;
-        IVideoDriver* instance = IVideoDriver::instance;
-        instance->setState(IVideoDriver::STATE_BLEND, 0);
-        */
-        /*
-
-        instance->setState(IVideoDriver::STATE_BLEND, 1);
-        instance->setBlendFunc(IVideoDriver::BT_ONE, IVideoDriver::BT_ONE);
-        */
-    }
-
     void STDRenderer::initCoordinateSystem(int width, int height, bool flipU)
     {
         Matrix view = makeViewMatrix(width, height, flipU);

oxygine/src/STDRenderer.h

@@ -11,8 +11,6 @@ namespace oxygine
     public:
 
         static STDRenderer* instance;
-        /**Sets default rendering OpenGL options for 2D*/
-        static void setDefaultSettings();
         /**Initializes internal classes. Called automatically from oxygine::init();*/
         static void initialize();
         /**Clears internal data*/
@@ -44,9 +42,9 @@ namespace oxygine
 
 
         void setDriver(IVideoDriver*);
+        OXYGINE_DEPRECATED
         void setViewProjTransform(const Matrix& view, const Matrix& proj);
         void setViewProjTransform(const Matrix& viewProj);
-        void setVertexDeclaration(const VertexDeclaration* decl);
         void setUberShaderProgram(UberShaderProgram* pr);
         /**Sets blend mode. Default value is blend_premultiplied_alpha*/
         void setBlendMode(blend_mode blend);
@@ -83,6 +81,9 @@ namespace oxygine
 #endif
 
     protected:
+
+        void setVertexDeclaration(const VertexDeclaration* decl);
+
         Transform _transform;
 
         STDRenderer* _previous;