Explorar el Código

Merge pull request #23 from zmeyc/pr_missing_files_and_warnings

Missing files and warnings
Denis Muratshin hace 10 años
padre
commit
5d369dd173

+ 32 - 0
oxygine/SDL/ios/oxygine/oxygine_ios.xcodeproj/project.pbxproj

@@ -226,6 +226,14 @@
 		C3EE216217BECD7200715678 /* VertexDeclarationGL.h in Headers */ = {isa = PBXBuildFile; fileRef = C3EE215617BECD7200715678 /* VertexDeclarationGL.h */; };
 		C3EE216317BECD7200715678 /* VideoDriverGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C3EE215717BECD7200715678 /* VideoDriverGL.cpp */; };
 		C3EE216417BECD7200715678 /* VideoDriverGL.h in Headers */ = {isa = PBXBuildFile; fileRef = C3EE215817BECD7200715678 /* VideoDriverGL.h */; };
+		CEC2D0081C47288E00450163 /* Material.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEC2D0001C47288E00450163 /* Material.cpp */; };
+		CEC2D0091C47288E00450163 /* Material.h in Headers */ = {isa = PBXBuildFile; fileRef = CEC2D0011C47288E00450163 /* Material.h */; };
+		CEC2D00A1C47288E00450163 /* STDMaterial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEC2D0021C47288E00450163 /* STDMaterial.cpp */; };
+		CEC2D00B1C47288E00450163 /* STDMaterial.h in Headers */ = {isa = PBXBuildFile; fileRef = CEC2D0031C47288E00450163 /* STDMaterial.h */; };
+		CEC2D00C1C47288E00450163 /* TweenAlphaFade.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEC2D0041C47288E00450163 /* TweenAlphaFade.cpp */; };
+		CEC2D00D1C47288E00450163 /* TweenAlphaFade.h in Headers */ = {isa = PBXBuildFile; fileRef = CEC2D0051C47288E00450163 /* TweenAlphaFade.h */; };
+		CEC2D00E1C47288E00450163 /* TweenGlow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEC2D0061C47288E00450163 /* TweenGlow.cpp */; };
+		CEC2D00F1C47288E00450163 /* TweenGlow.h in Headers */ = {isa = PBXBuildFile; fileRef = CEC2D0071C47288E00450163 /* TweenGlow.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -457,6 +465,14 @@
 		C3EE215617BECD7200715678 /* VertexDeclarationGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VertexDeclarationGL.h; path = gl/VertexDeclarationGL.h; sourceTree = "<group>"; };
 		C3EE215717BECD7200715678 /* VideoDriverGL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = VideoDriverGL.cpp; path = gl/VideoDriverGL.cpp; sourceTree = "<group>"; };
 		C3EE215817BECD7200715678 /* VideoDriverGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VideoDriverGL.h; path = gl/VideoDriverGL.h; sourceTree = "<group>"; };
+		CEC2D0001C47288E00450163 /* Material.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Material.cpp; path = ../../../src/Material.cpp; sourceTree = "<group>"; };
+		CEC2D0011C47288E00450163 /* Material.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Material.h; path = ../../../src/Material.h; sourceTree = "<group>"; };
+		CEC2D0021C47288E00450163 /* STDMaterial.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = STDMaterial.cpp; path = ../../../src/STDMaterial.cpp; sourceTree = "<group>"; };
+		CEC2D0031C47288E00450163 /* STDMaterial.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = STDMaterial.h; path = ../../../src/STDMaterial.h; sourceTree = "<group>"; };
+		CEC2D0041C47288E00450163 /* TweenAlphaFade.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TweenAlphaFade.cpp; path = ../../../src/TweenAlphaFade.cpp; sourceTree = "<group>"; };
+		CEC2D0051C47288E00450163 /* TweenAlphaFade.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TweenAlphaFade.h; path = ../../../src/TweenAlphaFade.h; sourceTree = "<group>"; };
+		CEC2D0061C47288E00450163 /* TweenGlow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TweenGlow.cpp; path = ../../../src/TweenGlow.cpp; sourceTree = "<group>"; };
+		CEC2D0071C47288E00450163 /* TweenGlow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TweenGlow.h; path = ../../../src/TweenGlow.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -549,6 +565,10 @@
 			isa = PBXGroup;
 			children = (
 				9264E5B91B8358B00049F91F /* json */,
+				CEC2D0001C47288E00450163 /* Material.cpp */,
+				CEC2D0011C47288E00450163 /* Material.h */,
+				CEC2D0021C47288E00450163 /* STDMaterial.cpp */,
+				CEC2D0031C47288E00450163 /* STDMaterial.h */,
 				9240B4051ADFB856005F9C5B /* Property.h */,
 				9240B4061ADFB856005F9C5B /* TweenAnim.cpp */,
 				9240B4071ADFB856005F9C5B /* TweenAnim.h */,
@@ -567,6 +587,10 @@
 				923663661A4756C500EB65B3 /* Tween.h */,
 				923663671A4756C500EB65B3 /* TweenQueue.cpp */,
 				923663681A4756C500EB65B3 /* TweenQueue.h */,
+				CEC2D0041C47288E00450163 /* TweenAlphaFade.cpp */,
+				CEC2D0051C47288E00450163 /* TweenAlphaFade.h */,
+				CEC2D0061C47288E00450163 /* TweenGlow.cpp */,
+				CEC2D0071C47288E00450163 /* TweenGlow.h */,
 				923A9E931A1FCBB700A6F08E /* MaskedRenderer.cpp */,
 				923A9E941A1FCBB700A6F08E /* MaskedRenderer.h */,
 				923A9E951A1FCBB700A6F08E /* STDRenderer.cpp */,
@@ -918,6 +942,7 @@
 				C3E8705B16EBC8EB00052915 /* CreateResourceContext.h in Headers */,
 				C3E8705D16EBC8EB00052915 /* ResAnim.h in Headers */,
 				9240B4081ADFB856005F9C5B /* Property.h in Headers */,
+				CEC2D00B1C47288E00450163 /* STDMaterial.h in Headers */,
 				C3E8705F16EBC8EB00052915 /* ResAtlas.h in Headers */,
 				C3E8706116EBC8EB00052915 /* ResBuffer.h in Headers */,
 				C3E8706316EBC8EB00052915 /* ResFont.h in Headers */,
@@ -961,12 +986,15 @@
 				C3EE215E17BECD7200715678 /* NativeTextureGLES.h in Headers */,
 				9223E3131A5193E000B2770B /* AsyncTask.h in Headers */,
 				C3EE216017BECD7200715678 /* oxgl.h in Headers */,
+				CEC2D0091C47288E00450163 /* Material.h in Headers */,
 				9223E31A1A52D6B800B2770B /* WebImage.h in Headers */,
 				C3EE216217BECD7200715678 /* VertexDeclarationGL.h in Headers */,
 				0472E36217F8A1A80016A832 /* vertex.h in Headers */,
 				C3EE216417BECD7200715678 /* VideoDriverGL.h in Headers */,
 				04B3A71A18A65668004C67E3 /* InputText.h in Headers */,
 				C38704A717C0C71700015CA8 /* VideoDriverGLES20.h in Headers */,
+				CEC2D00F1C47288E00450163 /* TweenGlow.h in Headers */,
+				CEC2D00D1C47288E00450163 /* TweenAlphaFade.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1034,6 +1062,7 @@
 				C3E8700E16EBC8EB00052915 /* ColorRectSprite.cpp in Sources */,
 				C3E8701016EBC8EB00052915 /* coroutines.cpp in Sources */,
 				C3E8701416EBC8EB00052915 /* ImageData.cpp in Sources */,
+				CEC2D00A1C47288E00450163 /* STDMaterial.cpp in Sources */,
 				0472E36417F8A1A80016A832 /* ZipFileSystem.cpp in Sources */,
 				C3E8701616EBC8EB00052915 /* ImageDataOperations.cpp in Sources */,
 				C3E8701B16EBC8EB00052915 /* Mem2Native.cpp in Sources */,
@@ -1057,6 +1086,7 @@
 				C3E8704B16EBC8EB00052915 /* MemoryTexture.cpp in Sources */,
 				C3E8704D16EBC8EB00052915 /* Multithreading.cpp in Sources */,
 				0472E37F17F8A2EC0016A832 /* MaskedSprite.cpp in Sources */,
+				CEC2D00E1C47288E00450163 /* TweenGlow.cpp in Sources */,
 				04AEC313182BD98D006413A9 /* UberShaderProgram.cpp in Sources */,
 				C3E8705316EBC8EB00052915 /* PointerState.cpp in Sources */,
 				9223E31C1A530E8A00B2770B /* HttpRequestTask.cpp in Sources */,
@@ -1071,6 +1101,7 @@
 				923A9E971A1FCBB700A6F08E /* MaskedRenderer.cpp in Sources */,
 				C3E8706216EBC8EB00052915 /* ResFont.cpp in Sources */,
 				C3E8706416EBC8EB00052915 /* ResFontBM.cpp in Sources */,
+				CEC2D0081C47288E00450163 /* Material.cpp in Sources */,
 				C3E8706616EBC8EB00052915 /* Resource.cpp in Sources */,
 				C3E8706816EBC8EB00052915 /* Resources.cpp in Sources */,
 				C3E8706A16EBC8EB00052915 /* ResStarlingAtlas.cpp in Sources */,
@@ -1111,6 +1142,7 @@
 				C3EE215F17BECD7200715678 /* oxgl.cpp in Sources */,
 				C3EE216117BECD7200715678 /* VertexDeclarationGL.cpp in Sources */,
 				C3EE216317BECD7200715678 /* VideoDriverGL.cpp in Sources */,
+				CEC2D00C1C47288E00450163 /* TweenAlphaFade.cpp in Sources */,
 				0472E35B17F8A1A80016A832 /* log.cpp in Sources */,
 				C38704A617C0C71700015CA8 /* VideoDriverGLES20.cpp in Sources */,
 				049B64AB1803054300EC333E /* CreateResourceContext.cpp in Sources */,

+ 32 - 0
oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj/project.pbxproj

@@ -227,6 +227,14 @@
 		92CE26801A58ABDC003901D6 /* WebImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 92CE26781A58ABDC003901D6 /* WebImage.h */; };
 		92E0C9A61B24922600F0DB21 /* cdecode.c in Sources */ = {isa = PBXBuildFile; fileRef = 92E0C9A41B24922600F0DB21 /* cdecode.c */; };
 		92E0C9A71B24922600F0DB21 /* cdecode.h in Headers */ = {isa = PBXBuildFile; fileRef = 92E0C9A51B24922600F0DB21 /* cdecode.h */; };
+		CEC2CFF61C47274C00450163 /* Material.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEC2CFEE1C47274C00450163 /* Material.cpp */; };
+		CEC2CFF71C47274C00450163 /* Material.h in Headers */ = {isa = PBXBuildFile; fileRef = CEC2CFEF1C47274C00450163 /* Material.h */; };
+		CEC2CFF81C47274C00450163 /* STDMaterial.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEC2CFF01C47274C00450163 /* STDMaterial.cpp */; };
+		CEC2CFF91C47274C00450163 /* STDMaterial.h in Headers */ = {isa = PBXBuildFile; fileRef = CEC2CFF11C47274C00450163 /* STDMaterial.h */; };
+		CEC2CFFA1C47274C00450163 /* TweenAlphaFade.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEC2CFF21C47274C00450163 /* TweenAlphaFade.cpp */; };
+		CEC2CFFB1C47274C00450163 /* TweenAlphaFade.h in Headers */ = {isa = PBXBuildFile; fileRef = CEC2CFF31C47274C00450163 /* TweenAlphaFade.h */; };
+		CEC2CFFC1C47274C00450163 /* TweenGlow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CEC2CFF41C47274C00450163 /* TweenGlow.cpp */; };
+		CEC2CFFD1C47274C00450163 /* TweenGlow.h in Headers */ = {isa = PBXBuildFile; fileRef = CEC2CFF51C47274C00450163 /* TweenGlow.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -457,6 +465,14 @@
 		92CE26781A58ABDC003901D6 /* WebImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebImage.h; path = ../../../src/WebImage.h; sourceTree = "<group>"; };
 		92E0C9A41B24922600F0DB21 /* cdecode.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cdecode.c; sourceTree = "<group>"; };
 		92E0C9A51B24922600F0DB21 /* cdecode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cdecode.h; sourceTree = "<group>"; };
+		CEC2CFEE1C47274C00450163 /* Material.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Material.cpp; path = ../../../src/Material.cpp; sourceTree = "<group>"; };
+		CEC2CFEF1C47274C00450163 /* Material.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Material.h; path = ../../../src/Material.h; sourceTree = "<group>"; };
+		CEC2CFF01C47274C00450163 /* STDMaterial.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = STDMaterial.cpp; path = ../../../src/STDMaterial.cpp; sourceTree = "<group>"; };
+		CEC2CFF11C47274C00450163 /* STDMaterial.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = STDMaterial.h; path = ../../../src/STDMaterial.h; sourceTree = "<group>"; };
+		CEC2CFF21C47274C00450163 /* TweenAlphaFade.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TweenAlphaFade.cpp; path = ../../../src/TweenAlphaFade.cpp; sourceTree = "<group>"; };
+		CEC2CFF31C47274C00450163 /* TweenAlphaFade.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TweenAlphaFade.h; path = ../../../src/TweenAlphaFade.h; sourceTree = "<group>"; };
+		CEC2CFF41C47274C00450163 /* TweenGlow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TweenGlow.cpp; path = ../../../src/TweenGlow.cpp; sourceTree = "<group>"; };
+		CEC2CFF51C47274C00450163 /* TweenGlow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TweenGlow.h; path = ../../../src/TweenGlow.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -492,6 +508,10 @@
 			isa = PBXGroup;
 			children = (
 				9264E5C71B835AE50049F91F /* json */,
+				CEC2CFEE1C47274C00450163 /* Material.cpp */,
+				CEC2CFEF1C47274C00450163 /* Material.h */,
+				CEC2CFF01C47274C00450163 /* STDMaterial.cpp */,
+				CEC2CFF11C47274C00450163 /* STDMaterial.h */,
 				9240B40E1ADFBB3C005F9C5B /* TweenAnim.cpp */,
 				9240B40F1ADFBB3C005F9C5B /* TweenAnim.h */,
 				92CE26711A58ABDC003901D6 /* AsyncTask.cpp */,
@@ -509,6 +529,10 @@
 				923663551A47561500EB65B3 /* Tween.h */,
 				923663561A47561500EB65B3 /* TweenQueue.cpp */,
 				923663571A47561500EB65B3 /* TweenQueue.h */,
+				CEC2CFF21C47274C00450163 /* TweenAlphaFade.cpp */,
+				CEC2CFF31C47274C00450163 /* TweenAlphaFade.h */,
+				CEC2CFF41C47274C00450163 /* TweenGlow.cpp */,
+				CEC2CFF51C47274C00450163 /* TweenGlow.h */,
 				923A9E8D1A1FCA6600A6F08E /* MaskedRenderer.cpp */,
 				923A9E8E1A1FCA6600A6F08E /* MaskedRenderer.h */,
 				923A9E891A1FCA3500A6F08E /* STDRenderer.cpp */,
@@ -864,6 +888,7 @@
 				049B56B11871F21E00EF3C66 /* Texture.h in Headers */,
 				049B56991871F21E00EF3C66 /* Mutex.h in Headers */,
 				049B57131871F21E00EF3C66 /* TextStyle.h in Headers */,
+				CEC2CFFB1C47274C00450163 /* TweenAlphaFade.h in Headers */,
 				048AD0A5197D238D001963EF /* TextField.h in Headers */,
 				049B56E91871F21E00EF3C66 /* oxygine_include.h in Headers */,
 				049B56951871F21E00EF3C66 /* Mem2Native.h in Headers */,
@@ -902,8 +927,10 @@
 				049B56D51871F21E00EF3C66 /* MaskedSprite.h in Headers */,
 				92CE267A1A58ABDC003901D6 /* AsyncTask.h in Headers */,
 				049B570A1871F21E00EF3C66 /* Sprite.h in Headers */,
+				CEC2CFF91C47274C00450163 /* STDMaterial.h in Headers */,
 				049B56E61871F21E00EF3C66 /* unzip.h in Headers */,
 				049B56781871F21E00EF3C66 /* coroutines.h in Headers */,
+				CEC2CFFD1C47274C00450163 /* TweenGlow.h in Headers */,
 				049B571A1871F21E00EF3C66 /* ImageUtils.h in Headers */,
 				049B57021871F21E00EF3C66 /* Resources.h in Headers */,
 				049B56921871F21E00EF3C66 /* log.h in Headers */,
@@ -914,6 +941,7 @@
 				049B569E1871F21E00EF3C66 /* ox_debug.h in Headers */,
 				049B56681871F21E00EF3C66 /* AnimationFrame.h in Headers */,
 				9264E5CC1B835AFD0049F91F /* json.h in Headers */,
+				CEC2CFF71C47274C00450163 /* Material.h in Headers */,
 				049B56811871F21E00EF3C66 /* oxgl.h in Headers */,
 				049B56B61871F21E00EF3C66 /* vertex.h in Headers */,
 				049B56D11871F21E00EF3C66 /* initActor.h in Headers */,
@@ -1034,6 +1062,7 @@
 				049B57031871F21E00EF3C66 /* ResStarlingAtlas.cpp in Sources */,
 				049B568C1871F21E00EF3C66 /* ImageData.cpp in Sources */,
 				049B56751871F21E00EF3C66 /* ColorRectSprite.cpp in Sources */,
+				CEC2CFF81C47274C00450163 /* STDMaterial.cpp in Sources */,
 				049B57171871F21E00EF3C66 /* AtlasTool.cpp in Sources */,
 				049B566D1871F21E00EF3C66 /* Button.cpp in Sources */,
 				049B57011871F21E00EF3C66 /* Resources.cpp in Sources */,
@@ -1057,6 +1086,7 @@
 				049B56CA1871F21E00EF3C66 /* Draggable.cpp in Sources */,
 				049B571C1871F21E00EF3C66 /* stringUtils.cpp in Sources */,
 				049B56841871F21E00EF3C66 /* VertexDeclarationGL.cpp in Sources */,
+				CEC2CFFC1C47274C00450163 /* TweenGlow.cpp in Sources */,
 				049B56B41871F21E00EF3C66 /* UberShaderProgram.cpp in Sources */,
 				049B56A51871F21E00EF3C66 /* Restorable.cpp in Sources */,
 				049B56F01871F21E00EF3C66 /* pugixml.cpp in Sources */,
@@ -1071,6 +1101,7 @@
 				049B56E11871F21E00EF3C66 /* ioapi.c in Sources */,
 				049B56911871F21E00EF3C66 /* log.cpp in Sources */,
 				049B56BA1871F21E00EF3C66 /* ZipFileSystem.cpp in Sources */,
+				CEC2CFF61C47274C00450163 /* Material.cpp in Sources */,
 				049B56B21871F21E00EF3C66 /* ThreadMessages.cpp in Sources */,
 				049B56861871F21E00EF3C66 /* VideoDriverGL.cpp in Sources */,
 				049B56691871F21E00EF3C66 /* blocking.cpp in Sources */,
@@ -1111,6 +1142,7 @@
 				049B56821871F21E00EF3C66 /* ShaderProgramGL.cpp in Sources */,
 				049B56981871F21E00EF3C66 /* Mutex.cpp in Sources */,
 				049B57091871F21E00EF3C66 /* Sprite.cpp in Sources */,
+				CEC2CFFA1C47274C00450163 /* TweenAlphaFade.cpp in Sources */,
 				049B56FB1871F21E00EF3C66 /* ResFont.cpp in Sources */,
 				049B56651871F21E00EF3C66 /* Actor.cpp in Sources */,
 				049B56941871F21E00EF3C66 /* Mem2Native.cpp in Sources */,

+ 2 - 2
oxygine/src/STDRenderer.cpp

@@ -195,9 +195,9 @@ namespace oxygine
         size_t indices = (count * 3) / 2;
 
         if (indices <= indices8.size())
-            getDriver()->draw(IVideoDriver::PT_TRIANGLES, _vdecl, &_vertices.front(), count, &indices8.front(), indices, false);
+            getDriver()->draw(IVideoDriver::PT_TRIANGLES, _vdecl, &_vertices.front(), (unsigned int)count, &indices8.front(), (unsigned int)indices, false);
         else
-            getDriver()->draw(IVideoDriver::PT_TRIANGLES, _vdecl, &_vertices.front(), count, &indices16.front(), indices, true);
+            getDriver()->draw(IVideoDriver::PT_TRIANGLES, _vdecl, &_vertices.front(), (unsigned int)count, &indices16.front(), (unsigned int)indices, true);
 
         _vertices.clear();
     }

+ 2 - 2
oxygine/src/core/curl/HttpRequestCurlTask.cpp

@@ -63,7 +63,7 @@ namespace oxygine
             case ID_PROGRESS:
             {
                 HttpRequestTaskCURL* task = (HttpRequestTaskCURL*)msg.cbData;
-                task->dispatchProgress((size_t)msg.arg2, (size_t)msg.arg1);
+                task->dispatchProgress((int)(size_t)msg.arg2, (int)(size_t)msg.arg1);
             } break;
         }
 
@@ -179,7 +179,7 @@ namespace oxygine
         size_t size = n * l;
         if (!_fname.empty())
         {
-            file::write(_handle, d, size);
+            file::write(_handle, d, (unsigned int)size);
         }
         else
         {

+ 4 - 4
oxygine/src/core/ios/ios.mm

@@ -56,11 +56,11 @@ namespace oxygine
         NSData *data = [NSData dataWithBytesNoCopy:pData length:nDatalen];
         UIImage *image = [UIImage imageWithData:data];
         
-        GLuint width = CGImageGetWidth(image.CGImage);
-        GLuint height = CGImageGetHeight(image.CGImage);
+        GLuint width = (GLuint)CGImageGetWidth(image.CGImage);
+        GLuint height = (GLuint)CGImageGetHeight(image.CGImage);
         
-        int bits = CGImageGetBitsPerPixel(image.CGImage);
-        int pitch = CGImageGetBytesPerRow(image.CGImage);
+        int bits = (int)CGImageGetBitsPerPixel(image.CGImage);
+        int pitch = (int)CGImageGetBytesPerRow(image.CGImage);
         
         CGImageAlphaInfo alpha = CGImageGetAlphaInfo(image.CGImage);
         TextureFormat srcFormat = bits == 32 ? TF_R8G8B8A8 : TF_R8G8B8;