소스 검색

fixed compilation errors

Denis Muratshin 12 년 전
부모
커밋
5162fc780f

+ 2 - 2
.hg_archival.txt

@@ -1,5 +1,5 @@
 repo: b6d71054df5712e643a0685bc3ba54b123db5729
-node: c347162bc0cda461cf21871991cd7b38ef7b5e7b
+node: f480b7d7df5fdc23194b5165082fffd19a97f2d9
 branch: default
 latesttag: null
-latesttagdistance: 213
+latesttagdistance: 216

BIN
doc.zip


+ 1 - 0
oxygine/SDL/win32/oxygine_vs2010.vcxproj

@@ -143,6 +143,7 @@
     <ClCompile Include="..\..\src\Multithreading.cpp" />
     <ClCompile Include="..\..\src\PointerState.cpp" />
     <ClCompile Include="..\..\src\ProgressBar.cpp" />
+    <ClCompile Include="..\..\src\res\CreateResourceContext.cpp" />
     <ClCompile Include="..\..\src\res\ResAnim.cpp" />
     <ClCompile Include="..\..\src\res\ResAtlas.cpp" />
     <ClCompile Include="..\..\src\res\ResBuffer.cpp" />

+ 3 - 0
oxygine/SDL/win32/oxygine_vs2010.vcxproj.filters

@@ -273,6 +273,9 @@
     <ClCompile Include="..\..\src\VisualStyle.cpp">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\res\CreateResourceContext.cpp">
+      <Filter>src\res</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\closure\closure.h">

+ 1 - 0
oxygine/src/DebugActor.cpp

@@ -199,6 +199,7 @@ namespace oxygine
 			}
 
 			dm->setScale(1.0f / scale);
+			dm->setPosition(-getRoot()->getPosition());
 			getRoot()->addChild(dm);
 		}
 	}

+ 3 - 1
oxygine/src/core/Renderer.cpp

@@ -387,7 +387,7 @@ namespace oxygine
 		_driver = driver;
 	}
 
-	void Renderer::begin(spNativeTexture rt, const Rect &viewport, const Color *clearColor)
+	bool Renderer::begin(spNativeTexture rt, const Rect &viewport, const Color *clearColor)
 	{
 		_rt = rt;
 
@@ -399,6 +399,8 @@ namespace oxygine
 		_viewport = viewport;
 
 		getDriver()->begin(_proj, _view, viewport, clearColor);
+
+		return true;
 	}
 
 	void Renderer::end()

+ 1 - 1
oxygine/src/core/Renderer.h

@@ -145,7 +145,7 @@ namespace oxygine
 		virtual ~Renderer();
 
 		/**Begins rendering into RenderTexture or into primary framebuffer if rt is null*/
-		void begin(spNativeTexture rt, const Rect &viewport, const Color *clearColor);
+		bool begin(spNativeTexture rt, const Rect &viewport, const Color *clearColor);
 		/**Completes started rendering and restores previous Framebuffer.*/
 		void end();
 		/**Sets View matrix*/