Skip to content
Snippets Groups Projects
Commit b255ac20 authored by bobarna's avatar bobarna
Browse files

ready for colliding demo

parent 63aaa739
No related tags found
No related merge requests found
...@@ -33,10 +33,10 @@ void Scene::Build() { ...@@ -33,10 +33,10 @@ void Scene::Build() {
// Texture *headTexture = new CheckerBoardTexture(1, 0); // Texture *headTexture = new CheckerBoardTexture(1, 0);
// auto headObject = new HeadObject(phongShader, sphere, headMaterial, headTexture); // auto headObject = new HeadObject(phongShader, sphere, headMaterial, headTexture);
auto headObject = new HeadObject(phongShader, new ObjGeometry("../data/susanne.obj"), headMaterial, headTexture); auto headObject = new HeadObject(phongShader, new ObjGeometry("../data/sphere.obj"), headMaterial, headTexture);
headObject->Scale(vec3(.35, .35, .35)); headObject->Scale(vec3(.35, .35, .35));
objects.push_back(headObject); /* objects.push_back(headObject); */
auto PBDSim = new PBDSimulation(headObject, nrSims, nrSegments, lSeg); auto PBDSim = new PBDSimulation(headObject, nrSims, nrSegments, lSeg);
auto simulationObject = new HairSimObject(headObject, basicShader, PBDSim); auto simulationObject = new HairSimObject(headObject, basicShader, PBDSim);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment