ml
d2dc58391b
build / build (push) Successful in 2m26s
- xr_input.c/h: an OpenXR action set (aim pose, trigger/select click, a menu-toggle button) plus ray/quad hit-testing, and a visible laser-pointer line drawn from the controller toward the hit point. - xr_menu.c/h + MenuOverlay.java: a second composition-layer quad, toggled by a controller button, showing an off-screen, never-attached Android View tree (one "Keyboard" button so far) driven by synthetic touch events computed from the laser ray's hit UV. - Migrate gl4es from a prebuilt binary baked into the Docker build-image to a vendored source snapshot (android/gl4es-src/) compiled from source at APK build time via CMake add_subdirectory(), patched through a new android/gl4es-patches/ (mirrors the existing engine-patches/ pattern). This was needed to track down and fix a bug hit while building the menu: gl4es's fixed-pipeline emulation (fpe.c) was unconditionally substituting its own shader onto the menu's draw call (fpe_ReleventState() always sets alphafunc to a nonzero sentinel, so its fpe_IsEmpty() check could never see the state as empty), making the menu quad show the game's own rendering instead of its own content. Fixed by routing the menu's blit through a real glBlitFramebuffer() call instead of a shader-based draw, which gl4es's fpe.c has nothing to intercept - documented in README.md's new "Debugging notes" section. - Renumber android/engine-patches/ to close the gap left by removing an unrelated diagnostic-only patch, and strip investigation-journal comments and dead diagnostic code (temporary tracing, env-var probes) left over from finding the bug above. - Restructure README.md into numbered sections, document every engine/gl4es patch, add Android Studio dev/testing-cycle instructions, and generalize Quest-specific wording to any OpenXR headset. Update NOTICE.txt to match (gl4es is now vendored/patched source, not a prebuilt binary; add the OpenXR-SDK loader).
130 lines
4.2 KiB
C
130 lines
4.2 KiB
C
#include "pointsprite.h"
|
|
|
|
#include "../glx/hardext.h"
|
|
#include "debug.h"
|
|
#include "fpe.h"
|
|
#include "gl4es.h"
|
|
#include "glstate.h"
|
|
#include "loader.h"
|
|
|
|
void APIENTRY_GL4ES gl4es_glPointParameteri(GLenum pname, GLint param)
|
|
{
|
|
gl4es_glPointParameterf(pname, param);
|
|
}
|
|
AliasExport(void,glPointParameteri,,(GLenum pname, GLint param));
|
|
|
|
void APIENTRY_GL4ES gl4es_glPointParameteriv(GLenum pname, const GLint * params)
|
|
{
|
|
GLfloat tmp[3];
|
|
int v=(pname==GL_POINT_DISTANCE_ATTENUATION)?3:1;
|
|
for (int i=0; i<v; i++) tmp[i] = params[i];
|
|
gl4es_glPointParameterfv(pname, tmp);
|
|
}
|
|
AliasExport(void,glPointParameteriv,,(GLenum pname, const GLint * params));
|
|
|
|
void APIENTRY_GL4ES gl4es_glPointParameterf(GLenum pname, GLfloat param) {
|
|
PUSH_IF_COMPILING(glPointParameterf);
|
|
gl4es_glPointParameterfv(pname, ¶m);
|
|
}
|
|
AliasExport(void,glPointParameterf,,(GLenum pname, GLfloat param));
|
|
AliasExport(void,glPointParameterf,ARB,(GLenum pname, GLfloat param));
|
|
AliasExport(void,glPointParameterf,EXT,(GLenum pname, GLfloat param));
|
|
|
|
void APIENTRY_GL4ES gl4es_glPointParameterfv(GLenum pname, const GLfloat * params)
|
|
{
|
|
if (glstate->list.active)
|
|
if (glstate->list.compiling) {
|
|
if (pname == GL_POINT_DISTANCE_ATTENUATION) {
|
|
NewStage(glstate->list.active, STAGE_POINTPARAM);
|
|
rlPointParamOp(glstate->list.active, 1, params);
|
|
return;
|
|
} else {
|
|
gl4es_glPointParameterf(pname, params[0]);
|
|
return;
|
|
}
|
|
} else gl4es_flush();
|
|
|
|
switch(pname) {
|
|
case GL_POINT_SIZE_MIN:
|
|
if(*params<0.0f) {
|
|
errorShim(GL_INVALID_VALUE);
|
|
return;
|
|
}
|
|
if(glstate->pointsprite.sizeMin == *params) {
|
|
noerrorShim();
|
|
return;
|
|
}
|
|
glstate->pointsprite.sizeMin = *params;
|
|
break;
|
|
case GL_POINT_SIZE_MAX:
|
|
if(*params<0.0f) {
|
|
errorShim(GL_INVALID_VALUE);
|
|
return;
|
|
}
|
|
if(glstate->pointsprite.sizeMax == *params) {
|
|
noerrorShim();
|
|
return;
|
|
}
|
|
glstate->pointsprite.sizeMax = *params;
|
|
break;
|
|
case GL_POINT_FADE_THRESHOLD_SIZE:
|
|
if(*params<0.0f) {
|
|
errorShim(GL_INVALID_VALUE);
|
|
return;
|
|
}
|
|
if(glstate->pointsprite.fadeThresholdSize == *params) {
|
|
noerrorShim();
|
|
return;
|
|
}
|
|
glstate->pointsprite.fadeThresholdSize = *params;
|
|
break;
|
|
case GL_POINT_DISTANCE_ATTENUATION:
|
|
if(*params<0.0f) {
|
|
errorShim(GL_INVALID_VALUE);
|
|
return;
|
|
}
|
|
if(memcmp(glstate->pointsprite.distance, params, 3*sizeof(GLfloat))==0) {
|
|
noerrorShim();
|
|
return;
|
|
}
|
|
memcpy(glstate->pointsprite.distance, params, 3*sizeof(GLfloat));
|
|
break;
|
|
case GL_POINT_SPRITE_COORD_ORIGIN:
|
|
if(*params!=GL_UPPER_LEFT && *params!=GL_LOWER_LEFT) {
|
|
errorShim(GL_INVALID_VALUE);
|
|
return;
|
|
}
|
|
if(glstate->pointsprite.coordOrigin == *params) {
|
|
noerrorShim();
|
|
return;
|
|
}
|
|
if(glstate->fpe_state) {
|
|
if(*params==GL_LOWER_LEFT)
|
|
glstate->fpe_state->pointsprite_upper = 0;
|
|
else
|
|
glstate->fpe_state->pointsprite_upper = 1;
|
|
}
|
|
glstate->pointsprite.coordOrigin = *params;
|
|
break;
|
|
}
|
|
|
|
LOAD_GLES_FPE(glPointParameterfv);
|
|
errorGL();
|
|
gles_glPointParameterfv(pname, params);
|
|
}
|
|
AliasExport(void,glPointParameterfv,,(GLenum pname, const GLfloat * params));
|
|
AliasExport(void,glPointParameterfv,ARB,(GLenum pname, const GLfloat * params));
|
|
AliasExport(void,glPointParameterfv,EXT,(GLenum pname, const GLfloat * params));
|
|
|
|
void APIENTRY_GL4ES gl4es_glPointSize(GLfloat size) {
|
|
if(size<=0.0f) {
|
|
errorShim(GL_INVALID_VALUE);
|
|
return;
|
|
}
|
|
glstate->pointsprite.size = size;
|
|
errorGL();
|
|
LOAD_GLES_FPE(glPointSize);
|
|
gles_glPointSize(size);
|
|
}
|
|
AliasExport(void,glPointSize,,(GLfloat size));
|