Skip to content

Dev #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zoozooll merged 4 commits into from
Jun 1, 2026
Merged

Dev #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
296f981
Configure EGL config chooser for GLSurfaceView in GLActivity
zoozooll May 30, 2026
01927d7
Add stencil test toggle to UI and implement native event handling
zoozooll May 30, 2026
3bbf001
Implement dynamic blending configuration and UI controls
zoozooll May 31, 2026
005e330
Rename shader files to remove numeric prefixes
zoozooll May 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...assets/shaders/blending/3.2.blending.frag → ...ain/assets/shaders/blending/blending.frag
View file
Open in desktop
File renamed without changes.
0 ...assets/shaders/blending/3.2.blending.vert → ...ain/assets/shaders/blending/blending.vert
View file
Open in desktop
File renamed without changes.
0 ...assets/shaders/cubemaps/6.1.cubemaps.frag → ...ain/assets/shaders/cubemaps/cubemaps.frag
View file
Open in desktop
File renamed without changes.
0 ...assets/shaders/cubemaps/6.1.cubemaps.vert → ...ain/assets/shaders/cubemaps/cubemaps.vert
View file
Open in desktop
File renamed without changes.
0 ...n/assets/shaders/cubemaps/6.1.skybox.frag → .../main/assets/shaders/cubemaps/skybox.frag
View file
Open in desktop
File renamed without changes.
0 ...n/assets/shaders/cubemaps/6.1.skybox.vert → .../main/assets/shaders/cubemaps/skybox.vert
View file
Open in desktop
File renamed without changes.
0 .../geometry_shader/9.1.geometry_shader.frag → ...ders/geometry_shader/geometry_shader.frag
View file
Open in desktop
File renamed without changes.
0 .../geometry_shader/9.1.geometry_shader.geom → ...ders/geometry_shader/geometry_shader.geom
View file
Open in desktop
File renamed without changes.
0 .../geometry_shader/9.1.geometry_shader.vert → ...ders/geometry_shader/geometry_shader.vert
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tutorial/src/main/assets/shaders/tesselation_shaders/8.3.gpuheight.frag
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ out vec4 FragColor;

void main()
{
float h = (Height + 16)/64.0f;
float h = (Height + 16.) / 64.0;
FragColor = vec4(h, h, h, 1.0);
}
4 changes: 2 additions & 2 deletions tutorial/src/main/assets/shaders/tesselation_shaders/8.3.gpuheight.tesc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ void main()
{
const int MIN_TESS_LEVEL = 4;
const int MAX_TESS_LEVEL = 64;
const float MIN_DISTANCE = 20;
const float MAX_DISTANCE = 800;
const float MIN_DISTANCE = 20.;
const float MAX_DISTANCE = 800.;

vec4 eyeSpacePos00 = view * model * gl_in[0].gl_Position;
vec4 eyeSpacePos01 = view * model * gl_in[1].gl_Position;
Expand Down
2 changes: 1 addition & 1 deletion tutorial/src/main/assets/shaders/tesselation_shaders/8.3.gpuheight.tese
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ void main()

vec4 uVec = p01 - p00;
vec4 vVec = p10 - p00;
vec4 normal = normalize( vec4(cross(vVec.xyz, uVec.xyz), 0) );
vec4 normal = normalize( vec4(cross(vVec.xyz, uVec.xyz), 0.) );

vec4 p0 = (p01 - p00) * u + p00;
vec4 p1 = (p11 - p10) * u + p10;
Expand Down
208 changes: 144 additions & 64 deletions tutorial/src/main/cpp/basic/BlendingScene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,79 +22,80 @@ void BlendingScene::init() {
m_camera = new TargetCamera;
// configure global opengl state
// -----------------------------
glEnable(GL_CULL_FACE);
Comment thread
zoozooll marked this conversation as resolved.
glEnable(GL_DEPTH_TEST);
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

// build and compile our shader zprogram
// ------------------------------------
m_pShader = new Shader("shaders/blending/3.2.blending.vert", "shaders/blending/3.2.blending.frag");
m_pShader = new Shader("shaders/blending/blending.vert", "shaders/blending/blending.frag");

// set up vertex data (and buffer(s)) and configure vertex attributes
// ------------------------------------------------------------------
float cubeVertices[] = {
// positions // texture Coords
-0.5f, -0.5f, -0.5f, 0.0f, 0.0f,
0.5f, -0.5f, -0.5f, 1.0f, 0.0f,
0.5f, 0.5f, -0.5f, 1.0f, 1.0f,
0.5f, 0.5f, -0.5f, 1.0f, 1.0f,
-0.5f, 0.5f, -0.5f, 0.0f, 1.0f,
-0.5f, -0.5f, -0.5f, 0.0f, 0.0f,

-0.5f, -0.5f, 0.5f, 0.0f, 0.0f,
0.5f, -0.5f, 0.5f, 1.0f, 0.0f,
0.5f, 0.5f, 0.5f, 1.0f, 1.0f,
0.5f, 0.5f, 0.5f, 1.0f, 1.0f,
-0.5f, 0.5f, 0.5f, 0.0f, 1.0f,
-0.5f, -0.5f, 0.5f, 0.0f, 0.0f,

-0.5f, 0.5f, 0.5f, 1.0f, 0.0f,
-0.5f, 0.5f, -0.5f, 1.0f, 1.0f,
-0.5f, -0.5f, -0.5f, 0.0f, 1.0f,
-0.5f, -0.5f, -0.5f, 0.0f, 1.0f,
-0.5f, -0.5f, 0.5f, 0.0f, 0.0f,
-0.5f, 0.5f, 0.5f, 1.0f, 0.0f,

0.5f, 0.5f, 0.5f, 1.0f, 0.0f,
0.5f, 0.5f, -0.5f, 1.0f, 1.0f,
0.5f, -0.5f, -0.5f, 0.0f, 1.0f,
0.5f, -0.5f, -0.5f, 0.0f, 1.0f,
0.5f, -0.5f, 0.5f, 0.0f, 0.0f,
0.5f, 0.5f, 0.5f, 1.0f, 0.0f,

-0.5f, -0.5f, -0.5f, 0.0f, 1.0f,
0.5f, -0.5f, -0.5f, 1.0f, 1.0f,
0.5f, -0.5f, 0.5f, 1.0f, 0.0f,
0.5f, -0.5f, 0.5f, 1.0f, 0.0f,
-0.5f, -0.5f, 0.5f, 0.0f, 0.0f,
-0.5f, -0.5f, -0.5f, 0.0f, 1.0f,

-0.5f, 0.5f, -0.5f, 0.0f, 1.0f,
0.5f, 0.5f, -0.5f, 1.0f, 1.0f,
0.5f, 0.5f, 0.5f, 1.0f, 0.0f,
0.5f, 0.5f, 0.5f, 1.0f, 0.0f,
-0.5f, 0.5f, 0.5f, 0.0f, 0.0f,
-0.5f, 0.5f, -0.5f, 0.0f, 1.0f
// back face
-0.5f, -0.5f, -0.5f, 0.0f, 0.0f, // bottom-left
0.5f, 0.5f, -0.5f, 1.0f, 1.0f, // top-right
0.5f, -0.5f, -0.5f, 1.0f, 0.0f, // bottom-right
0.5f, 0.5f, -0.5f, 1.0f, 1.0f, // top-right
-0.5f, -0.5f, -0.5f, 0.0f, 0.0f, // bottom-left
-0.5f, 0.5f, -0.5f, 0.0f, 1.0f, // top-left
// front face
-0.5f, -0.5f, 0.5f, 0.0f, 0.0f, // bottom-left
0.5f, -0.5f, 0.5f, 1.0f, 0.0f, // bottom-right
0.5f, 0.5f, 0.5f, 1.0f, 1.0f, // top-right
0.5f, 0.5f, 0.5f, 1.0f, 1.0f, // top-right
-0.5f, 0.5f, 0.5f, 0.0f, 1.0f, // top-left
-0.5f, -0.5f, 0.5f, 0.0f, 0.0f, // bottom-left
// left face
-0.5f, 0.5f, 0.5f, 1.0f, 0.0f, // top-right
-0.5f, 0.5f, -0.5f, 1.0f, 1.0f, // top-left
-0.5f, -0.5f, -0.5f, 0.0f, 1.0f, // bottom-left
-0.5f, -0.5f, -0.5f, 0.0f, 1.0f, // bottom-left
-0.5f, -0.5f, 0.5f, 0.0f, 0.0f, // bottom-right
-0.5f, 0.5f, 0.5f, 1.0f, 0.0f, // top-right
// right face
0.5f, 0.5f, 0.5f, 1.0f, 0.0f, // top-left
0.5f, -0.5f, -0.5f, 0.0f, 1.0f, // bottom-right
0.5f, 0.5f, -0.5f, 1.0f, 1.0f, // top-right
0.5f, -0.5f, -0.5f, 0.0f, 1.0f, // bottom-right
0.5f, 0.5f, 0.5f, 1.0f, 0.0f, // top-left
0.5f, -0.5f, 0.5f, 0.0f, 0.0f, // bottom-left
// bottom face
-0.5f, -0.5f, -0.5f, 0.0f, 1.0f, // top-right
0.5f, -0.5f, -0.5f, 1.0f, 1.0f, // top-left
0.5f, -0.5f, 0.5f, 1.0f, 0.0f, // bottom-left
0.5f, -0.5f, 0.5f, 1.0f, 0.0f, // bottom-left
-0.5f, -0.5f, 0.5f, 0.0f, 0.0f, // bottom-right
-0.5f, -0.5f, -0.5f, 0.0f, 1.0f, // top-right
// top face
-0.5f, 0.5f, -0.5f, 0.0f, 1.0f, // top-left
0.5f, 0.5f, 0.5f, 1.0f, 0.0f, // bottom-right
0.5f, 0.5f, -0.5f, 1.0f, 1.0f, // top-right
0.5f, 0.5f, 0.5f, 1.0f, 0.0f, // bottom-right
-0.5f, 0.5f, -0.5f, 0.0f, 1.0f, // top-left
-0.5f, 0.5f, 0.5f, 0.0f, 0.0f // bottom-left
};
float planeVertices[] = {
// positions // texture Coords
5.0f, -0.5f, 5.0f, 2.0f, 0.0f,
-5.0f, -0.5f, 5.0f, 0.0f, 0.0f,
-5.0f, -0.5f, -0.5f, 0.0f, 2.0f,
// positions // texture Coords
5.0f, -0.5f, 5.0f, 2.0f, 0.0f,
-5.0f, -0.5f, -5.0f, 0.0f, 2.0f,
-5.0f, -0.5f, 5.0f, 0.0f, 0.0f,

5.0f, -0.5f, 5.0f, 2.0f, 0.0f,
-5.0f, -0.5f, -5.0f, 0.0f, 2.0f,
5.0f, -0.5f, -5.0f, 2.0f, 2.0f
5.0f, -0.5f, 5.0f, 2.0f, 0.0f,
5.0f, -0.5f, -5.0f, 2.0f, 2.0f,
-5.0f, -0.5f, -5.0f, 0.0f, 2.0f
};
float transparentVertices[] = {
// positions // texture Coords (swapped y coordinates because texture is flipped upside down)
0.0f, 0.5f, 0.0f, 0.0f, 0.0f,
0.0f, -0.5f, 0.0f, 0.0f, 1.0f,
1.0f, -0.5f, 0.0f, 1.0f, 1.0f,
// positions // texture Coords (swapped y coordinates because texture is flipped upside down)
-0.5f, 0.5f, 0.0f, 0.0f, 0.0f,
-0.5f, -0.5f, 0.0f, 0.0f, 1.0f,
0.5f, -0.5f, 0.0f, 1.0f, 1.0f,

0.0f, 0.5f, 0.0f, 0.0f, 0.0f,
1.0f, -0.5f, 0.0f, 1.0f, 1.0f,
1.0f, 0.5f, 0.0f, 1.0f, 0.0f
-0.5f, 0.5f, 0.0f, 0.0f, 0.0f,
0.5f, -0.5f, 0.0f, 1.0f, 1.0f,
0.5f, 0.5f, 0.0f, 1.0f, 0.0f
};
// cube VAO
glGenVertexArrays(1, &m_cubeVAO);
Expand Down Expand Up @@ -130,9 +131,9 @@ void BlendingScene::init() {

// load textures
// -------------
m_cubeTexture = loadTexture("marble.jpg");
m_floorTexture = loadTexture("metal.png");
m_transparentTexture = loadTexture("window.png");
m_cubeTexture = loadTexture("textures/marble.jpg");
m_floorTexture = loadTexture("textures/metal.png");
m_transparentTexture = loadTexture("textures/window.png");

// shader configuration
// --------------------
Expand All @@ -147,7 +148,17 @@ void BlendingScene::resize(int width, int height) {

void BlendingScene::draw() {
m_camera->update();
// sort the transparent windows before rendering

if (blendOn) {
LOGI(__FILE_NAME__, "blend properties %x, %x, %x", srcFactor, dstFactor, blendEquationMode);
glEnable(GL_BLEND);
glBlendFunc(srcFactor, dstFactor);
glBlendEquation(blendEquationMode);
} else {
glDisable(GL_BLEND);
}

// sort the transparent windows before rendering
// ---------------------------------------------
std::map<float, glm::vec3> sorted;
for (unsigned int i = 0; i < m_windows.size(); i++)
Expand Down Expand Up @@ -216,7 +227,6 @@ void BlendingScene::destroy() {
}

BlendingScene::~BlendingScene() {

}

std::map<std::string, std::any> BlendingScene::propertyEvent(std::map<std::string, std::any> &map) {
Expand All @@ -226,10 +236,78 @@ std::map<std::string, std::any> BlendingScene::propertyEvent(std::map<std::strin
if ("target_camera_touching_event" == eventIdStr) {
parseTargetCameraEvent(map);
}
if ("blend_on_event" == eventIdStr) {
parseBlendOnEvent(map);
}
if ("src_factor_event" == eventIdStr) {
parseSrcFactorEvent(map);
}
if ("dst_factor_event" == eventIdStr) {
parseDstFactorEvent(map);
}
if ("blend_equation_event" == eventIdStr) {
parseBlendEquationEvent(map);
}
}
return {};
}

void BlendingScene::parseBlendOnEvent(std::map<std::string, std::any> &event) {
if (auto it = event.find("on"); it != event.end()) {
if (it->second.type() == typeid(bool)) {
blendOn = std::any_cast<bool>(it->second);
}
}
}

void BlendingScene::parseSrcFactorEvent(std::map<std::string, std::any> &event) {
if (auto it = event.find("factor"); it != event.end()) {
if (it->second.type() == typeid(int)) {
const auto& val = std::any_cast<int>(it->second);
const GLenum factors[] = {
GL_ZERO, GL_ONE, GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR,
GL_DST_COLOR, GL_ONE_MINUS_DST_COLOR, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
GL_DST_ALPHA, GL_ONE_MINUS_DST_ALPHA, GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR,
GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA
};
if (val >= 0 && val < sizeof(factors)/sizeof(factors[0])) {
srcFactor = factors[val];
}
}
}
}

void BlendingScene::parseDstFactorEvent(std::map<std::string, std::any> &event) {
if (auto it = event.find("factor"); it != event.end()) {
if (it->second.type() == typeid(int)) {
const auto& val = std::any_cast<int>(it->second);
const GLenum factors[] = {
GL_ZERO, GL_ONE, GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR,
GL_DST_COLOR, GL_ONE_MINUS_DST_COLOR, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
GL_DST_ALPHA, GL_ONE_MINUS_DST_ALPHA, GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR,
GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA
};
if (val >= 0 && val < sizeof(factors)/sizeof(factors[0])) {
dstFactor = factors[val];
}
}
}
}

void BlendingScene::parseBlendEquationEvent(std::map<std::string, std::any> &event) {
if (auto it = event.find("mode"); it != event.end()) {
if (it->second.type() == typeid(int)) {
const auto& val = std::any_cast<int>(it->second);
const GLenum modes[] = {
GL_FUNC_ADD, GL_FUNC_SUBTRACT, GL_FUNC_REVERSE_SUBTRACT, GL_MIN, GL_MAX
};
if (val >= 0 && val < sizeof(modes)/sizeof(modes[0])) {
blendEquationMode = modes[val];
}
}
}
}

void BlendingScene::parseTargetCameraEvent(std::map<std::string, std::any> &event) {
auto* targetCamera = dynamic_cast<TargetCamera*>(m_camera);
if (!targetCamera) return;
Expand All @@ -247,8 +325,10 @@ void BlendingScene::parseTargetCameraEvent(std::map<std::string, std::any> &even
if (it->second.type() == typeid(std::vector<float>)) {
const auto& val = std::any_cast<const std::vector<float>&>(it->second);
if (val.size() >= 8) {
targetCamera->onDoubleTouching(glm::vec2(val[0], val[1]), glm::vec2(val[2], val[3]),
glm::vec2(val[4], val[5]), glm::vec2(val[6], val[7]));
targetCamera->onDoubleTouching(glm::vec2(val[0], val[1]),
glm::vec2(val[2], val[3]),
glm::vec2(val[4], val[5]),
glm::vec2(val[6], val[7]));
}
}
}
Expand Down
25 changes: 25 additions & 0 deletions tutorial/src/main/cpp/basic/BlendingScene.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

#include "TutorialScene.h"

#include <GLES3/gl32.h>

#include <vector>

class Camera;
Expand Down Expand Up @@ -41,7 +43,30 @@ public :

std::vector<glm::vec3> m_windows;

//region Properties
// Switch if blend is on.
bool blendOn = true;

// source blending factors. Value is one of GL_ZERO, GL_ONE, GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR, GL_DST_COLOR,
// GL_ONE_MINUS_DST_COLOR, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_DST_ALPHA, GL_ONE_MINUS_DST_ALPHA.
// GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR, GL_CONSTANT_ALPHA, and GL_ONE_MINUS_CONSTANT_ALPHA.
GLenum srcFactor = GL_SRC_ALPHA;

// destination blending factors. Value is one of GL_ZERO, GL_ONE, GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR, GL_DST_COLOR,
// GL_ONE_MINUS_DST_COLOR, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_DST_ALPHA, GL_ONE_MINUS_DST_ALPHA.
// GL_CONSTANT_COLOR, GL_ONE_MINUS_CONSTANT_COLOR, GL_CONSTANT_ALPHA, and GL_ONE_MINUS_CONSTANT_ALPHA.
GLenum dstFactor = GL_ONE_MINUS_SRC_ALPHA;

// BlendEquation mode.
// Value is one of GL_FUNC_ADD, GL_FUNC_SUBTRACT, GL_FUNC_REVERSE_SUBTRACT, GL_MIN, GL_MAX
GLenum blendEquationMode = GL_FUNC_ADD;
//endregion

void parseTargetCameraEvent(std::map<std::string, std::any> &event);
void parseBlendOnEvent(std::map<std::string, std::any> &event);
void parseSrcFactorEvent(std::map<std::string, std::any> &event);
void parseDstFactorEvent(std::map<std::string, std::any> &event);
void parseBlendEquationEvent(std::map<std::string, std::any> &event);
};

#endif //LEARNGLES_BLENDINGSCENE_H
4 changes: 2 additions & 2 deletions tutorial/src/main/cpp/basic/CubemapScene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ void CubemapScene::init() {

// build and compile shaders
// -------------------------
m_pShader = new Shader("shaders/cubemaps/6.1.cubemaps.vert", "shaders/cubemaps/6.1.cubemaps.frag");
m_pSkyboxShader = new Shader("shaders/cubemaps/6.1.skybox.vert", "shaders/cubemaps/6.1.skybox.frag");
m_pShader = new Shader("shaders/cubemaps/cubemaps.vert", "shaders/cubemaps/cubemaps.frag");
m_pSkyboxShader = new Shader("shaders/cubemaps/skybox.vert", "shaders/cubemaps/skybox.frag");

// set up vertex data (and buffer(s)) and configure vertex attributes
// ------------------------------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions tutorial/src/main/cpp/basic/GeometryShaderScene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ void GeometryShaderScene::init() {

// build and compile shaders
// -------------------------
m_pShader = new Shader("shaders/geometry_shader/9.1.geometry_shader.vert",
"shaders/geometry_shader/9.1.geometry_shader.frag",
"shaders/geometry_shader/9.1.geometry_shader.geom");
m_pShader = new Shader("shaders/geometry_shader/geometry_shader.vert",
"shaders/geometry_shader/geometry_shader.frag",
"shaders/geometry_shader/geometry_shader.geom");

// set up vertex data (and buffer(s)) and configure vertex attributes
// ------------------------------------------------------------------
Expand Down
Loading