Skip to content

Commit ea67d4a

Browse files
lr8softlr8soft
committed
v0.19u1
1 parent 562a0cf commit ea67d4a

7 files changed

Lines changed: 34 additions & 48 deletions

File tree

‎.idea/workspace.xml‎

Lines changed: 4 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Python2D/XCCore/Background/Lake.cpp‎

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -53,72 +53,57 @@ void LakeBackground::renderLakeImage()
5353
model = glm::translate(model, glm::vec3(0.5f, 0.5f, 0.0f)*reshape);
5454
model = glm::scale(model, glm::vec3(0.5f));
5555
lake->setMvpMatrix(model);
56-
lake->Render(glm::vec3(0.0f), glm::vec4(1.0f), 0.0f, glm::vec3(0), glm::vec3(0.0f),
56+
lake->Render(glm::vec3(0.0f), lakeColor, 0.0f, glm::vec3(0), glm::vec3(0.0f),
5757
IRenderHelper::GetSpecificTexWithRatef(XCFrameInfo::FrameRight, XCFrameInfo::FrameTop,1, 1, renderX, renderY));
5858
}
5959
{
6060
glm::mat4 model;
6161
model = glm::translate(model, glm::vec3(0.5f, -0.5f, 0.0f)*reshape);
6262
model = glm::scale(model, glm::vec3(0.5f));
6363
lake->setMvpMatrix(model);
64-
lake->Render(glm::vec3(0.0f), glm::vec4(1.0f), 0.0f, glm::vec3(0), glm::vec3(0.0f),
64+
lake->Render(glm::vec3(0.0f), lakeColor, 0.0f, glm::vec3(0), glm::vec3(0.0f),
6565
IRenderHelper::GetSpecificTexWithRatef(XCFrameInfo::FrameRight, XCFrameInfo::FrameTop, 1, 1, renderX, renderY));
6666
}
6767
{
6868
glm::mat4 model;
6969
model = glm::translate(model, glm::vec3(-0.5f, -0.5f, 0.0f)*reshape);
7070
model = glm::scale(model, glm::vec3(0.5f));
7171
lake->setMvpMatrix(model);
72-
lake->Render(glm::vec3(0.0f), glm::vec4(1.0f), 0.0f, glm::vec3(0), glm::vec3(0.0f),
72+
lake->Render(glm::vec3(0.0f), lakeColor, 0.0f, glm::vec3(0), glm::vec3(0.0f),
7373
IRenderHelper::GetSpecificTexWithRatef(XCFrameInfo::FrameRight, XCFrameInfo::FrameTop, 1, 1, renderX, renderY));
7474
}
7575
{
7676
glm::mat4 model;
7777
model = glm::translate(model, glm::vec3(-0.5f, 0.5f, 0.0f)*reshape);
7878
model = glm::scale(model, glm::vec3(0.5f));
7979
lake->setMvpMatrix(model);
80-
lake->Render(glm::vec3(0.0f), glm::vec4(1.0f), 0.0f, glm::vec3(0), glm::vec3(0.0f),
80+
lake->Render(glm::vec3(0.0f), lakeColor, 0.0f, glm::vec3(0), glm::vec3(0.0f),
8181
IRenderHelper::GetSpecificTexWithRatef(XCFrameInfo::FrameRight, XCFrameInfo::FrameTop, 1, 1, renderX, renderY));
8282
}
8383
}
8484

8585
void LakeBackground::renderWaterImage()
8686
{
8787
glm::vec3 reshape = glm::vec3(XCFrameInfo::FrameRight, XCFrameInfo::FrameTop, 1.0f);
88-
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
88+
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);//GL_ONE_MINUS_SRC_ALPHA
8989
//glBlendFunc(GL_SRC_COLOR, GL_ONE_MINUS_SRC_COLOR);
9090
{
9191
glm::mat4 model;
92-
model = glm::translate(model, glm::vec3(0.5f, 0.5f, 0.0f)*reshape);
93-
model = glm::scale(model, glm::vec3(0.5f));
94-
water->setMvpMatrix(model);
95-
water->Render(glm::vec3(0.0f), waterColor, 0.0f, glm::vec3(0), glm::vec3(0.0f),
96-
IRenderHelper::GetSpecificTexWithRatef(XCFrameInfo::FrameRight, XCFrameInfo::FrameTop, 2, 2, waterX, waterY));
97-
}
98-
{
99-
glm::mat4 model;
100-
model = glm::translate(model, glm::vec3(0.5f, -0.5f, 0.0f)*reshape);
101-
model = glm::scale(model, glm::vec3(0.5f));
92+
model = glm::translate(model, glm::vec3(0.0f, 0.5f, 0.0f));
93+
model = glm::scale(model, glm::vec3(1.0f, 0.5f,1.0f));
10294
water->setMvpMatrix(model);
10395
water->Render(glm::vec3(0.0f), waterColor, 0.0f, glm::vec3(0), glm::vec3(0.0f),
10496
IRenderHelper::GetSpecificTexWithRatef(XCFrameInfo::FrameRight, XCFrameInfo::FrameTop, 2, 2, waterX, waterY));
10597
}
10698
{
10799
glm::mat4 model;
108-
model = glm::translate(model, glm::vec3(-0.5f, -0.5f, 0.0f)*reshape);
109-
model = glm::scale(model, glm::vec3(0.5f));
110-
water->setMvpMatrix(model);
111-
water->Render(glm::vec3(0.0f), waterColor, 0.0f, glm::vec3(0), glm::vec3(0.0f),
112-
IRenderHelper::GetSpecificTexWithRatef(XCFrameInfo::FrameRight, XCFrameInfo::FrameTop, 2, 2, waterX, waterY));
113-
}
114-
{
115-
glm::mat4 model;
116-
model = glm::translate(model, glm::vec3(-0.5f, 0.5f, 0.0f)*reshape);
117-
model = glm::scale(model, glm::vec3(0.5f));
100+
model = glm::translate(model, glm::vec3(0.0f, -0.5f, 0.0f));
101+
model = glm::scale(model, glm::vec3(1.0f, 0.5f, 1.0f));
118102
water->setMvpMatrix(model);
119103
water->Render(glm::vec3(0.0f), waterColor, 0.0f, glm::vec3(0), glm::vec3(0.0f),
120104
IRenderHelper::GetSpecificTexWithRatef(XCFrameInfo::FrameRight, XCFrameInfo::FrameTop, 2, 2, waterX, waterY));
121105
}
106+
122107
}
123108

124109
void LakeBackground::renderLeafImage()

‎Python2D/XCCore/Background/Lake.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ class LakeBackground : public Background {
1212
XCAdvImageHelper *lake, *leef, *water;
1313
float renderX = 0.0f, renderY = 0.0f, waterX = 1.0f, waterY = 1.0f;
1414

15-
glm::vec4 waterColor = glm::vec4(0.37f, 1.0f, 1.0f, 0.57f);
15+
glm::vec4 lakeColor = glm::vec4(1.0f, 1.0f,1.0f,1.0f);
16+
glm::vec4 waterColor = glm::vec4(0.6f, 0.6f, 1.0f, 0.4f);
1617

1718
bool isInit = false;
1819
void renderLakeImage();

‎Python2D/XCCore/XCRender/XCAdvImageHelper.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ void XCAdvImageHelper::Render(glm::vec3 renderPos, glm::vec4 coverColor, float r
5959
glBindBuffer(GL_ARRAY_BUFFER, vbo);
6060
glBindTexture(GL_TEXTURE_2D, tbo);
6161

62-
auto color_location = glGetUniformLocation(ProgramHandle, "render_color");
62+
auto color_location = glGetUniformLocation(ProgramHandle, "diffuse_color");
6363
glUniform4fv(color_location, 1, glm::value_ptr(coverColor));
6464

6565
auto mvp_fx_location = glGetUniformLocation(ProgramHandle, "mvp_mat");

‎Python2D/XCCore/XCRender/XCColorBlockHelper.cpp‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,10 @@ void XCColorBlockHelper::Render(glm::vec3 renderPos, glm::vec4 coverColor, float
5959
{
6060
glEnable(GL_BLEND);
6161
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
62-
63-
glUseProgram(ProgramHandle);
62+
if (!isFlexible)
63+
glUseProgram(ProgramHandle);
64+
else
65+
glUseProgram(ProgramHandleFx);
6466
//glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ebo);
6567
glBindVertexArray(vao);
6668
glBindBuffer(GL_ARRAY_BUFFER, vbo);
@@ -78,9 +80,16 @@ void XCColorBlockHelper::Render(glm::vec3 renderPos, glm::vec4 coverColor, float
7880
mvp_mat = glm::rotate(mvp_mat, glm::degrees(rotateAngle), rotateWork);
7981

8082
auto mvp_location = glGetUniformLocation(ProgramHandle, "mvp_mat");
81-
auto color_location = glGetUniformLocation(ProgramHandle, "color");
83+
if (isFlexible) {
84+
auto color_location = glGetUniformLocation(ProgramHandleFx, "diffuse_color");
85+
glUniform4fv(color_location, 1, glm::value_ptr(coverColor));
86+
}
87+
else{
88+
auto color_location = glGetUniformLocation(ProgramHandle, "font_color");
89+
glUniform4fv(color_location, 1, glm::value_ptr(coverColor));
90+
}
8291
glUniformMatrix4fv(mvp_location, 1, GL_FALSE, glm::value_ptr(mvp_mat));
83-
glUniform4fv(color_location, 1, glm::value_ptr(coverColor));
92+
8493
glDrawElements(GL_TRIANGLES, sizeof(data::indices) / sizeof(GLushort), GL_UNSIGNED_SHORT, NULL);
8594

8695
glDisable(GL_BLEND);

‎Python2D/XCCore/XCRender/XCImageHelper.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@ void XCImageHelper::Render(glm::vec3 renderPos, glm::vec4 coverColor, float rota
9090
glUniformMatrix4fv(mvp_location, 1, GL_FALSE, glm::value_ptr(mvp_mat));
9191

9292
if (isFlexible) {
93-
auto color_location = glGetUniformLocation(ProgramHandleFx, "render_color");
93+
auto color_location = glGetUniformLocation(ProgramHandleFx, "diffuse_color");
9494
glUniform4fv(color_location,1,glm::value_ptr(coverColor));
9595

9696
auto mvp_fx_location = glGetUniformLocation(ProgramHandleFx, "mvp_mat");
97-
glUniformMatrix4fv(ProgramHandleFx, 1, GL_FALSE, glm::value_ptr(mvp_mat));
97+
glUniformMatrix4fv(mvp_fx_location, 1, GL_FALSE, glm::value_ptr(mvp_mat));
9898
glBufferSubData(GL_ARRAY_BUFFER, 0, 16 * sizeof(float), texturePos16xFloat);
9999
}
100100
glDrawElements(GL_TRIANGLES, sizeof(indices)/sizeof(GLushort), GL_UNSIGNED_SHORT, NULL);

‎Python2D/assets/Shader/image/image.fx.vert‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#version 330 core
22

33
uniform mat4 mvp_mat;
4-
uniform vec4 render_color;
4+
uniform vec4 diffuse_color;
55

66
layout(location=0) in vec4 draw_vertex;
77
layout(location=1) in vec2 tex_pos;
@@ -11,5 +11,5 @@ out vec4 cover_color;
1111
void main(){
1212
gl_Position = mvp_mat * vec4(draw_vertex.xy,0.0,1.0);
1313
tex_coord = tex_pos;
14-
cover_color = render_color;
14+
cover_color = diffuse_color;
1515
}

0 commit comments

Comments
 (0)