Cleanup.

examples/23-vectordisplay/vectordisplay.cpp

@@ -1,26 +1,22 @@
-
 /*
  * Copyright 2014 Kai Jourdan. All rights reserved.
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  *
- * based on code from  Brian Luczkiewicz
+ * Based on code from Brian Luczkiewicz
  * https://github.com/blucz/Vector
  *
- * uses the SIMPLEX-Font which is a variant of the Hershey font (public domain)
+ * Uses the SIMPLEX-Font which is a variant of the Hershey font (public domain)
  * http://paulbourke.net/dataformats/hershey/
  */
 
-#include "vectordisplay.h"
-
-#include "bgfx_utils.h"
-
-#include <math.h>
-#include <float.h>
-#include <malloc.h>
-#include <assert.h>
+#include <float.h>  // FLT_EPSILON
+#include <alloca.h> // alloca
 
 #include <bx/fpumath.h>
 
+#include "vectordisplay.h"
+#include "bgfx_utils.h"
+
 //Config stuff
 const int MAX_NUMBER_VERTICES = 20000;
 
@@ -74,16 +70,16 @@ void VectorDisplay::setup(uint16_t _width, uint16_t _height, int _view)
 	m_decayValue = DEFAULT_DECAY_VALUE;
 	setDrawColor(1.0f, 1.0f, 1.0f, 1.0f);
 
-	m_screenWidth = _width;
+	m_screenWidth  = _width;
 	m_screenHeight = _height;
-	m_glowWidth = m_screenWidth / 3;
-	m_glowHeight = m_screenHeight / 3;
+	m_glowWidth    = m_screenWidth / 3;
+	m_glowHeight   = m_screenHeight / 3;
 	m_initialDecay = DEFAULT_INITIAL_DECAY;
 
 	m_drawOffsetX = DEFAULT_DRAW_OFFSET_X;
 	m_drawOffsetY = DEFAULT_DRAW_OFFSET_Y;
-	m_drawScale = DEFAULT_DRAW_SCALE;
-	m_brightness = DEFAULT_BRIGHTNESS;
+	m_drawScale   = DEFAULT_DRAW_SCALE;
+	m_brightness  = DEFAULT_BRIGHTNESS;
 
 	m_currentDrawStep = 0;
 
@@ -160,7 +156,7 @@ void VectorDisplay::endFrame()
 	// advance step
 	m_currentDrawStep = (m_currentDrawStep + 1) % m_numberDecaySteps;
 
-	assert(m_points.size() < MAX_NUMBER_VERTICES);
+	BX_CHECK(m_points.size() < MAX_NUMBER_VERTICES, "");
 
 	bgfx::updateDynamicVertexBuffer(m_vertexBuffers[m_currentDrawStep]
 		, bgfx::copy(m_points.data(), (uint32_t)m_points.size() * sizeof(point_t) )
@@ -315,10 +311,7 @@ void VectorDisplay::endFrame()
 
 void VectorDisplay::beginDraw(float _x, float _y)
 {
-	if (m_pendingPoints.size() != 0)
-	{
-		assert(!"begin draw on already filled buffer!");
-	}
+	BX_CHECK(0 == m_pendingPoints.size(), "Begin draw on already filled buffer!");
 
 	pending_point_t point;
 	point.x = _x * m_drawScale + m_drawOffsetX;
@@ -1470,10 +1463,6 @@ static int simplex[95][112] =
 	  -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }
 };
 
-//void VectorDisplay::simplexMeasure(float _scale, const char *_string, float *_outWidth, float *_outHeight) {
-//not implemented :/
-//}
-
 void VectorDisplay::drawSimplexFont(float _x, float _y, float _scale, const char* _string)
 {
 	for (;;)
@@ -1485,7 +1474,7 @@ void VectorDisplay::drawSimplexFont(float _x, float _y, float _scale, const char
 		}
 
 		if (c < 32
-		   || c > 126)
+		||  c > 126)
 		{
 			continue;
 		}

examples/23-vectordisplay/vectordisplay.h

@@ -1,17 +1,16 @@
-
 /*
  * Copyright 2014 Kai Jourdan. All rights reserved.
  * License: http://www.opensource.org/licenses/BSD-2-Clause
  *
- * based on code from  Brian Luczkiewicz
+ * Based on code from Brian Luczkiewicz
  * https://github.com/blucz/Vector
  *
- * uses the SIMPLEX-Font which is a variant of the Hershey font (public domain)
+ * Uses the SIMPLEX-Font which is a variant of the Hershey font (public domain)
  * http://paulbourke.net/dataformats/hershey/
  */
 
-#ifndef __BGFX_VECTORDISPLAY_H__
-#define __BGFX_VECTORDISPLAY_H__
+#ifndef __VECTORDISPLAY_H__
+#define __VECTORDISPLAY_H__
 
 #include "bgfx.h"
 
@@ -19,178 +18,183 @@
 #include <tinystl/vector.h>
 namespace stl = tinystl;
 
-class VectorDisplay {
-public:
-VectorDisplay(bool _originBottomLeft, float _texelHalf);
-~VectorDisplay()
+class VectorDisplay
 {
-}
-
-void setup(uint16_t _width, uint16_t _height, int _view = 2);
-void resize(uint16_t _width, uint16_t _height);
-void teardown();
-
-void beginFrame();
-void endFrame();
-
-// Draw a series of connected line segments.
-void beginDraw(float _x, float _y);
-void drawTo(float _x, float _y);
-void endDraw();
-
-//HighLevel draw functions
-void drawLine(float _x0, float _y0, float _x1, float _y1);
-void drawBox(float _x, float _y, float _w, float _h);
-void drawCircle(float _x, float _y, float _radius, float _steps);
-void drawWheel(float _spokeangle, float _x, float _y, float _radius);
-
-//Font Stuff (Simplex)
-//void simplexMeasure(float _scale, const char *_string, float *_outWidth, float *_outHeight);
-void drawSimplexFont(float _x, float _y, float _scale, const char* _string);
-
-// Set the current drawing color
-void setDrawColor(float _r, float _g, float _b, float _a = 1.0f);
-
-// Set the number of frames of decay/fade to apply to the scene.
-bool setDecaySteps(int _steps);
-
-// Set the brightness multipler applied on each decay frame after the first.
-bool setDecay(float _decay);
-
-// Set the brightness multipler applied on the first decay frame.
-bool setInitialDecay(float _initialDecay);
-
-// Set a 2d transformation for the display.
-//
-// This relates logical coordinates, as passed to vector_display_begin_draw,
-// vector_display_draw_to, and vector_display_draw, to coordinates from (0,0)
-// to (width,height) in the destination framebuffer.
-//
-// The parameters impact coordinates as follows:
-//
-//      framebuffer_x = x * scale + offset_x
-//      framebuffer_y = y * scale + offset_y
-//
-void setTransform(float _offsetX, float _offsetY, float _scale);
-
-// Set the line thickness.
-//
-// The line thickness is measured in scene coordinates, and includes all pixels lit by
-// the line before any post-processing. The apparent width of the line to the viewer
-// is significantly narrower, since brightness decays exponentially to zero within the
-// bounds of the line.
-//
-// Thickness, by default, is guessed based on width and height.
-//
-// This function clears the display.
-bool setThickness(float _thickness);
-void setDefaultThickness();
-
-// Set the "brightness" of the display
-//
-// useful values range from [0.5, 1.5]. 0.0 disables all glow effects.
-//
-// Due to implementation details of the glow effect, glow is related to
-// the pixel density of the framebuffer. It may require adjustment,
-// particularly when moving between devices of very different pixel density.
-//
-void setBrightness(float _brightness);
-
-// Get the size from a vector display.
-void getSize(float* _outWidth, float* _outHeight);
+public:
+	VectorDisplay(bool _originBottomLeft, float _texelHalf);
+
+	~VectorDisplay()
+	{
+	}
+
+	void setup(uint16_t _width, uint16_t _height, int _view = 2);
+	void resize(uint16_t _width, uint16_t _height);
+	void teardown();
+
+	void beginFrame();
+	void endFrame();
+
+	// Draw a series of connected line segments.
+	void beginDraw(float _x, float _y);
+	void drawTo(float _x, float _y);
+	void endDraw();
+
+	//HighLevel draw functions
+	void drawLine(float _x0, float _y0, float _x1, float _y1);
+	void drawBox(float _x, float _y, float _w, float _h);
+	void drawCircle(float _x, float _y, float _radius, float _steps);
+	void drawWheel(float _spokeangle, float _x, float _y, float _radius);
+
+	//Font Stuff (Simplex)
+	//void simplexMeasure(float _scale, const char *_string, float *_outWidth, float *_outHeight);
+	void drawSimplexFont(float _x, float _y, float _scale, const char* _string);
+
+	// Set the current drawing color
+	void setDrawColor(float _r, float _g, float _b, float _a = 1.0f);
+
+	// Set the number of frames of decay/fade to apply to the scene.
+	bool setDecaySteps(int _steps);
+
+	// Set the brightness multipler applied on each decay frame after the first.
+	bool setDecay(float _decay);
+
+	// Set the brightness multipler applied on the first decay frame.
+	bool setInitialDecay(float _initialDecay);
+
+	// Set a 2d transformation for the display.
+	//
+	// This relates logical coordinates, as passed to vector_display_begin_draw,
+	// vector_display_draw_to, and vector_display_draw, to coordinates from (0,0)
+	// to (width,height) in the destination framebuffer.
+	//
+	// The parameters impact coordinates as follows:
+	//
+	//      framebuffer_x = x * scale + offset_x
+	//      framebuffer_y = y * scale + offset_y
+	//
+	void setTransform(float _offsetX, float _offsetY, float _scale);
+
+	// Set the line thickness.
+	//
+	// The line thickness is measured in scene coordinates, and includes all pixels lit by
+	// the line before any post-processing. The apparent width of the line to the viewer
+	// is significantly narrower, since brightness decays exponentially to zero within the
+	// bounds of the line.
+	//
+	// Thickness, by default, is guessed based on width and height.
+	//
+	// This function clears the display.
+	bool setThickness(float _thickness);
+	void setDefaultThickness();
+
+	// Set the "brightness" of the display
+	//
+	// useful values range from [0.5, 1.5]. 0.0 disables all glow effects.
+	//
+	// Due to implementation details of the glow effect, glow is related to
+	// the pixel density of the framebuffer. It may require adjustment,
+	// particularly when moving between devices of very different pixel density.
+	//
+	void setBrightness(float _brightness);
+
+	// Get the size from a vector display.
+	void getSize(float* _outWidth, float* _outHeight);
+
 protected:
-void screenSpaceQuad(float _textureWidth, float _textureHeight, float _width = 1.0f, float _height = 1.0f);
+	void screenSpaceQuad(float _textureWidth, float _textureHeight, float _width = 1.0f, float _height = 1.0f);
 
-typedef struct             //has to match the spec submitted to the 3d-api!
-{ float x, y, z;
-  float u, v;
-  uint32_t color; } point_t;
+	typedef struct             //has to match the spec submitted to the 3d-api!
+	{
+		float x, y, z;
+		float u, v;
+		uint32_t color;
+	} point_t;
 
-typedef struct
-{
-	float x, y;
-} pending_point_t;
+	typedef struct
+	{
+		float x, y;
+	} pending_point_t;
 
-typedef struct
-{
-	float x0, y0, x1, y1;                     // nominal points
-	float a;                                  // angle
-	float sin_a, cos_a;                       // precomputed trig
+	typedef struct
+	{
+		float x0, y0, x1, y1;                     // nominal points
+		float a;                                  // angle
+		float sin_a, cos_a;                       // precomputed trig
 
-	float xl0, yl0, xl1, yl1;                 // left side of the box
-	float xr0, yr0, xr1, yr1;                 // right side of the box
+		float xl0, yl0, xl1, yl1;                 // left side of the box
+		float xr0, yr0, xr1, yr1;                 // right side of the box
 
-	int is_first, is_last;
-	int has_next, has_prev;                    // booleans indicating whether this line connects to prev/next
+		int is_first, is_last;
+		int has_next, has_prev;                    // booleans indicating whether this line connects to prev/next
 
-	float xlt0, ylt0, xlt1, ylt1;             // coordinates of endcaps (if !has_prev/!has_next)
-	float xrt0, yrt0, xrt1, yrt1;             // coordinates of endcaps (if !has_prev/!has_next)
+		float xlt0, ylt0, xlt1, ylt1;             // coordinates of endcaps (if !has_prev/!has_next)
+		float xrt0, yrt0, xrt1, yrt1;             // coordinates of endcaps (if !has_prev/!has_next)
 
-	float tl0, tl1, tr0, tr1;
+		float tl0, tl1, tr0, tr1;
 
-	float s0, s1;                             // shorten line by this amount
+		float s0, s1;                             // shorten line by this amount
 
-	float len;
-} line_t;
+		float len;
+	} line_t;
 
-float effectiveThickness();
-void setupResDependent();
-void teardownResDependent();
+	float effectiveThickness();
+	void setupResDependent();
+	void teardownResDependent();
 
-void appendTexpoint(float _x, float _y, float _u, float _v);
+	void appendTexpoint(float _x, float _y, float _u, float _v);
 
-float normalizef(float _a);
+	float normalizef(float _a);
 
-void drawFan(float _cx, float _cy, float _pa, float _a, float _t, float _s, float _e);
-void drawLines(line_t* _lines, int _numberLines);
-void genLinetex();
+	void drawFan(float _cx, float _cy, float _pa, float _a, float _t, float _s, float _e);
+	void drawLines(line_t* _lines, int _numberLines);
+	void genLinetex();
 
-bool m_originBottomLeft;
-float m_texelHalf;
+	bool m_originBottomLeft;
+	float m_texelHalf;
 
-bgfx::ProgramHandle m_drawToScreenShader;          // program for drawing to the framebuffer
-bgfx::UniformHandle u_compose_alpha;
+	bgfx::ProgramHandle m_drawToScreenShader;          // program for drawing to the framebuffer
+	bgfx::UniformHandle u_compose_alpha;
 
-bgfx::FrameBufferHandle m_sceneFrameBuffer;
+	bgfx::FrameBufferHandle m_sceneFrameBuffer;
 
-bgfx::ProgramHandle m_blurShader;        // program for gaussian blur
-bgfx::UniformHandle u_blur_scale;
-bgfx::UniformHandle u_compose_mult;
-bgfx::UniformHandle s_textureSampler;              //texture handle for blur
+	bgfx::ProgramHandle m_blurShader;        // program for gaussian blur
+	bgfx::UniformHandle u_blur_scale;
+	bgfx::UniformHandle u_compose_mult;
+	bgfx::UniformHandle s_textureSampler;              //texture handle for blur
 
-bgfx::ProgramHandle m_blitShader;
+	bgfx::ProgramHandle m_blitShader;
 
-bgfx::FrameBufferHandle m_glow0FrameBuffer;        // framebuffer for glow pass 0
-bgfx::FrameBufferHandle m_glow1FrameBuffer;        // framebuffer for glow pass 1
+	bgfx::FrameBufferHandle m_glow0FrameBuffer;        // framebuffer for glow pass 0
+	bgfx::FrameBufferHandle m_glow1FrameBuffer;        // framebuffer for glow pass 1
 
-int m_view;
+	int m_view;
 
-uint16_t m_screenWidth, m_screenHeight;
-uint16_t m_glowWidth, m_glowHeight;
+	uint16_t m_screenWidth, m_screenHeight;
+	uint16_t m_glowWidth, m_glowHeight;
 
-int m_numberDecaySteps;
-float m_decayValue;
-uint8_t m_drawColorR, m_drawColorG, m_drawColorB, m_drawColorA;
+	int m_numberDecaySteps;
+	float m_decayValue;
+	uint8_t m_drawColorR, m_drawColorG, m_drawColorB, m_drawColorA;
 
-stl::vector<point_t> m_points;
-stl::vector<pending_point_t> m_pendingPoints;
+	stl::vector<point_t> m_points;
+	stl::vector<pending_point_t> m_pendingPoints;
 
-int m_currentDrawStep;
-stl::vector<bgfx::DynamicVertexBufferHandle> m_vertexBuffers;
-stl::vector<int> m_vertexBuffersSize;
+	int m_currentDrawStep;
+	stl::vector<bgfx::DynamicVertexBufferHandle> m_vertexBuffers;
+	stl::vector<int> m_vertexBuffersSize;
 
-bgfx::TextureHandle m_lineTexId;
-bgfx::UniformHandle s_lineTexture;
+	bgfx::TextureHandle m_lineTexId;
+	bgfx::UniformHandle s_lineTexture;
 
-float m_initialDecay;
+	float m_initialDecay;
 
-float m_thickness;
-bool m_customThicknessEnabled;
+	float m_thickness;
+	bool m_customThicknessEnabled;
 
-float m_brightness;
+	float m_brightness;
 
-float m_drawOffsetX, m_drawOffsetY;
-float m_drawScale;
+	float m_drawOffsetX, m_drawOffsetY;
+	float m_drawScale;
 };
 
-#endif   //#ifndef __BGFX_VECTORDISPLAY_H__
+#endif // __VECTORDISPLAY_H__