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

actually all compiles now

Browse Source
This commit is contained in:
Alli
2010-02-18 18:00:04 +13:00
parent cf8a2dd50f
commit 556cc5798d
6 changed files with 86 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRa.Gl/GraphicsDevice.cs
View File

@@ -28,7 +28,7 @@ using Tao.Cg;
using Tao.OpenGl;
using OpenRa.FileFormats.Graphics;
using Tao.Glfw;
using OpenRa;
[assembly: Renderer( typeof( OpenRa.GlRenderer.GraphicsDevice ))]
@@ -68,7 +68,7 @@ namespace OpenRa.GlRenderer
: button == Glfw.GLFW_MOUSE_BUTTON_2 ? MouseButtons.Right
: button == Glfw.GLFW_MOUSE_BUTTON_3 ? MouseButtons.Middle
: 0;
Game.DispatchMouseInput( action == Glfw.GLFW_PRESS ? MouseInputEvent.Down : MouseInputEvent.Up,
OpenRa.Game.DispatchMouseInput( action == Glfw.GLFW_PRESS ? MouseInputEvent.Down : MouseInputEvent.Up,
new MouseEventArgs( b, action == Glfw.GLFW_PRESS ? 1 : 0, mouseX, mouseY, 0 ), 0 );
if (action == Glfw.GLFW_PRESS) lastButtonBits |= b;
@@ -82,11 +82,11 @@ namespace OpenRa.GlRenderer
mouseX = x;
mouseY = y;
if (initDone)
Game.DispatchMouseInput(MouseInputEvent.Move, new MouseEventArgs(lastButtonBits, 0, x, y, 0), 0);
OpenRa.Game.DispatchMouseInput(MouseInputEvent.Move, new MouseEventArgs(lastButtonBits, 0, x, y, 0), 0);
});
Glfw.glfwSetWindowCloseCallback( windowCloseCallback = () =>
{
Game.Exit();
OpenRa.Game.Exit();
Glfw.glfwIconifyWindow();
return Gl.GL_TRUE;
} );
@@ -189,7 +189,7 @@ namespace OpenRa.GlRenderer
#region IGraphicsDevice Members
public IVertexBuffer<Vertex> CreateVertexBuffer<Vertex>( int size )
public IVertexBuffer<Vertex> CreateVertexBuffer( int size )
{
return new VertexBuffer<Vertex>( this, size );
}