From e042e093a4761f1227d4dd80d695e01642e17ffd Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Wed, 27 Nov 2013 11:56:01 +0200 Subject: [PATCH] Remove some deprecated stuff --- source/light.h | 3 --- source/misc.cpp | 5 ----- source/misc.h | 3 --- source/object.cpp | 3 --- 4 files changed, 14 deletions(-) diff --git a/source/light.h b/source/light.h index 2375c7c9..fb3410c7 100644 --- a/source/light.h +++ b/source/light.h @@ -47,9 +47,6 @@ public: void bind() const; void bind_to(unsigned) const; - // Deprecated - void set_position(float x, float y, float z, float w) { set_position(Vector4(x, y, z, w)); } - static void activate(unsigned); static void unbind(); static void unbind_from(unsigned); diff --git a/source/misc.cpp b/source/misc.cpp index aca3df0f..f27fa5e2 100644 --- a/source/misc.cpp +++ b/source/misc.cpp @@ -21,11 +21,6 @@ void set(GLenum state, bool value) disable(state); } -void get(GLenum state, int &data) -{ - glGetIntegerv(state, &data); -} - void get(GLenum state, int *data) { glGetIntegerv(state, data); diff --git a/source/misc.h b/source/misc.h index 464c0870..cfefdbf2 100644 --- a/source/misc.h +++ b/source/misc.h @@ -10,9 +10,6 @@ void enable(GLenum); void disable(GLenum); void set(GLenum, bool); -///Deprecated (can't properly pass an array through a reference) -void get(GLenum, int &); - void get(GLenum, int *); int get_i(GLenum); diff --git a/source/object.cpp b/source/object.cpp index d35517bf..637af62a 100644 --- a/source/object.cpp +++ b/source/object.cpp @@ -157,9 +157,6 @@ void Object::Loader::init() add("mesh", &Loader::mesh_lod); add("technique", &Loader::technique_inline); add("technique", &Loader::technique); - - // Deprecated alias, will be removed - add("lod_mesh", &Loader::mesh_lod); } void Object::Loader::finish() -- 2.43.0