Skip to content

add new branch. #3

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

Open
wants to merge 1 commit into
base: test
Choose a base branch
from
Open

add new branch. #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 0 additions & 7 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,6 @@ int main() {
shader->setTexture("hanaTexture", 0);
shader->setTexture("stickerTexture", 1);



//10个立方体的世界坐标，model矩阵做完旋转 后乘即可
glm::vec3 cubePositions[] = {
glm::vec3(0.0f, 0.0f, 0.0f),
Expand All @@ -273,9 +271,7 @@ int main() {
//1、处理输入事件
processInput(window);


//2、进行渲染

//设置清空屏幕颜色，RGBA, 设置状态
glClearColor(0.2f, 0.3f, 0.3f, 1.0f);
//清空屏幕，清空的是颜色， 使用状态 使用深度测试
Expand All @@ -288,13 +284,10 @@ int main() {
// float greenValue = (sin(time) / 2.0f) + 0.5f;
//


//连接完成后，使用program
shader->useProgram();
shader->setMix(mix);



//坐标变换
//定义模型矩阵，视图矩阵、投影矩阵
//因为更改比较频繁，就放到渲染线程了
Expand Down