Cleanup

src/lua/lua_environment.cpp

@@ -24,9 +24,7 @@ extern void load_camera(LuaEnvironment& env);
 extern void load_controller(LuaEnvironment& env);
 extern void load_debug_line(LuaEnvironment& env);
 extern void load_device(LuaEnvironment& env);
-extern void load_float_setting(LuaEnvironment& env);
 extern void load_gui(LuaEnvironment& env);
-extern void load_int_setting(LuaEnvironment& env);
 extern void load_math(LuaEnvironment& env);
 extern void load_matrix4x4(LuaEnvironment& env);
 extern void load_physics_world(LuaEnvironment& env);
@@ -35,7 +33,7 @@ extern void load_raycast(LuaEnvironment& env);
 extern void load_resource_package(LuaEnvironment& env);
 extern void load_sound_world(LuaEnvironment& env);
 extern void load_sprite(LuaEnvironment& env);
-extern void load_string_setting(LuaEnvironment& env);
+extern void load_settings(LuaEnvironment& env);
 extern void load_unit(LuaEnvironment& env);
 extern void load_vector3(LuaEnvironment& env);
 extern void load_window(LuaEnvironment& env);
@@ -189,9 +187,7 @@ void LuaEnvironment::load_libs()
 	load_controller(*this);
 	load_debug_line(*this);
 	load_device(*this);
-	load_float_setting(*this);
 	load_gui(*this);
-	load_int_setting(*this);
 	load_math(*this);
 	load_matrix4x4(*this);
 	load_physics_world(*this);
@@ -200,7 +196,7 @@ void LuaEnvironment::load_libs()
 	load_resource_package(*this);
 	load_sound_world(*this);
 	load_sprite(*this);
-	load_string_setting(*this);
+	load_settings(*this);
 	load_unit(*this);
 	load_vector3(*this);
 	load_window(*this);

src/lua/lua_float_setting.cpp

@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2012-2015 Daniele Bartolini and individual contributors.
- * License: https://github.com/taylor001/crown/blob/master/LICENSE
- */
-
-#include "float_setting.h"
-#include "lua_stack.h"
-#include "lua_environment.h"
-
-namespace crown
-{
-
-static int float_setting_value(lua_State* L)
-{
-	LuaStack stack(L);
-
-	const char* setting_name = stack.get_string(1);
-
-	FloatSetting* setting = FloatSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		stack.push_float(setting->value());
-	}
-	else
-	{
-		stack.push_float(0.0f);
-	}
-
-	return 1;
-}
-
-static int float_setting_synopsis(lua_State* L)
-{
-	LuaStack stack(L);
-
-	const char* setting_name = stack.get_string(1);
-
-	FloatSetting* setting = FloatSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		stack.push_string(setting->synopsis());
-	}
-	else
-	{
-		stack.push_string("");
-	}
-
-	return 1;
-}
-
-static int float_setting_min(lua_State* L)
-{
-	LuaStack stack(L);
-
-	const char* setting_name = stack.get_string(1);
-
-	FloatSetting* setting = FloatSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		stack.push_float(setting->min());
-	}
-	else
-	{
-		stack.push_float(0);
-	}
-
-	return 1;
-}
-
-static int float_setting_max(lua_State* L)
-{
-	LuaStack stack(L);
-
-	const char* setting_name = stack.get_string(1);
-
-	FloatSetting* setting = FloatSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		stack.push_float(setting->max());
-	}
-	else
-	{
-		stack.push_float(0);
-	}
-
-	return 1;
-}
-
-static int float_setting_update(lua_State* L)
-{
-	LuaStack stack(L);
-
-	const char* setting_name = stack.get_string(1);
-	const float setting_value = stack.get_float(2);
-
-	FloatSetting* setting = FloatSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		(*setting) = setting_value;
-	}
-
-	return 0;
-}
-
-void load_float_setting(LuaEnvironment& env)
-{
-	env.load_module_function("FloatSetting", "value",    float_setting_value);
-	env.load_module_function("FloatSetting", "synopsis", float_setting_synopsis);
-	env.load_module_function("FloatSetting", "min",      float_setting_min);
-	env.load_module_function("FloatSetting", "max",      float_setting_max);
-	env.load_module_function("FloatSetting", "update",   float_setting_update);
-}
-
-} // namespace crown

src/lua/lua_int_setting.cpp

@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2012-2015 Daniele Bartolini and individual contributors.
- * License: https://github.com/taylor001/crown/blob/master/LICENSE
- */
-
-#include "int_setting.h"
-#include "lua_stack.h"
-#include "lua_environment.h"
-
-namespace crown
-{
-
-static int int_setting_query_value(lua_State* L)
-{
-	LuaStack stack(L);
-
-	const char* setting_name = stack.get_string(1);
-
-	IntSetting* setting = IntSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		stack.push_int32(setting->value());
-	}
-	else
-	{
-		stack.push_int32(0);
-	}
-
-	return 1;
-}
-
-static int int_setting_query_synopsis(lua_State* L)
-{
-	LuaStack stack(L);
-
-	const char* setting_name = stack.get_string(1);
-
-	IntSetting* setting = IntSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		stack.push_string(setting->synopsis());
-	}
-	else
-	{
-		stack.push_string("");
-	}
-
-	return 1;
-}
-
-static int int_setting_query_min(lua_State* L)
-{
-	LuaStack stack(L);
-
-	const char* setting_name = stack.get_string(1);
-
-	IntSetting* setting = IntSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		stack.push_int32(setting->min());
-	}
-	else
-	{
-		stack.push_int32(0);
-	}
-
-	return 1;
-}
-
-static int int_setting_query_max(lua_State* L)
-{
-	LuaStack stack(L);
-
-	const char* setting_name = stack.get_string(1);
-
-	IntSetting* setting = IntSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		stack.push_int32(setting->max());
-	}
-	else
-	{
-		stack.push_int32(0);
-	}
-
-	return 1;
-}
-
-static int int_setting_update(lua_State* L)
-{
-	LuaStack stack(L);
-
-	const char* setting_name = stack.get_string(1);
-	const int32_t setting_value = stack.get_int(2);
-
-	IntSetting* setting = IntSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		(*setting) = setting_value;
-	}
-
-	return 0;
-}
-
-void load_int_setting(LuaEnvironment& env)
-{
-	env.load_module_function("IntSetting", "value",    int_setting_query_value);
-	env.load_module_function("IntSetting", "synopsis", int_setting_query_synopsis);
-	env.load_module_function("IntSetting", "min",      int_setting_query_min);
-	env.load_module_function("IntSetting", "max",      int_setting_query_max);
-	env.load_module_function("IntSetting", "update",   int_setting_update);
-}
-
-} // namespace crown

src/lua/lua_settings.cpp

@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 2012-2015 Daniele Bartolini and individual contributors.
+ * License: https://github.com/taylor001/crown/blob/master/LICENSE
+ */
+
+#include "int_setting.h"
+#include "float_setting.h"
+#include "string_setting.h"
+#include "lua_stack.h"
+#include "lua_environment.h"
+
+namespace crown
+{
+
+static int int_setting_query_value(lua_State* L)
+{
+	LuaStack stack(L);
+
+	const char* setting_name = stack.get_string(1);
+
+	IntSetting* setting = IntSetting::find_setting(setting_name);
+
+	if (setting != NULL)
+	{
+		stack.push_int32(setting->value());
+	}
+	else
+	{
+		stack.push_int32(0);
+	}
+
+	return 1;
+}
+
+static int int_setting_query_synopsis(lua_State* L)
+{
+	LuaStack stack(L);
+
+	const char* setting_name = stack.get_string(1);
+
+	IntSetting* setting = IntSetting::find_setting(setting_name);
+
+	if (setting != NULL)
+	{
+		stack.push_string(setting->synopsis());
+	}
+	else
+	{
+		stack.push_string("");
+	}
+
+	return 1;
+}
+
+static int int_setting_query_min(lua_State* L)
+{
+	LuaStack stack(L);
+
+	const char* setting_name = stack.get_string(1);
+
+	IntSetting* setting = IntSetting::find_setting(setting_name);
+
+	if (setting != NULL)
+	{
+		stack.push_int32(setting->min());
+	}
+	else
+	{
+		stack.push_int32(0);
+	}
+
+	return 1;
+}
+
+static int int_setting_query_max(lua_State* L)
+{
+	LuaStack stack(L);
+
+	const char* setting_name = stack.get_string(1);
+
+	IntSetting* setting = IntSetting::find_setting(setting_name);
+
+	if (setting != NULL)
+	{
+		stack.push_int32(setting->max());
+	}
+	else
+	{
+		stack.push_int32(0);
+	}
+
+	return 1;
+}
+
+static int int_setting_update(lua_State* L)
+{
+	LuaStack stack(L);
+
+	const char* setting_name = stack.get_string(1);
+	const int32_t setting_value = stack.get_int(2);
+
+	IntSetting* setting = IntSetting::find_setting(setting_name);
+
+	if (setting != NULL)
+	{
+		(*setting) = setting_value;
+	}
+
+	return 0;
+}
+
+static int float_setting_value(lua_State* L)
+{
+	LuaStack stack(L);
+
+	const char* setting_name = stack.get_string(1);
+
+	FloatSetting* setting = FloatSetting::find_setting(setting_name);
+
+	if (setting != NULL)
+	{
+		stack.push_float(setting->value());
+	}
+	else
+	{
+		stack.push_float(0.0f);
+	}
+
+	return 1;
+}
+
+static int float_setting_synopsis(lua_State* L)
+{
+	LuaStack stack(L);
+
+	const char* setting_name = stack.get_string(1);
+
+	FloatSetting* setting = FloatSetting::find_setting(setting_name);
+
+	if (setting != NULL)
+	{
+		stack.push_string(setting->synopsis());
+	}
+	else
+	{
+		stack.push_string("");
+	}
+
+	return 1;
+}
+
+static int float_setting_min(lua_State* L)
+{
+	LuaStack stack(L);
+
+	const char* setting_name = stack.get_string(1);
+
+	FloatSetting* setting = FloatSetting::find_setting(setting_name);
+
+	if (setting != NULL)
+	{
+		stack.push_float(setting->min());
+	}
+	else
+	{
+		stack.push_float(0);
+	}
+
+	return 1;
+}
+
+static int float_setting_max(lua_State* L)
+{
+	LuaStack stack(L);
+
+	const char* setting_name = stack.get_string(1);
+
+	FloatSetting* setting = FloatSetting::find_setting(setting_name);
+
+	if (setting != NULL)
+	{
+		stack.push_float(setting->max());
+	}
+	else
+	{
+		stack.push_float(0);
+	}
+
+	return 1;
+}
+
+static int float_setting_update(lua_State* L)
+{
+	LuaStack stack(L);
+
+	const char* setting_name = stack.get_string(1);
+	const float setting_value = stack.get_float(2);
+
+	FloatSetting* setting = FloatSetting::find_setting(setting_name);
+
+	if (setting != NULL)
+	{
+		(*setting) = setting_value;
+	}
+
+	return 0;
+}
+
+static int string_setting_value(lua_State* L)
+{
+	LuaStack stack(L);
+
+	const char* setting_name = stack.get_string(1);
+
+	StringSetting* setting = StringSetting::find_setting(setting_name);
+
+	if (setting != NULL)
+	{
+		stack.push_string(setting->value());
+	}
+	else
+	{
+		stack.push_string("");
+	}
+
+	return 1;
+}
+
+static int string_setting_synopsis(lua_State* L)
+{
+	LuaStack stack(L);
+
+	const char* setting_name = stack.get_string(1);
+
+	StringSetting* setting = StringSetting::find_setting(setting_name);
+
+	if (setting != NULL)
+	{
+		stack.push_string(setting->synopsis());
+	}
+	else
+	{
+		stack.push_string("");
+	}
+
+	return 1;
+}
+
+static int string_setting_update(lua_State* L)
+{
+	LuaStack stack(L);
+
+	const char* setting_name = stack.get_string(1);
+	const char* setting_value = stack.get_string(2);
+
+	StringSetting* setting = StringSetting::find_setting(setting_name);
+
+	if (setting != NULL)
+	{
+		(*setting) = setting_value;
+	}
+
+	return 0;
+}
+
+void load_settings(LuaEnvironment& env)
+{
+	env.load_module_function("IntSetting", "value",    int_setting_query_value);
+	env.load_module_function("IntSetting", "synopsis", int_setting_query_synopsis);
+	env.load_module_function("IntSetting", "min",      int_setting_query_min);
+	env.load_module_function("IntSetting", "max",      int_setting_query_max);
+	env.load_module_function("IntSetting", "update",   int_setting_update);
+
+	env.load_module_function("FloatSetting", "value",    float_setting_value);
+	env.load_module_function("FloatSetting", "synopsis", float_setting_synopsis);
+	env.load_module_function("FloatSetting", "min",      float_setting_min);
+	env.load_module_function("FloatSetting", "max",      float_setting_max);
+	env.load_module_function("FloatSetting", "update",   float_setting_update);
+
+	env.load_module_function("StringSetting", "value",    string_setting_value);
+	env.load_module_function("StringSetting", "synopsis", string_setting_synopsis);
+	env.load_module_function("StringSetting", "update",   string_setting_update);
+}
+
+} // namespace crown

src/lua/lua_string_setting.cpp

@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2012-2015 Daniele Bartolini and individual contributors.
- * License: https://github.com/taylor001/crown/blob/master/LICENSE
- */
-
-#include "string_setting.h"
-#include "lua_stack.h"
-#include "lua_environment.h"
-
-namespace crown
-{
-
-static int string_setting_value(lua_State* L)
-{
-	LuaStack stack(L);
-
-	const char* setting_name = stack.get_string(1);
-
-	StringSetting* setting = StringSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		stack.push_string(setting->value());
-	}
-	else
-	{
-		stack.push_string("");
-	}
-
-	return 1;
-}
-
-static int string_setting_synopsis(lua_State* L)
-{
-	LuaStack stack(L);
-
-	const char* setting_name = stack.get_string(1);
-
-	StringSetting* setting = StringSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		stack.push_string(setting->synopsis());
-	}
-	else
-	{
-		stack.push_string("");
-	}
-
-	return 1;
-}
-
-static int string_setting_update(lua_State* L)
-{
-	LuaStack stack(L);
-
-	const char* setting_name = stack.get_string(1);
-	const char* setting_value = stack.get_string(2);
-
-	StringSetting* setting = StringSetting::find_setting(setting_name);
-
-	if (setting != NULL)
-	{
-		(*setting) = setting_value;
-	}
-
-	return 0;
-}
-
-void load_string_setting(LuaEnvironment& env)
-{
-	env.load_module_function("StringSetting", "value",    string_setting_value);
-	env.load_module_function("StringSetting", "synopsis", string_setting_synopsis);
-	env.load_module_function("StringSetting", "update",   string_setting_update);
-}
-
-} // namespace crown