Quellcode durchsuchen

- fixed TweenAlphaFade viewport size
- minor

dmuratshin vor 10 Jahren
Ursprung
Commit
c210156238
2 geänderte Dateien mit 11 neuen und 6 gelöschten Zeilen
  1. 6 3
      oxygine/src/TweenAlphaFade.h
  2. 5 3
      oxygine/src/core/oxygine.cpp

+ 6 - 3
oxygine/src/TweenAlphaFade.h

@@ -85,6 +85,7 @@ namespace oxygine
             if (!STDRenderer::isReady())
                 return;
 
+            Material::setCurrent(0);
             IVideoDriver* driver = IVideoDriver::instance;
 
 
@@ -94,7 +95,9 @@ namespace oxygine
 
             if (_options & opt_fullscreen)
             {
-                driver->getViewport(screen);
+                //driver->getViewport(screen);
+                screen.pos = Point(0, 0);
+                screen.size = core::getDisplaySize();
             }
 
 
@@ -114,8 +117,8 @@ namespace oxygine
             STDRenderer* renderer = STDMaterial::instance->getRenderer();
             rs.material = mat;
 
-			RectF clip = vp.cast<RectF>();
-			rs.clip = &clip;
+            RectF clip = vp.cast<RectF>();
+            rs.clip = &clip;
 
             renderer->initCoordinateSystem(vp.getWidth(), vp.getHeight(), true);
 

+ 5 - 3
oxygine/src/core/oxygine.cpp

@@ -718,14 +718,16 @@ namespace oxygine
 
         void release()
         {
+            Material::setCurrent(0);
+            STDRenderer::release();
+            delete STDMaterial::instance;
+            STDMaterial::instance = 0;
+
             delete IVideoDriver::instance;
             IVideoDriver::instance = 0;
 
             Input::instance.cleanup();
 
-            STDRenderer::release();
-            delete STDMaterial::instance;
-            STDMaterial::instance = 0;
 
             DebugActor::release();