From 512657e009d3b9e953aaf6d1f08c97328e9f7498 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Thu, 7 May 2015 16:27:54 +1000 Subject: [PATCH] Remove unused ambient lighting code. --- GraphicsAPI/DirectXApi.cs | 10 ---------- GraphicsAPI/IGraphicsApi.cs | 4 ---- GraphicsAPI/OpenGLApi.cs | 18 ------------------ 3 files changed, 32 deletions(-) diff --git a/GraphicsAPI/DirectXApi.cs b/GraphicsAPI/DirectXApi.cs index b2d72f4ac..a6ae672d7 100644 --- a/GraphicsAPI/DirectXApi.cs +++ b/GraphicsAPI/DirectXApi.cs @@ -211,16 +211,6 @@ namespace ClassicalSharp.GraphicsAPI { device.RenderState.FillMode = fillModes[(int)type]; } - public override bool AmbientLighting { - set { - if( !value ) device.RenderState.Ambient = Color.White; - } - } - - public override void SetAmbientColour( FastColour col ) { - device.RenderState.Ambient = col.ToColor(); - } - #region Vertex buffers VertexFormats[] formatMapping = new VertexFormats[] { diff --git a/GraphicsAPI/IGraphicsApi.cs b/GraphicsAPI/IGraphicsApi.cs index 5bbcbef94..125b50bf0 100644 --- a/GraphicsAPI/IGraphicsApi.cs +++ b/GraphicsAPI/IGraphicsApi.cs @@ -115,10 +115,6 @@ namespace ClassicalSharp.GraphicsAPI { public abstract void SetFillType( FillType type ); - public abstract bool AmbientLighting { set; } - - public abstract void SetAmbientColour( FastColour col ); - public virtual int InitVb( T[] vertices, DrawMode mode, VertexFormat format ) where T : struct { return InitVb( vertices, mode, format, vertices.Length ); } diff --git a/GraphicsAPI/OpenGLApi.cs b/GraphicsAPI/OpenGLApi.cs index bee0ff9d5..c9fa780a5 100644 --- a/GraphicsAPI/OpenGLApi.cs +++ b/GraphicsAPI/OpenGLApi.cs @@ -250,24 +250,6 @@ namespace ClassicalSharp.GraphicsAPI { GL.PolygonMode( MaterialFace.FrontAndBack, fillModes[(int)type] ); } - public override bool AmbientLighting { - set { - if( value ) { - GL.Enable( EnableCap.Lighting ); - GL.Enable( EnableCap.ColorMaterial ); - GL.ColorMaterial( MaterialFace.FrontAndBack, ColorMaterialParameter.Ambient ); - } else { - GL.Disable( EnableCap.Lighting ); - GL.Disable( EnableCap.ColorMaterial ); - } - } - } - - public unsafe override void SetAmbientColour( FastColour col ) { - Vector4 colRGBA = new Vector4( col.R / 255f, col.G / 255f, col.B / 255f, 1 ); - GL.LightModel( LightModelParameter.LightModelAmbient, &colRGBA.X ); - } - #region Vertex buffers #if TRACK_RESOURCES