Skip to content

Commit 02e5e2d

Browse files
sadko4usadko4u
committed
Release 0.5.1
* Modified base R3D interface constants and metadata structures.
2 parents 5af59a4 + 265494b commit 02e5e2d

File tree

10 files changed

+42
-40
lines changed

10 files changed

+42
-40
lines changed

‎CHANGELOG

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
* RECENT CHANGES
33
*******************************************************************************
44

5+
=== 0.5.1 ===
6+
* Modified base R3D interface constants and metadata structures.
7+
58
=== 0.5.0 ===
69
* Initial release.
710
* Base 3D rendering backend.

‎dependencies.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Variables that describe dependencies
2-
LSP_COMMON_LIB_VERSION := 1.0.3
2+
LSP_COMMON_LIB_VERSION := 1.0.4
33
LSP_COMMON_LIB_NAME := lsp-common-lib
44
LSP_COMMON_LIB_URL := https://github.com/sadko4u/$(LSP_COMMON_LIB_NAME).git
55
LSP_COMMON_LIB_TYPE := hdr

‎include/lsp-plug.in/r3d/backend.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ namespace lsp
2222
const char *id; // Enumeration unique identifier
2323
const char *display; // Display name
2424
const char *lc_key; // Localized display name key
25-
version_t version; // Interface version
2625
} backend_metadata_t;
2726

2827
/**

‎include/lsp-plug.in/r3d/base_backend.h renamed to ‎include/lsp-plug.in/r3d/base.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* Author: sadko
66
*/
77

8-
#ifndef LSP_PLUG_IN_R3D_BASE_BACKEND_H_
9-
#define LSP_PLUG_IN_R3D_BASE_BACKEND_H_
8+
#ifndef LSP_PLUG_IN_R3D_BASE_H_
9+
#define LSP_PLUG_IN_R3D_BASE_H_
1010

1111
#include <lsp-plug.in/common/types.h>
1212
#include <lsp-plug.in/r3d/version.h>
@@ -48,4 +48,4 @@ namespace lsp
4848
}
4949
}
5050

51-
#endif /* LSP_PLUG_IN_R3D_BASE_BACKEND_H_ */
51+
#endif /* LSP_PLUG_IN_R3D_BASE_H_ */

‎include/lsp-plug.in/r3d/factory.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@
88
#ifndef LSP_PLUG_IN_R3D_FACTORY_H_
99
#define LSP_PLUG_IN_R3D_FACTORY_H_
1010

11+
#include <lsp-plug.in/r3d/base.h>
1112
#include <lsp-plug.in/r3d/version.h>
1213
#include <lsp-plug.in/r3d/types.h>
13-
#include <lsp-plug.in/r3d/base_backend.h>
14+
15+
#define LSP_R3D_FACTORY_FUNCTION_NAME "lsp_r3d_factory"
16+
#define LSP_R3D_FACTORY_FUNCTION_HEADER LSP_CSYMBOL_EXPORT ::lsp::r3d::factory_t *lsp_r3d_factory()
1417

1518
namespace lsp
1619
{

‎include/lsp-plug.in/r3d/types.h

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,55 +11,52 @@
1111
#include <lsp-plug.in/r3d/version.h>
1212
#include <lsp-plug.in/common/types.h>
1313

14-
#define LSP_R3D_FACTORY_FUNCTION_NAME "lsp_r3d_factory"
15-
#define LSP_R3D_FACTORY_VERSION_NAME "lsp_r3d_version"
16-
1714
namespace lsp
1815
{
1916
namespace r3d
2017
{
2118
enum window_handle_t
2219
{
23-
R3D_WND_HANDLE_X11,
24-
R3D_WND_HANDLE_WINNT
20+
WND_HANDLE_X11,
21+
WND_HANDLE_WINNT
2522
};
2623

2724
enum pixel_format_t
2825
{
29-
R3D_PIXEL_RGBA,
30-
R3D_PIXEL_BGRA,
31-
R3D_PIXEL_RGB,
32-
R3D_PIXEL_BGR
26+
PIXEL_RGBA,
27+
PIXEL_BGRA,
28+
PIXEL_RGB,
29+
PIXEL_BGR
3330
};
3431

3532
enum matrix_type_t
3633
{
37-
R3D_MATRIX_PROJECTION, /* Projection matrix */
38-
R3D_MATRIX_VIEW, /* View matrix */
39-
R3D_MATRIX_WORLD /* World matrix for additional transformations if view matrix is not enough */
34+
MATRIX_PROJECTION, /* Projection matrix */
35+
MATRIX_VIEW, /* View matrix */
36+
MATRIX_WORLD /* World matrix for additional transformations if view matrix is not enough */
4037
};
4138

4239
enum light_type_t
4340
{
44-
R3D_LIGHT_NONE,
45-
R3D_LIGHT_POINT,
46-
R3D_LIGHT_DIRECTIONAL,
47-
R3D_LIGHT_SPOT
41+
LIGHT_NONE,
42+
LIGHT_POINT,
43+
LIGHT_DIRECTIONAL,
44+
LIGHT_SPOT
4845
};
4946

5047
enum primitive_type_t
5148
{
52-
R3D_PRIMITIVE_TRIANGLES,
53-
R3D_PRIMITIVE_WIREFRAME_TRIANGLES,
54-
R3D_PRIMITIVE_LINES,
55-
R3D_PRIMITIVE_POINTS,
49+
PRIMITIVE_TRIANGLES,
50+
PRIMITIVE_WIREFRAME_TRIANGLES,
51+
PRIMITIVE_LINES,
52+
PRIMITIVE_POINTS,
5653
};
5754

5855
enum buffer_flags_t
5956
{
60-
R3D_BUFFER_BLENDING = 1 << 0,
61-
R3D_BUFFER_LIGHTING = 1 << 1,
62-
R3D_BUFFER_NO_CULLING = 1 << 2
57+
BUFFER_BLENDING = 1 << 0,
58+
BUFFER_LIGHTING = 1 << 1,
59+
BUFFER_NO_CULLING = 1 << 2
6360
};
6461

6562
#pragma pack(push, 1)

‎include/lsp-plug.in/r3d/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010

1111
#define LSP_R3D_BASE_MAJOR 0
1212
#define LSP_R3D_BASE_MINOR 5
13-
#define LSP_R3D_BASE_MICRO 0
13+
#define LSP_R3D_BASE_MICRO 1
1414

1515
#endif /* LSP_PLUG_IN_R3D_VERSION_H_ */

‎make/modules.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ HDR_MODULES = $(foreach dep, $(DEPENDENCIES), $(if $(findstring hdr,$($(
1717
$(SRC_MODULES) $(HDR_MODULES):
1818
@echo "Cloning $($(@)_URL) -> $($(@)_PATH) [$($(@)_BRANCH)]"
1919
@test -f "$($(@)_PATH)/.git/config" || $(GIT) clone "$($(@)_URL)" "$($(@)_PATH)"
20-
@$(GIT) -C "$($(@)_PATH)" fetch origin --prune --force
21-
@$(GIT) -C "$($(@)_PATH)" fetch origin --prune '+refs/heads/*:refs/tags/*' --force
20+
@$(GIT) -C "$($(@)_PATH)" fetch origin --force
21+
@$(GIT) -C "$($(@)_PATH)" fetch origin '+refs/heads/*:refs/tags/*' --force
2222
@$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout origin/$($(@)_BRANCH) || \
2323
$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout refs/tags/$($(@)_BRANCH)
2424

‎project.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ARTIFACT_NAME = lsp-r3d-base-lib
33
ARTIFACT_VARS = LSP_R3D_BASE_LIB
44
ARTIFACT_HEADERS = lsp-plug.in
55
ARTIFACT_EXPORT_ALL = 0
6-
VERSION = 0.5.0
6+
VERSION = 0.5.1
77

88
# List of dependencies
99
TEST_DEPENDENCIES = \

‎src/main/base_backend.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Author: sadko
66
*/
77

8-
#include <lsp-plug.in/r3d/base_backend.h>
8+
#include <lsp-plug.in/r3d/base.h>
99
#include <lsp-plug.in/stdlib/string.h>
1010

1111
namespace lsp
@@ -55,9 +55,9 @@ namespace lsp
5555
base_backend_t *_this = static_cast<base_backend_t *>(handle);
5656
switch (type)
5757
{
58-
case R3D_MATRIX_PROJECTION: _this->matProjection = *m; break;
59-
case R3D_MATRIX_VIEW: _this->matView = *m; break;
60-
case R3D_MATRIX_WORLD: _this->matWorld = *m; break;
58+
case MATRIX_PROJECTION: _this->matProjection = *m; break;
59+
case MATRIX_VIEW: _this->matView = *m; break;
60+
case MATRIX_WORLD: _this->matWorld = *m; break;
6161
default: return STATUS_INVALID_VALUE;
6262
}
6363
return STATUS_OK;
@@ -71,9 +71,9 @@ namespace lsp
7171
base_backend_t *_this = static_cast<base_backend_t *>(handle);
7272
switch (type)
7373
{
74-
case R3D_MATRIX_PROJECTION: *m = _this->matProjection; break;
75-
case R3D_MATRIX_VIEW: *m = _this->matView; break;
76-
case R3D_MATRIX_WORLD: *m = _this->matWorld; break;
74+
case MATRIX_PROJECTION: *m = _this->matProjection; break;
75+
case MATRIX_VIEW: *m = _this->matView; break;
76+
case MATRIX_WORLD: *m = _this->matWorld; break;
7777
default: return STATUS_INVALID_VALUE;
7878
}
7979
return STATUS_OK;

0 commit comments

Comments
 (0)