reflexion 0.4.1 → 0.5.0

data/src/sdl/opengl.cpp

@@ -1,6 +1,7 @@
 #include "opengl.h"
 
 
+#include <rays/rays.h>
 #include "reflex/exception.h"
 
 
@@ -27,9 +28,14 @@ namespace Reflex
 			invalid_state_error(__FILE__, __LINE__);
 
 		window  = win;
-		context = SDL_GL_CreateContext(win);
-		if (!context)
-			reflex_error(__FILE__, __LINE__, SDL_GetError());
+		context = (SDL_GLContext) Rays::get_offscreen_context();
+		if (!context)// wasm build returns NULL
+		{
+			context = SDL_GL_CreateContext(win);
+			if (!context)
+				reflex_error(__FILE__, __LINE__, SDL_GetError());
+			owner   = true;
+		}
 
 		make_current();
 	}
@@ -37,15 +43,17 @@ namespace Reflex
 	void
 	OpenGLContext::fin ()
 	{
-		if (!*this) return;
-
-		if (context)
+		if (owner && context)
 		{
+			if (context == SDL_GL_GetCurrentContext())
+				SDL_GL_MakeCurrent(NULL, NULL);
+
 			SDL_GL_DeleteContext(context);
-			context = NULL;
 		}
 
-		window = NULL;
+		window  = NULL;
+		context = NULL;
+		owner   = false;
 	}
 
 	void
@@ -65,12 +73,6 @@ namespace Reflex
 		SDL_GL_SwapWindow(window);
 	}
 
-	bool
-	OpenGLContext::is_active () const
-	{
-		return *this && context == SDL_GL_GetCurrentContext();
-	}
-
 	OpenGLContext::operator bool () const
 	{
 		return window && context;

data/src/sdl/opengl.h

@@ -28,8 +28,6 @@ namespace Reflex
 
 			void swap_buffers ();
 
-			bool is_active () const;
-
 			operator bool () const;
 
 			bool operator ! () const;
@@ -40,6 +38,8 @@ namespace Reflex
 
 			SDL_GLContext context = NULL;
 
+			bool owner            = false;
+
 	};// OpenGLContext
 
 

data/src/sdl/window.cpp

@@ -22,6 +22,8 @@ namespace Reflex
 
 		SDL_Window* native = NULL;
 
+		bool need_rebind   = false;
+
 		OpenGLContext context;
 
 		mutable String title_tmp;
@@ -47,6 +49,21 @@ namespace Reflex
 
 			context.init(native);
 
+			// Reflex::Window is not fully constructed yet,
+			// so cannot call ClassWrapper::retain().
+			win->Xot::template RefCountable<>::retain();
+		}
+
+		void rebind (Window* win)
+		{
+			if (!need_rebind) return;
+
+			// deferred call of ClassWrapper::retain().
+			win->retain();
+
+			win->Xot::template RefCountable<>::release();
+			need_rebind = false;
+
 			Window_register(win);
 		}
 
@@ -54,15 +71,21 @@ namespace Reflex
 		{
 			if (!native) return;
 
-			context.fin();
-
 			Window* win = Window_from(native);
-			if (win) Window_unregister(win);
+			if (win)
+			{
+				rebind(win);
+				Window_unregister(win);
+			}
+
+			context.fin();
 
 			SDL_SetWindowData(native, WINDOW_DATA_KEY, NULL);
 			SDL_DestroyWindow(native);
 			native = NULL;
 
+			if (win) win->release();
+
 			if (Window_all().empty())
 				Reflex::app()->quit();
 		}
@@ -181,7 +204,11 @@ namespace Reflex
 	void
 	Window_initialize (Window* win)
 	{
-		get_data(win)->create(win);
+		WindowData* self = get_data(win);
+
+		self->create(win);
+
+		self->need_rebind = true;
 	}
 
 	void
@@ -322,6 +349,8 @@ namespace Reflex
 	{
 		WindowData* self = get_data(win);
 
+		self->rebind(win);
+
 		switch (event.type)
 		{
 			case SDL_WINDOWEVENT:
@@ -329,7 +358,7 @@ namespace Reflex
 				switch (event.window.event)
 				{
 					case SDL_WINDOWEVENT_CLOSE:
-						Window_close(win);
+						win->close();
 						break;
 
 					case SDL_WINDOWEVENT_EXPOSED:

data/src/shape.cpp

@@ -2,12 +2,8 @@
 
 
 #include <assert.h>
-#include <box2d/b2_body.h>
-#include <box2d/b2_fixture.h>
-#include <box2d/b2_circle_shape.h>
-#include <box2d/b2_edge_shape.h>
-#include <box2d/b2_chain_shape.h>
-#include <box2d/b2_polygon_shape.h>
+#include <box2d/box2d.h>
+#include <box2d/collision.h>
 #include <rays/polygon.h>
 #include "reflex/exception.h"
 #include "reflex/debug.h"
@@ -105,23 +101,25 @@ namespace Reflex
 
 		public:
 
-			FixtureBuilder (Shape* shape, const b2Shape* head = NULL)
+			FixtureBuilder (Shape* shape)
 			:	shape(shape), head(NULL), tail(NULL)
 			{
 				assert(shape);
-
-				if (head) add(head);
 			}
 
-			void add (const b2Shape* b2shape)
+			void add (const b2Circle& b2circle)
 			{
-				assert(b2shape);
+				append(new Fixture(get_body(), b2circle, shape));
+			}
 
-				Body* body = View_get_body(shape->owner());
-				if (!body)
-					invalid_state_error(__FILE__, __LINE__);
+			void add (const b2Polygon& b2polygon)
+			{
+				append(new Fixture(get_body(), b2polygon, shape));
+			}
 
-				append(new Fixture(body, b2shape, shape));
+			void add (const b2Vec2* points, size_t size, bool loop)
+			{
+				append(new Fixture(get_body(), points, size, loop, shape));
 			}
 
 			Fixture* fixtures () const
@@ -135,6 +133,15 @@ namespace Reflex
 
 			Fixture *head, *tail;
 
+			Body* get_body ()
+			{
+				Body* body = View_get_body(shape->owner());
+				if (!body)
+					invalid_state_error(__FILE__, __LINE__);
+
+				return body;
+			}
+
 			void append (Fixture* fixture)
 			{
 				if (!fixture) return;
@@ -159,8 +166,11 @@ namespace Reflex
 	{
 		assert(shape);
 
-		b2CircleShape b2shape;
-		return FixtureBuilder(shape, &b2shape).fixtures();
+		b2Circle b2shape = {{0, 0}, 0};
+
+		FixtureBuilder builder(shape);
+		builder.add(b2shape);
+		return builder.fixtures();
 	}
 
 	static Fixture*
@@ -185,12 +195,11 @@ namespace Reflex
 		FixtureBuilder builder(shape);
 		for (size_t i = 0; i < b2points.size(); i += 3)
 		{
-			b2PolygonShape b2shape;
-			b2shape.Set(&b2points[i], 3);
-			if (b2shape.m_count != 3)
+			b2Hull hull = b2ComputeHull(&b2points[i], 3);
+			if (hull.count != 3)
 				continue;// skip too small triangle
 
-			builder.add(&b2shape);
+			builder.add(b2MakePolygon(&hull, 0));
 		}
 
 		return builder.fixtures();
@@ -203,24 +212,15 @@ namespace Reflex
 	{
 		assert(builder && buffer);
 
+		if (polyline.size() < 2)
+			return;
+
 		buffer->clear();
 		buffer->reserve(polyline.size());
 		for (const auto& point : polyline)
 			buffer->emplace_back(to_b2vec2(point, ppm));
 
-		b2ChainShape b2shape;
-		if (polyline.loop())
-			b2shape.CreateLoop(&(*buffer)[0], (int32) buffer->size());
-		else
-		{
-			b2shape.CreateChain(
-				&(*buffer)[0],
-				(int32) buffer->size(),
-				(*buffer)[0],
-				(*buffer)[buffer->size() - 1]);
-		}
-
-		builder->add(&b2shape);
+		builder->add(buffer->data(), buffer->size(), polyline.loop());
 	}
 
 	static Fixture*
@@ -816,20 +816,22 @@ namespace Reflex
 				invalid_state_error(__FILE__, __LINE__);
 
 			float ppm = owner->meter2pixel();
-			coord l   = to_b2coord(frame.x,           ppm);
-			coord t   = to_b2coord(frame.y,           ppm);
-			coord r   = to_b2coord(frame.x + frame.w, ppm);
-			coord b   = to_b2coord(frame.x + frame.h, ppm);
+			float l   = to_b2coord(frame.x,           ppm);
+			float t   = to_b2coord(frame.y,           ppm);
+			float r   = to_b2coord(frame.x + frame.w, ppm);
+			float b   = to_b2coord(frame.y + frame.h, ppm);
 			b2Vec2 b2points[] = {{l, t}, {l, b}, {r, b}, {r, t}};
 
-			b2PolygonShape b2shape;
-			b2shape.Set(&b2points[0], 4);
+			b2Hull hull = b2ComputeHull(&b2points[0], 4);
+			if (hull.count < 3)
+				return NULL;
 
-			return FixtureBuilder(shape, &b2shape).fixtures();
+			FixtureBuilder builder(shape);
+			builder.add(b2MakePolygon(&hull, 0));
+			return builder.fixtures();
 		}
 
-		Fixture* create_rect_fixture_without_division (
-			Shape* shape, const Bounds& frame)
+		Fixture* create_rect_fixture_without_division (Shape* shape, const Bounds& frame)
 		{
 			assert(shape);
 
@@ -845,16 +847,19 @@ namespace Reflex
 
 			float ppm                = owner->meter2pixel();
 			const Polyline& polyline = polygon[0];
-			assert(polyline[0].size() <= 8);
+			assert(polyline.size() <= 8);
 
 			b2Vec2 b2points[8];
 			for (size_t i = 0; i < polyline.size(); ++i)
 				b2points[i] = to_b2vec2(polyline[i], ppm);
 
-			b2PolygonShape b2shape;
-			b2shape.Set(&b2points[0], (int32) polyline.size());
+			b2Hull hull = b2ComputeHull(&b2points[0], (int32_t) polyline.size());
+			if (hull.count < 3)
+				return NULL;
 
-			return FixtureBuilder(shape, &b2shape).fixtures();
+			FixtureBuilder builder(shape);
+			builder.add(b2MakePolygon(&hull, 0));
+			return builder.fixtures();
 		}
 
 		Polygon get_polygon_for_shape () const override
@@ -1049,11 +1054,13 @@ namespace Reflex
 
 			float ppm = owner->meter2pixel();
 
-			b2CircleShape b2shape;
-			b2shape.m_p      = to_b2vec2(frame.center(), ppm);
-			b2shape.m_radius = to_b2coord(frame.width / 2, ppm);
+			b2Circle b2shape;
+			b2shape.center = to_b2vec2(frame.center(), ppm);
+			b2shape.radius = to_b2coord(frame.width / 2, ppm);
 
-			return FixtureBuilder(shape, &b2shape).fixtures();
+			FixtureBuilder builder(shape);
+			builder.add(b2shape);
+			return builder.fixtures();
 		}
 
 		Polygon get_polygon_for_shape () const override

data/src/shape.h

@@ -8,9 +8,6 @@
 #include "reflex/shape.h"
 
 
-class b2Shape;
-
-
 namespace Reflex
 {
 

data/src/timer.cpp

@@ -16,20 +16,17 @@ namespace Reflex
 	struct Timer::Data
 	{
 
-		View* owner;
+		Xot::WeakRef<View> owner;
 
-		int id, count;
+		int id           = ID_INVALID;
 
-		float interval;
+		int count        = 1;
 
-		double next_time;
+		float interval   = -1;
 
-		SelectorPtr pselector;
+		double next_time = -1;
 
-		Data ()
-		:	owner(NULL), id(ID_INVALID), count(1), interval(-1), next_time(-1)
-		{
-		}
+		SelectorPtr pselector;
 
 		Selector& selector ()
 		{
@@ -66,6 +63,7 @@ namespace Reflex
 	void
 	Timer::fire ()
 	{
+		if (!self->owner) return;
 		if (!*this)
 			invalid_state_error(__FILE__, __LINE__);
 
@@ -82,7 +80,7 @@ namespace Reflex
 	View*
 	Timer::owner () const
 	{
-		return self->owner;
+		return self->owner.get();
 	}
 
 	int

data/src/view.cpp

@@ -318,6 +318,7 @@ namespace Reflex
 			clear_walls(view);
 
 			View* wall = new View(WALL_NAME);
+			wall->set_shape(NULL);
 			wall->add_shape(new WallShape(WallShape::ALL));
 			wall->set_static();
 
@@ -1890,11 +1891,9 @@ namespace Reflex
 	void
 	View::clear_children ()
 	{
-		auto* children = self->children();
-		if (!children || children->empty()) return;
-
-		for (auto& child : *children)
-			remove_child(child);
+		const auto& children = self->pchildren;
+		while (children && !children->empty())
+			remove_child(children->back());
 	}
 
 	View::ChildList

data/src/win32/opengl.cpp

@@ -1,9 +1,18 @@
 #include "opengl.h"
 
 
+#include <rays/rays.h>
 #include "reflex/exception.h"
 
 
+namespace Rays
+{
+
+	const PIXELFORMATDESCRIPTOR* get_pixel_format_descriptor ();
+
+}// Rays
+
+
 namespace Reflex
 {
 
@@ -31,22 +40,15 @@ namespace Reflex
 		if (!hdc)
 			system_error(__FILE__, __LINE__);
 
-		static const PIXELFORMATDESCRIPTOR PFD =
-		{
-			sizeof(PIXELFORMATDESCRIPTOR), 1,
-			PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER,
-			PFD_TYPE_RGBA, 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16, 0, 0,
-			PFD_MAIN_PLANE, 0, 0, 0, 0
-		};
-
-		int pf = ChoosePixelFormat(hdc, &PFD);
+		const auto* pfd = Rays::get_pixel_format_descriptor();
+		int pf          = ChoosePixelFormat(hdc, pfd);
 		if (pf == 0)
 			system_error(__FILE__, __LINE__);
 
-		if (!SetPixelFormat(hdc, pf, &PFD))
+		if (!SetPixelFormat(hdc, pf, pfd))
 			system_error(__FILE__, __LINE__);
 
-		hrc = wglCreateContext(hdc);
+		hrc = (HGLRC) Rays::get_offscreen_context();
 		if (!hrc)
 			system_error(__FILE__, __LINE__);
 
@@ -56,31 +58,12 @@ namespace Reflex
 	void
 	OpenGLContext::fin ()
 	{
-		if (!*this) return;
-
-		if (hrc)
-		{
-			if (hrc == wglGetCurrentContext())
-			{
-				if (!wglMakeCurrent(NULL, NULL))
-					system_error(__FILE__, __LINE__);
-			}
-
-			if (!wglDeleteContext(hrc))
-				system_error(__FILE__, __LINE__);
-
-			hrc = NULL;
-		}
-
-		if (hdc)
-		{
-			if (!ReleaseDC(hwnd, hdc))
-				system_error(__FILE__, __LINE__);
-
-			hdc = NULL;
-		}
+		if (hdc && !ReleaseDC(hwnd, hdc))
+			system_error(__FILE__, __LINE__);
 
 		hwnd = NULL;
+		hdc  = NULL;
+		hrc  = NULL;
 	}
 
 	void
@@ -101,12 +84,6 @@ namespace Reflex
 			system_error(__FILE__, __LINE__);
 	}
 
-	bool
-	OpenGLContext::is_active () const
-	{
-		return *this && hrc == wglGetCurrentContext();
-	}
-
 	OpenGLContext::operator bool () const
 	{
 		return hwnd && hdc && hrc;

data/src/win32/opengl.h

@@ -29,8 +29,6 @@ namespace Reflex
 
 			void swap_buffers ();
 
-			bool is_active () const;
-
 			operator bool () const;
 
 			bool operator ! () const;

data/src/win32/window.cpp

@@ -32,7 +32,9 @@ namespace Reflex
 	struct WindowData : public Window::Data
 	{
 
-		HWND hwnd = NULL;
+		HWND hwnd        = NULL;
+
+		bool need_rebind = false;
 
 		OpenGLContext context;
 
@@ -118,7 +120,25 @@ namespace Reflex
 
 		self->hwnd = hwnd;
 		self->context.init(hwnd);
+
+		// Reflex::Window is not fully constructed yet,
+		// so cannot call ClassWrapper::retain().
+		win->Xot::template RefCountable<>::retain();
+	}
+
+	static inline void
+	rebind (Window* win)
+	{
+		WindowData* self = get_data(win);
+		if (!self->need_rebind) return;
+
+		// deferred call of ClassWrapper::retain().
 		win->retain();
+
+		win->Xot::template RefCountable<>::release();
+		self->need_rebind = false;
+
+		Window_register(win);
 	}
 
 	static void
@@ -127,6 +147,9 @@ namespace Reflex
 		if (!*win)
 			Xot::invalid_state_error(__FILE__, __LINE__);
 
+		rebind(win);
+		Window_unregister(win);
+
 		WindowData* self = get_data(win);
 
 		if (window_has_wndproc(self->hwnd))
@@ -142,12 +165,13 @@ namespace Reflex
 				system_error(__FILE__, __LINE__);
 		}
 
-		if (self->context.is_active())
-			Rays::activate_offscreen_context();
-
 		self->context.fin();
 		self->hwnd = NULL;
+
 		win->release();
+
+		if (Window_all().empty())
+			Reflex::app()->quit();
 	}
 
 	void
@@ -456,25 +480,16 @@ namespace Reflex
 			CREATESTRUCT* cs = (CREATESTRUCT*) lp;
 			win = (Window*) cs->lpCreateParams;
 			setup_window(win, hwnd);
-
-			Window_register(win);
 		}
 
-		if (!win)
-			win = get_window_from_hwnd(hwnd);
+		if (!win) win = get_window_from_hwnd(hwnd);
+		if  (win) rebind(win);
 
 		LRESULT ret = window_proc(win, hwnd, msg, wp, lp);
 
 		if (msg == WM_NCDESTROY)
-		{
-			Window_unregister(win);
-
 			cleanup_window(win);
 
-			if (Window_all().empty())
-				Reflex::app()->quit();
-		}
-
 		return ret;
 	}
 
@@ -546,6 +561,8 @@ namespace Reflex
 	Window_initialize (Window* window)
 	{
 		create_window(window);
+
+		get_data(window)->need_rebind = true;
 	}
 
 	void

data/src/window.cpp

@@ -787,7 +787,6 @@ namespace Reflex
 		if (!force && e.is_blocked()) return;
 
 		View_set_window(self->root.get(), NULL);
-		self->root.reset();
 
 		Window_close(this);
 	}