Skip to content

Commit ccb2d04

Browse files
Use the imac logo
1 parent e986079 commit ccb2d04

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

libs/glutils/scenerunner.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ SceneRunner::SceneRunner(const std::string& windowTitle, int width, int height,
6262
GLUtils::dumpGLInfo();
6363

6464
// Initialization
65-
glClearColor(0.5f, 0.5f, 0.5f, 1.0f);
65+
glClearColor(0.8f, 0.8f, 0.9f, 1.0f);
6666
#ifndef __APPLE__
6767
if (debug) {
6868
glEnable(GL_DEBUG_OUTPUT);

project01/scenecloth.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void SceneCloth::initScene()
4949
computeProg.setUniform("RestLengthDiag", sqrtf(dx * dx + dy * dy));
5050

5151
glActiveTexture(GL_TEXTURE0);
52-
clothTexture = Texture::loadTexture("../res/texture/me_textile.png");
52+
clothTexture = Texture::loadTexture("../res/texture/textile.png");
5353
}
5454

5555
void SceneCloth::initBuffers()
@@ -236,14 +236,14 @@ void SceneCloth::uiUpdate()
236236
void SceneCloth::compileAndLinkShader()
237237
{
238238
try {
239-
renderProg.compileShader("shader/ads.vs");
240-
renderProg.compileShader("shader/ads.fs");
239+
renderProg.compileShader("shader/ads_vs.glsl");
240+
renderProg.compileShader("shader/ads_fs.glsl");
241241
renderProg.link();
242242

243-
computeProg.compileShader("shader/cloth.cs");
243+
computeProg.compileShader("shader/cloth_cs.glsl");
244244
computeProg.link();
245245

246-
computeProgNorm.compileShader("shader/cloth_normal.cs");
246+
computeProgNorm.compileShader("shader/cloth_normal_cs.glsl");
247247
computeProgNorm.link();
248248
}
249249
catch (GLSLProgramException& e) {

res/texture/me_textile.png

-666 KB
Binary file not shown.

res/texture/textile.png

575 KB
Loading

0 commit comments

Comments
 (0)