DeforaOS/GServer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add glColor3{,u}b() and fix glColor4b()

Browse Source
This commit is contained in:
Pierre Pronchery 2016-09-09 05:12:52 +02:00
parent c7b2a1a676
commit b0aa220c71
3 changed files with 68 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
data/GServer.interface
View File

@ -20,6 +20,11 @@ arg4=FLOAT
[call::glClearDepth]
arg1=DOUBLE
[call::glColor3b]
arg1=INT8
arg2=INT8
arg3=INT8
[call::glColor3d]
arg1=DOUBLE
arg2=DOUBLE
@ -40,6 +45,11 @@ arg1=INT16
arg2=INT16
arg3=INT16
[call::glColor3ub]
arg1=UINT8
arg2=UINT8
arg3=UINT8
[call::glColor3ui]
arg1=UINT32
arg2=UINT32
@ -51,10 +61,10 @@ arg2=UINT16
arg3=UINT16
[call::glColor4b]
arg1=UINT8
arg2=UINT8
arg3=UINT8
arg4=UINT8
arg1=INT8
arg2=INT8
arg3=INT8
arg4=INT8
[call::glColor4d]
arg1=DOUBLE

11
include/GServer/video.h
View File

@ -33,6 +33,7 @@ typedef enum _GServerVideoProto
GSERVER_VIDEO_PROTO_1i,
GSERVER_VIDEO_PROTO_2f,
GSERVER_VIDEO_PROTO_2i,
GSERVER_VIDEO_PROTO_3b,
GSERVER_VIDEO_PROTO_3d,
GSERVER_VIDEO_PROTO_3f,
GSERVER_VIDEO_PROTO_3i,
@ -94,6 +95,14 @@ typedef enum _GServerVideoProto2i
# define GSERVER_VIDEO_PROTO2i_LAST GSERVER_VIDEO_PROTO2i_glVertex2i
# define GSERVER_VIDEO_PROTO2i_COUNT (GSERVER_VIDEO_PROTO1i_LAST + 1)
typedef enum _GServerVideoProto3b
{
GSERVER_VIDEO_PROTO3b_glColor3b = 0,
GSERVER_VIDEO_PROTO3b_glColor3ub
} GServerVideoProto3b;
# define GSERVER_VIDEO_PROTO3b_LAST GSERVER_VIDEO_PROTO3b_glColor3ub
# define GSERVER_VIDEO_PROTO3b_COUNT (GSERVER_VIDEO_PROTO3b_LAST + 1)
typedef enum _GServerVideoProto3d
{
GSERVER_VIDEO_PROTO3d_glColor3d = 0,
@ -199,6 +208,8 @@ struct _GServerVideoPlugin
float x, float y);
void (*proto2i)(GServerVideoPlugin * plugin, GServerVideoProto2i func,
uint32_t x, uint32_t y);
void (*proto3b)(GServerVideoPlugin * plugin, GServerVideoProto3b func,
uint8_t x, uint8_t y, uint8_t z);
void (*proto3d)(GServerVideoPlugin * plugin, GServerVideoProto3d func,
double x, double y, double z);
void (*proto3f)(GServerVideoPlugin * plugin, GServerVideoProto3f func,

46
src/gserver.c
View File

@ -41,6 +41,7 @@
# define DEBUG_INTERFACE2f(x, y) DEBUG_INTERFACE2d(x, y)
# define DEBUG_INTERFACE2i(x, y) \
fprintf(stderr, "DEBUG: %s(0x%x, 0x%x)\n", __func__, x, y)
# define DEBUG_INTERFACE3b(x, y, z) DEBUG_INTERFACE3i(x, y, z)
# define DEBUG_INTERFACE3d(x, y, z) \
fprintf(stderr, "DEBUG: %s(%.1f, %.1f, %.1f)\n", __func__, x, y, z)
# define DEBUG_INTERFACE3f(x, y, z) DEBUG_INTERFACE3d(x, y, z)
@ -59,8 +60,8 @@
#else
# define DEBUG_INTERFACE()
# define DEBUG_INTERFACE1i(x)
# define DEBUG_INTERFACE2d(x, y, z)
# define DEBUG_INTERFACE2f(x, y, z)
# define DEBUG_INTERFACE2d(x, y)
# define DEBUG_INTERFACE2f(x, y)
# define DEBUG_INTERFACE2i(x, y)
# define DEBUG_INTERFACE3b(x, y, z)
# define DEBUG_INTERFACE3d(x, y, z)
@ -126,6 +127,12 @@ struct _GServerCall
uint32_t y;
} _2i;
struct
{
uint8_t x;
uint8_t y;
uint8_t z;
} _3b;
struct
{
double x;
double y;
@ -216,6 +223,8 @@ static int _gserver_queue2f(GServer * gserver, AppServerClient * asc,
GServerVideoProto2f func, float x, float y);
static int _gserver_queue2i(GServer * gserver, AppServerClient * asc,
GServerVideoProto2i func, uint32_t x, uint32_t y);
static int _gserver_queue3b(GServer * gserver, AppServerClient * asc,
GServerVideoProto3b func, uint8_t x, uint8_t y, uint8_t z);
static int _gserver_queue3d(GServer * gserver, AppServerClient * asc,
GServerVideoProto3d func, double x, double y, double z);
static int _gserver_queue3f(GServer * gserver, AppServerClient * asc,
@ -416,7 +425,7 @@ void gserver_refresh(GServer * gserver)
#define GSERVER_PROTO2f(type, func) \
type GServer_ ## func (GServer * gserver, AppServerClient * asc, float x, float y) \
{ \
DEBUG_INTERFACE2f(x, y, z); \
DEBUG_INTERFACE2f(x, y); \
_gserver_queue2f(gserver, asc, GSERVER_VIDEO_PROTO2f_ ## func, x, y); \
}
#define GSERVER_PROTO2i(type, func, type1, type2) \
@ -425,6 +434,12 @@ void gserver_refresh(GServer * gserver)
DEBUG_INTERFACE2i(x, y); \
_gserver_queue2i(gserver, asc, GSERVER_VIDEO_PROTO2i_ ## func, (uint32_t)x, (uint32_t)y); \
}
#define GSERVER_PROTO3b(type, func, type1, type2, type3) \
type GServer_ ## func (GServer * gserver, AppServerClient * asc, type1 x, type2 y, type3 z) \
{ \
DEBUG_INTERFACE3b(x, y, z); \
_gserver_queue3b(gserver, asc, GSERVER_VIDEO_PROTO3b_ ## func, (uint8_t)x, (uint8_t)y, (uint8_t)z); \
}
#define GSERVER_PROTO3d(type, func) \
type GServer_ ## func (GServer * gserver, AppServerClient * asc, double x, double y, double z) \
{ \
@ -511,6 +526,10 @@ GSERVER_PROTO2i(void, glColorMaterial, uint32_t, uint32_t)
GSERVER_PROTO2i(void, glHint, uint32_t, uint32_t)
GSERVER_PROTO2i(void, glVertex2i, int32_t, int32_t)
/* proto3b */
GSERVER_PROTO3b(void, glColor3b, int8_t, int8_t, int8_t)
GSERVER_PROTO3b(void, glColor3ub, uint8_t, uint8_t, uint8_t)
/* proto3d */
GSERVER_PROTO3d(void, glColor3d)
GSERVER_PROTO3d(void, glTranslated)
@ -584,6 +603,11 @@ static void _gserver_client_calls(GServer * gserver, GServerClient * client)
vp->proto2i(vp, call->func, call->args._2i.x,
call->args._2i.y);
break;
case GSERVER_VIDEO_PROTO_3b:
vp->proto3b(vp, call->func, call->args._3b.x,
call->args._3b.y,
call->args._3b.z);
break;
case GSERVER_VIDEO_PROTO_3d:
vp->proto3d(vp, call->func, call->args._3d.x,
call->args._3d.y,
@ -760,6 +784,22 @@ static int _gserver_queue2i(GServer * gserver, AppServerClient * asc,
}
/* gserver_queue3b */
static int _gserver_queue3b(GServer * gserver, AppServerClient * asc,
GServerVideoProto3b func, uint8_t x, uint8_t y, uint8_t z)
{
GServerCall * gsc;
if((gsc = _gserver_queue(gserver, asc, GSERVER_VIDEO_PROTO_3b, func))
== NULL)
return -1;
gsc->args._3b.x = x;
gsc->args._3b.y = y;
gsc->args._3b.z = z;
return 0;
}
/* gserver_queue3d */
static int _gserver_queue3d(GServer * gserver, AppServerClient * asc,
GServerVideoProto3d func, double x, double y, double z)