Move g2d controls to own plugin

libs/cgv_g2d/control_manager.cxx

@@ -9,12 +9,6 @@ namespace g2d {
 
 
 
-
-
-
-
-
-
 void input_cb(control_base* control, void* input_ptr) {
 	gl_string_control* control_ptr = static_cast<gl_string_control*>(static_cast<cgv::base::base*>(input_ptr));
 	control_ptr->in_callback = true;
@@ -75,21 +69,6 @@ value_input_control::value_input_control(const std::string& label, irect rectang
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-control_manager::control_manager() {
-
-}
-
 bool control_manager::init(context& ctx) {
 
 	ref_msdf_gl_canvas_font_renderer(ctx, 1);

libs/cgv_g2d/control_manager.h

@@ -1469,8 +1469,6 @@ class CGV_API control_manager : cgv::gui::theme_observer {
 	void handle_theme_change(const cgv::gui::theme_info& theme) override;
 
 public:
-	control_manager();
-
 	bool init(cgv::render::context& ctx);
 
 	void destruct(cgv::render::context& ctx);
@@ -1521,13 +1519,14 @@ class CGV_API control_manager : cgv::gui::theme_observer {
 	*/
 
 
-	//template <class B>
-	std::shared_ptr<slider_control> add_slider_control(cgv::base::base* base_ptr, const std::string& label, float* value_ptr, cgv::render::ivec2 position) {
-		auto gl_control_ptr = new gl_value_control<cgv::type::flt32_type, /* B */slider_control>(
-			label, *static_cast<cgv::type::flt32_type*>(value_ptr), irect(position, default_control_size)
+
+
+	std::shared_ptr<input_control> add_string_control(cgv::base::base* base_ptr, const std::string& label, std::string* value_ptr, cgv::render::ivec2 position) {
+		auto gl_control_ptr = new gl_string_control(
+			label, *value_ptr, irect(position, default_control_size)
 		);
 
-		data::ref_ptr<cgv::gui::control<float>> control_ptr = gl_control_ptr;
+		data::ref_ptr<cgv::gui::control<std::string>> control_ptr = gl_control_ptr;
 
 		if(control_ptr)
 			connect_copy(control_ptr->value_change, cgv::signal::rebind(base_ptr, &cgv::base::base::on_set, value_ptr));
@@ -1540,12 +1539,14 @@ class CGV_API control_manager : cgv::gui::theme_observer {
 		return control_view_ptr;
 	}
 
-	std::shared_ptr<input_control> add_string_control(cgv::base::base* base_ptr, const std::string& label, std::string* value_ptr, cgv::render::ivec2 position) {
-		auto gl_control_ptr = new gl_string_control(
-			label, *value_ptr, irect(position, default_control_size)
+
+	//template <class B>
+	std::shared_ptr<slider_control> add_slider_control(cgv::base::base* base_ptr, const std::string& label, float* value_ptr, cgv::render::ivec2 position) {
+		auto gl_control_ptr = new gl_value_control<cgv::type::flt32_type, /* B */slider_control>(
+			label, *static_cast<cgv::type::flt32_type*>(value_ptr), irect(position, default_control_size)
 		);
 
-		data::ref_ptr<cgv::gui::control<std::string>> control_ptr = gl_control_ptr;
+		data::ref_ptr<cgv::gui::control<float>> control_ptr = gl_control_ptr;
 
 		if(control_ptr)
 			connect_copy(control_ptr->value_change, cgv::signal::rebind(base_ptr, &cgv::base::base::on_set, value_ptr));
@@ -1575,6 +1576,9 @@ class CGV_API control_manager : cgv::gui::theme_observer {
 		controls.push_back(control_view_ptr);
 		return control_view_ptr;
 	}
+
+
+
 };
 
 }

plugins/cg_g2d/CMakeLists.txt

@@ -0,0 +1,18 @@
+
+file(GLOB_RECURSE SOURCES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.cxx")
+file(GLOB_RECURSE HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h")
+
+cgv_add_target(cg_g2d
+	TYPE plugin NO_EXECUTABLE
+	SOURCES ${SOURCES}
+	HEADERS ${HEADERS}
+	DEPENDENCIES
+		cgv_g2d cgv_gl cgv_gui cgv_render cgv_media cgv_utils cgv_os cgv_base
+		cgv_data cgv_type cgv_signal cgv_reflect
+
+	OVERRIDE_SHARED_EXPORT_DEFINE "CG_G2D_EXPORTS;CGV_GUI_G2D_EXPORTS"
+	OVERRIDE_FORCE_STATIC_DEFINE  CGV_GUI_G2D_FORCE_STATIC
+)
+
+install(TARGETS cg_g2d EXPORT cgv_plugins DESTINATION ${CGV_BIN_DEST})
+install(TARGETS cg_g2d_static EXPORT cgv_plugins DESTINATION ${CGV_BIN_DEST})

plugins/cg_g2d/cg_g2d.pj

@@ -0,0 +1,8 @@
+@=
+projectType="plugin";
+projectName="cg_g2d";
+projectGUID="D008EC3A-0C5B-46A8-A3CA-B28268E2A7C2";
+addIncDirs=[CGV_DIR."/libs"];
+addProjectDirs=[CGV_DIR."/libs/cgv_gl"];
+addProjectDeps=["cgv_gui","cgv_render", "cgv_media", "cgv_utils", "cgv_os","cgv_base","cgv_data", "cgv_type","cgv_signal", "cgv_reflect", "cgv_gl", "cgv_g2d"];
+addSharedDefines=["CGV_GUI_G2D_EXPORTS"];

plugins/cg_g2d/control_base.h

@@ -0,0 +1,53 @@
+#pragma once
+
+#include <cgv/gui/event.h>
+#include <cgv/gui/key_event.h>
+#include <cgv/gui/mouse_event.h>
+#include <cgv/render/render_types.h>
+#include <cgv_g2d/canvas.h>
+#include <cgv_g2d/rect.h>
+
+#include "styles.h"
+
+namespace cg {
+namespace g2d {
+
+class control_base {
+private:
+	typedef std::function<void(control_base*, void*)> callback_t;
+	callback_t _callback;
+	void* _user_data = nullptr;
+
+protected:
+	std::string label;
+	cgv::g2d::irect rectangle;
+
+public:
+	control_base(const std::string& label, cgv::g2d::irect rectangle) : label(label), rectangle(rectangle) {}
+
+	virtual ~control_base() {}
+
+	void set_label(const std::string& label) {
+		this->label = label;
+	}
+
+	virtual void update() = 0;
+
+	void callback(callback_t c, void* p) {
+		_callback = c;
+		_user_data = p;
+	}
+
+	void do_callback() {
+		if(_callback)
+			_callback(this, _user_data);
+	}
+
+	virtual bool handle_key_event(cgv::gui::key_event& e) { return false; }
+	virtual bool handle_mouse_event(cgv::gui::mouse_event& e, cgv::render::ivec2 mouse_position) { return false; }
+
+	virtual void draw(cgv::render::context& ctx, cgv::g2d::canvas& cnvs, const styles& style) {}
+};
+
+}
+}

plugins/cg_g2d/control_manager.cxx

@@ -0,0 +1,101 @@
+#include "control_manager.h"
+
+//#include <cgv_g2d/utils2d.h>
+
+#include <cgv_g2d/msdf_font.h>
+#include <cgv_g2d/msdf_gl_canvas_font_renderer.h>
+
+using namespace cgv::render;
+
+namespace cg {
+namespace g2d {
+
+bool control_manager::init(context& ctx) {
+
+	cgv::g2d::ref_msdf_gl_canvas_font_renderer(ctx, 1);
+	cgv::g2d::ref_msdf_font_regular(ctx, 1);
+
+	//shaders.add("rectangle", shaders::rectangle);
+	//shaders.add("line", shaders::line, { { "MODE", "0" } });
+	//bool success = shaders.load_all(ctx, "control_manager::init()");
+
+	//success &= label_texts.init(ctx);
+	//success &= value_texts.init(ctx);
+
+	init_styles();
+
+	return true;// success;
+}
+
+void control_manager::destruct(context& ctx) {
+
+	cgv::g2d::ref_msdf_gl_canvas_font_renderer(ctx, -1);
+	cgv::g2d::ref_msdf_font_regular(ctx, -1);
+
+	//shaders.clear(ctx);
+}
+
+void control_manager::clear() {
+
+	controls.clear();
+	g2d_controls.clear();
+}
+
+bool control_manager::handle(cgv::gui::event& e, const ivec2& viewport_size, const cgv::g2d::irect& container) {
+
+	unsigned et = e.get_kind();
+
+	if(et == cgv::gui::EID_KEY) {
+		cgv::gui::key_event& ke = dynamic_cast<cgv::gui::key_event&>(e);
+
+		for(auto& control : g2d_controls) {
+			if(control->handle_key_event(ke))
+				return true;
+		}
+	} else if(et == cgv::gui::EID_MOUSE) {
+		cgv::gui::mouse_event& me = dynamic_cast<cgv::gui::mouse_event&>(e);
+		ivec2 mouse_position = get_local_mouse_pos(ivec2(me.get_x(), me.get_y()), viewport_size, container);
+
+		for(auto& control : g2d_controls) {
+			if(control->handle_mouse_event(me, mouse_position))
+				return true;
+		}
+	}
+
+	return false;
+}
+
+void control_manager::draw(context& ctx, cgv::g2d::canvas& cnvs) {
+
+	for(auto& control : g2d_controls)
+		control->draw(ctx, cnvs, style);
+}
+
+void control_manager::init_styles() {
+
+	auto& ti = cgv::gui::theme_info::instance();
+
+	style.control_box.use_fill_color = true;
+	style.control_box.fill_color = ti.control();
+	style.control_box.feather_width = 1.0f;
+	//style.control_box.border_radius = 5.0f;
+	//style.control_box.use_blending = true;
+
+	style.text = cgv::g2d::text2d_style::preset_default(ti.text());
+	style.text.font_size = 12.0f;
+
+	style.colored_box = style.control_box;
+	style.colored_box.use_fill_color = false;
+
+	style.control_color = ti.control();
+	style.background_color = ti.background();
+	style.shadow_color = ti.shadow();
+}
+
+void control_manager::handle_theme_change(const cgv::gui::theme_info& theme) {
+
+	init_styles();
+}
+
+}
+}