Skip to content

Commit d1a9fb8

Browse files
committed
Updated backend interface
1 parent 2f5d843 commit d1a9fb8

File tree

5 files changed

+26
-28
lines changed

5 files changed

+26
-28
lines changed

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
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>
1414

1515
namespace lsp
1616
{

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

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,55 +11,54 @@
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"
14+
#define LSP_R3D_FACTORY_FUNCTION_NAME "lsp_r3d_factory"
1615

1716
namespace lsp
1817
{
1918
namespace r3d
2019
{
2120
enum window_handle_t
2221
{
23-
R3D_WND_HANDLE_X11,
24-
R3D_WND_HANDLE_WINNT
22+
WND_HANDLE_X11,
23+
WND_HANDLE_WINNT
2524
};
2625

2726
enum pixel_format_t
2827
{
29-
R3D_PIXEL_RGBA,
30-
R3D_PIXEL_BGRA,
31-
R3D_PIXEL_RGB,
32-
R3D_PIXEL_BGR
28+
PIXEL_RGBA,
29+
PIXEL_BGRA,
30+
PIXEL_RGB,
31+
PIXEL_BGR
3332
};
3433

3534
enum matrix_type_t
3635
{
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 */
36+
MATRIX_PROJECTION, /* Projection matrix */
37+
MATRIX_VIEW, /* View matrix */
38+
MATRIX_WORLD /* World matrix for additional transformations if view matrix is not enough */
4039
};
4140

4241
enum light_type_t
4342
{
44-
R3D_LIGHT_NONE,
45-
R3D_LIGHT_POINT,
46-
R3D_LIGHT_DIRECTIONAL,
47-
R3D_LIGHT_SPOT
43+
LIGHT_NONE,
44+
LIGHT_POINT,
45+
LIGHT_DIRECTIONAL,
46+
LIGHT_SPOT
4847
};
4948

5049
enum primitive_type_t
5150
{
52-
R3D_PRIMITIVE_TRIANGLES,
53-
R3D_PRIMITIVE_WIREFRAME_TRIANGLES,
54-
R3D_PRIMITIVE_LINES,
55-
R3D_PRIMITIVE_POINTS,
51+
PRIMITIVE_TRIANGLES,
52+
PRIMITIVE_WIREFRAME_TRIANGLES,
53+
PRIMITIVE_LINES,
54+
PRIMITIVE_POINTS,
5655
};
5756

5857
enum buffer_flags_t
5958
{
60-
R3D_BUFFER_BLENDING = 1 << 0,
61-
R3D_BUFFER_LIGHTING = 1 << 1,
62-
R3D_BUFFER_NO_CULLING = 1 << 2
59+
BUFFER_BLENDING = 1 << 0,
60+
BUFFER_LIGHTING = 1 << 1,
61+
BUFFER_NO_CULLING = 1 << 2
6362
};
6463

6564
#pragma pack(push, 1)

src/main/base_backend.cpp

Lines changed: 1 addition & 1 deletion
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

0 commit comments

Comments
 (0)