epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for running on linux

Browse Source
This commit is contained in:
Chris Forbes
2010-02-18 23:46:00 +13:00
parent 0b22797b12
commit 5adefb8fee
8 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -30,4 +30,5 @@ cg.dll
cgGL.dll cgGL.dll
glfw.dll glfw.dll
/OpenRa.Gl.dll /OpenRa.Gl.dll
settings.ini

6
OpenRa.Game/Game.cs
View File

@@ -343,8 +343,8 @@ namespace OpenRa
desktopResolution.Height); desktopResolution.Height);
} }
[DllImport("user32")] // [DllImport("user32")]
static extern int ShowCursor([MarshalAs(UnmanagedType.Bool)] bool visible); // static extern int ShowCursor([MarshalAs(UnmanagedType.Bool)] bool visible);
public static void PreInit(Settings settings) public static void PreInit(Settings settings)
{ {
@@ -376,7 +376,7 @@ namespace OpenRa
Game.Initialize(Game.Settings.Map, renderer, new int2(resolution), Game.Settings.Player, controller); Game.Initialize(Game.Settings.Map, renderer, new int2(resolution), Game.Settings.Player, controller);
ShowCursor(false); // ShowCursor(false);
Game.ResetTimer(); Game.ResetTimer();
} }

6
OpenRa.Game/Graphics/Renderer.cs
View File

@@ -155,7 +155,8 @@ namespace OpenRa.Graphics
} }
public void DrawText(string text, int2 pos, Color c) public void DrawText(string text, int2 pos, Color c)
{ {
return;
using (new PerfSample("text")) using (new PerfSample("text"))
{ {
Bitmap b = RenderTextToBitmap(text, fDebug, c); Bitmap b = RenderTextToBitmap(text, fDebug, c);
@@ -166,7 +167,8 @@ namespace OpenRa.Graphics
} }
public void DrawText2(string text, int2 pos, Color c) public void DrawText2(string text, int2 pos, Color c)
{ {
return;
using (new PerfSample("text")) using (new PerfSample("text"))
{ {
Bitmap b = RenderTextToBitmap(text, fTitle, c); Bitmap b = RenderTextToBitmap(text, fTitle, c);

8
OpenRa.Gl/GraphicsDevice.cs
View File

@@ -103,13 +103,17 @@ namespace OpenRa.GlRenderer
Glfw.glfwGetWindowSize(out width, out height); Glfw.glfwGetWindowSize(out width, out height);
windowSize = new Size( width, height ); windowSize = new Size( width, height );
cgContext = Cg.cgCreateContext(); cgContext = Cg.cgCreateContext();
Cg.cgSetErrorCallback( CgErrorCallback ); Cg.cgSetErrorCallback( CgErrorCallback );
CgGl.cgGLRegisterStates( cgContext ); CgGl.cgGLRegisterStates( cgContext );
CgGl.cgGLSetManageTextureParameters( cgContext, true ); CgGl.cgGLSetManageTextureParameters( cgContext, true );
vertexProfile = CgGl.cgGLGetLatestProfile( CgGl.CG_GL_VERTEX ); vertexProfile = CgGl.cgGLGetLatestProfile( CgGl.CG_GL_VERTEX );
fragmentProfile = CgGl.cgGLGetLatestProfile( CgGl.CG_GL_FRAGMENT ); fragmentProfile = CgGl.cgGLGetLatestProfile( CgGl.CG_GL_FRAGMENT );
Console.WriteLine("VP Profile: " + vertexProfile);
Console.WriteLine("FP Profile: " + fragmentProfile);
Gl.glEnableClientState( Gl.GL_VERTEX_ARRAY ); Gl.glEnableClientState( Gl.GL_VERTEX_ARRAY );
CheckGlError(); CheckGlError();

0
bogus.sno → bogus.SNO
View File

0
bogus.tem → bogus.TEM
View File

0
maps/CAFFEIN0.MPR → maps/caffein0.mpr
View File

4
thirdparty/Tao/Tao.OpenAl.dll.config vendored
View File

@@ -1,11 +1,11 @@
<configuration> <configuration>
<dllmap dll="OpenAL32.dll"> <dllmap dll="OpenAL32.dll">
<dllentry os="linux" dll="libopenal.so.0" /> <dllentry os="linux" dll="libopenal.so.1" />
<dllentry os="windows" dll="OpenAL32.dll" /> <dllentry os="windows" dll="OpenAL32.dll" />
<dllentry os="osx" dll="/System/Library/Frameworks/OpenAL.framework/OpenAL" /> <dllentry os="osx" dll="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
</dllmap> </dllmap>
<dllmap dll="alut.dll"> <dllmap dll="alut.dll">
<dllentry os="linux" dll="libalut.so.0" /> <dllentry os="linux" dll="libalut.so.1" />
<dllentry os="windows" dll="alut.dll" /> <dllentry os="windows" dll="alut.dll" />
<dllentry os="osx" dll="libalut.so.0" /> <dllentry os="osx" dll="libalut.so.0" />
</dllmap> </dllmap>