浏览代码

Merge branch 'dev-continue-download' of github.com:oxygine/oxygine-framework into dev-continue-download

[email protected] 8 年之前
父节点
当前提交
da3f55348b

+ 2 - 2
oxygine/src/AsyncTask.h

@@ -3,7 +3,7 @@
 #include "core/ThreadDispatcher.h"
 #include "EventDispatcher.h"
 #include "Event.h"
-
+#include "core/oxygine.h"
 #ifdef ERROR
 #undef ERROR
 #endif
@@ -86,4 +86,4 @@ namespace oxygine
         void _complete();
         void _error();
     };
-}
+}

+ 0 - 1
oxygine/src/core/ios/HttpRequestCocoaTask.h

@@ -18,7 +18,6 @@ namespace oxygine
 
         void write(NSData* data);
         void complete_(bool error);
-        void progress_(int loaded, int total);
         void gotResponse(int resp, size_t expectedSize);
 
     protected:

+ 1 - 8
oxygine/src/core/ios/HttpRequestCocoaTask.mm

@@ -168,10 +168,6 @@ namespace oxygine
         
     }
     
-    void HttpRequestCocoaTask::progress_(int loaded, int total)
-    {
-        progress(loaded, total);
-    }
     
     void HttpRequestCocoaTask::write(NSData *data)
     {
@@ -193,11 +189,8 @@ namespace oxygine
     void HttpRequestCocoaTask::gotResponse(int resp, size_t expectedSize)
     {
         _responseCode = resp;
-        
         _expectedContentSize = _receivedContentSize + expectedSize;
-        
-        progress(_receivedContentSize, _expectedContentSize);
-        
+        gotHeaders();
     }
     
     void HttpRequestCocoaTask::_run()

+ 2 - 0
oxygine/src/core/oxygine.cpp

@@ -347,6 +347,8 @@ namespace oxygine
             //SDL_GL_SetAttribute(SDL_GL_ACCELERATED_VISUAL, 1);
             SDL_GL_SetAttribute(SDL_GL_CONTEXT_MAJOR_VERSION, 2);
             SDL_GL_SetAttribute(SDL_GL_CONTEXT_MINOR_VERSION, 0);
+            
+            SDL_GL_SetAttribute(SDL_GL_RETAINED_BACKING, 0);
 
             if (desc.force_gles)
             {