From cd93b67274b6898151fd5712118a5589ec20ed7f Mon Sep 17 00:00:00 2001 From: Godzil Date: Mon, 9 Mar 2020 13:42:21 +0000 Subject: [PATCH] Revert some debug changes that should have not been commited. --- tests/christmasball_render.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tests/christmasball_render.cpp b/tests/christmasball_render.cpp index 7f5888a..b0b459c 100644 --- a/tests/christmasball_render.cpp +++ b/tests/christmasball_render.cpp @@ -34,13 +34,9 @@ Shape *fir_branch() Group *ret = new Group(); double length = 2; double radius = 0.025; -#if 0 int segments = 20; int perSegment = 24; -#else - int segments = 5; - int perSegment = 24; -#endif + Cylinder *branch = new Cylinder(); branch->minCap = 0; branch->maxCap = length; @@ -81,7 +77,7 @@ Shape *fir_branch() Point p3 = Point(0, yTip, needleLenght); needle = new Triangle(p1, p2, p3); needle->setTransform(rotationY(yAngle)); - needle->material.colour = Colour((1.0 / (double)perSegment)*i /*0.26*/, 0.36, /*0.16*/ (1. / (double)segments) * y); + needle->material.colour = Colour(0.26, 0.36, 0.16); needle->material.specular = 0.1; subGroup->addObject(needle); } @@ -183,7 +179,7 @@ int main() s = fir_branch(); s->setTransform(translation(-1, -1, 0) * rotationY(0.349) * rotationX(-1.5708) * translation(0, -0.5, 0)); w.addObject(s); - /* + s = fir_branch(); s->setTransform(translation(-1, 1, 0) * rotationY(0.349) * rotationX(-1.5708) * translation(0, -0.5, 0)); w.addObject(s); @@ -223,7 +219,6 @@ int main() s = fir_branch(); s->setTransform(translation(1.5, -0.5, 0) * rotationY(-0.1754) * rotationX(0.087) * rotationX(-1.5708) * translation(0, -0.5, 0)); w.addObject(s); - */ /* ----------------------------- */