Browse Source

Renamed bgfx::setViewRemap to bgfx::setViewOrder.

Branimir Karadžić 9 years ago
parent
commit
3f98a93463

+ 1 - 1
examples/09-hdr/hdr.cpp

@@ -416,7 +416,7 @@ class ExampleHDR : public entry::AppI
 				hdrVBlur,
 				hdrVBlur,
 				hdrHBlurTonemap
 				hdrHBlurTonemap
 			};
 			};
-			bgfx::setViewRemap(0, BX_COUNTOF(remap), remap);
+			bgfx::setViewOrder(0, BX_COUNTOF(remap), remap);
 
 
 			// Set view and projection matrix for view 0.
 			// Set view and projection matrix for view 0.
 			for (uint32_t ii = 0; ii < BX_COUNTOF(remap); ++ii)
 			for (uint32_t ii = 0; ii < BX_COUNTOF(remap); ++ii)

+ 1 - 1
include/bgfx/bgfx.h

@@ -2224,7 +2224,7 @@ namespace bgfx
 	///
 	///
 	/// @attention C99 equivalent is `bgfx_set_view_remap`.
 	/// @attention C99 equivalent is `bgfx_set_view_remap`.
 	///
 	///
-	void setViewRemap(uint8_t _id = 0, uint8_t _num = UINT8_MAX, const void* _remap = NULL);
+	void setViewOrder(uint8_t _id = 0, uint8_t _num = UINT8_MAX, const void* _remap = NULL);
 
 
 	/// Reset all view settings to default.
 	/// Reset all view settings to default.
 	///
 	///

+ 1 - 1
include/bgfx/bgfxdefines.h

@@ -6,7 +6,7 @@
 #ifndef BGFX_DEFINES_H_HEADER_GUARD
 #ifndef BGFX_DEFINES_H_HEADER_GUARD
 #define BGFX_DEFINES_H_HEADER_GUARD
 #define BGFX_DEFINES_H_HEADER_GUARD
 
 
-#define BGFX_API_VERSION UINT32_C(30)
+#define BGFX_API_VERSION UINT32_C(31)
 
 
 ///
 ///
 #define BGFX_STATE_RGB_WRITE               UINT64_C(0x0000000000000001) //!< Enable RGB write.
 #define BGFX_STATE_RGB_WRITE               UINT64_C(0x0000000000000001) //!< Enable RGB write.

+ 1 - 1
include/bgfx/c99/bgfx.h

@@ -791,7 +791,7 @@ BGFX_C_API void bgfx_set_view_transform(uint8_t _id, const void* _view, const vo
 BGFX_C_API void bgfx_set_view_transform_stereo(uint8_t _id, const void* _view, const void* _projL, uint8_t _flags, const void* _projR);
 BGFX_C_API void bgfx_set_view_transform_stereo(uint8_t _id, const void* _view, const void* _projL, uint8_t _flags, const void* _projR);
 
 
 /**/
 /**/
-BGFX_C_API void bgfx_set_view_remap(uint8_t _id, uint8_t _num, const void* _remap);
+BGFX_C_API void bgfx_set_view_order(uint8_t _id, uint8_t _num, const void* _order);
 
 
 /**/
 /**/
 BGFX_C_API void bgfx_reset_view(uint8_t _id);
 BGFX_C_API void bgfx_reset_view(uint8_t _id);

+ 1 - 1
include/bgfx/c99/bgfxplatform.h

@@ -162,7 +162,7 @@ typedef struct bgfx_interface_vtbl
     void (*set_view_frame_buffer)(uint8_t _id, bgfx_frame_buffer_handle_t _handle);
     void (*set_view_frame_buffer)(uint8_t _id, bgfx_frame_buffer_handle_t _handle);
     void (*set_view_transform)(uint8_t _id, const void* _view, const void* _proj);
     void (*set_view_transform)(uint8_t _id, const void* _view, const void* _proj);
     void (*set_view_transform_stereo)(uint8_t _id, const void* _view, const void* _projL, uint8_t _flags, const void* _projR);
     void (*set_view_transform_stereo)(uint8_t _id, const void* _view, const void* _projL, uint8_t _flags, const void* _projR);
-    void (*set_view_remap)(uint8_t _id, uint8_t _num, const void* _remap);
+    void (*set_view_order)(uint8_t _id, uint8_t _num, const void* _order);
     void (*set_marker)(const char* _marker);
     void (*set_marker)(const char* _marker);
     void (*set_state)(uint64_t _state, uint32_t _rgba);
     void (*set_state)(uint64_t _state, uint32_t _rgba);
     void (*set_condition)(bgfx_occlusion_query_handle_t _handle, bool _visible);
     void (*set_condition)(bgfx_occlusion_query_handle_t _handle, bool _visible);

+ 5 - 5
src/bgfx.cpp

@@ -3438,11 +3438,11 @@ error:
 		s_ctx->setViewTransform(_id, _view, _projL, _flags, _projR);
 		s_ctx->setViewTransform(_id, _view, _projL, _flags, _projR);
 	}
 	}
 
 
-	void setViewRemap(uint8_t _id, uint8_t _num, const void* _remap)
+	void setViewOrder(uint8_t _id, uint8_t _num, const void* _order)
 	{
 	{
 		BGFX_CHECK_MAIN_THREAD();
 		BGFX_CHECK_MAIN_THREAD();
 		BX_CHECK(checkView(_id), "Invalid view id: %d", _id);
 		BX_CHECK(checkView(_id), "Invalid view id: %d", _id);
-		s_ctx->setViewRemap(_id, _num, _remap);
+		s_ctx->setViewOrder(_id, _num, _order);
 	}
 	}
 
 
 	void resetView(uint8_t _id)
 	void resetView(uint8_t _id)
@@ -4435,9 +4435,9 @@ BGFX_C_API void bgfx_set_view_transform_stereo(uint8_t _id, const void* _view, c
 	bgfx::setViewTransform(_id, _view, _projL, _flags, _projR);
 	bgfx::setViewTransform(_id, _view, _projL, _flags, _projR);
 }
 }
 
 
-BGFX_C_API void bgfx_set_view_remap(uint8_t _id, uint8_t _num, const void* _remap)
+BGFX_C_API void bgfx_set_view_order(uint8_t _id, uint8_t _num, const void* _order)
 {
 {
-	bgfx::setViewRemap(_id, _num, _remap);
+	bgfx::setViewOrder(_id, _num, _order);
 }
 }
 
 
 BGFX_C_API void bgfx_reset_view(uint8_t _id)
 BGFX_C_API void bgfx_reset_view(uint8_t _id)
@@ -4776,7 +4776,7 @@ BGFX_C_API bgfx_interface_vtbl_t* bgfx_get_interface(uint32_t _version)
 	BGFX_IMPORT_FUNC(set_view_frame_buffer) \
 	BGFX_IMPORT_FUNC(set_view_frame_buffer) \
 	BGFX_IMPORT_FUNC(set_view_transform) \
 	BGFX_IMPORT_FUNC(set_view_transform) \
 	BGFX_IMPORT_FUNC(set_view_transform_stereo) \
 	BGFX_IMPORT_FUNC(set_view_transform_stereo) \
-	BGFX_IMPORT_FUNC(set_view_remap) \
+	BGFX_IMPORT_FUNC(set_view_order) \
 	BGFX_IMPORT_FUNC(set_marker) \
 	BGFX_IMPORT_FUNC(set_marker) \
 	BGFX_IMPORT_FUNC(set_state) \
 	BGFX_IMPORT_FUNC(set_state) \
 	BGFX_IMPORT_FUNC(set_condition) \
 	BGFX_IMPORT_FUNC(set_condition) \

+ 3 - 3
src/bgfx_p.h

@@ -3725,10 +3725,10 @@ namespace bgfx
 			setViewTransform(_id, NULL, NULL, BGFX_VIEW_NONE, NULL);
 			setViewTransform(_id, NULL, NULL, BGFX_VIEW_NONE, NULL);
 		}
 		}
 
 
-		BGFX_API_FUNC(void setViewRemap(uint8_t _id, uint8_t _num, const void* _remap) )
+		BGFX_API_FUNC(void setViewOrder(uint8_t _id, uint8_t _num, const void* _order) )
 		{
 		{
 			const uint32_t num = bx::uint32_min(_id + _num, BGFX_CONFIG_MAX_VIEWS) - _id;
 			const uint32_t num = bx::uint32_min(_id + _num, BGFX_CONFIG_MAX_VIEWS) - _id;
-			if (NULL == _remap)
+			if (NULL == _order)
 			{
 			{
 				for (uint32_t ii = 0; ii < num; ++ii)
 				for (uint32_t ii = 0; ii < num; ++ii)
 				{
 				{
@@ -3738,7 +3738,7 @@ namespace bgfx
 			}
 			}
 			else
 			else
 			{
 			{
-				memcpy(&m_viewRemap[_id], _remap, num);
+				memcpy(&m_viewRemap[_id], _order, num);
 			}
 			}
 		}
 		}