yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2860
committer: Chiara Modenese <c.modenese@xxxxxxxxx>
branch nick: yade
timestamp: Wed 2011-05-11 12:17:46 +0000
message:
  - Fix color map in shop (thanks Vaclav).
modified:
  pkg/dem/Shop.cpp


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription

=== modified file 'pkg/dem/Shop.cpp'
--- pkg/dem/Shop.cpp	2011-04-03 16:49:58 +0000
+++ pkg/dem/Shop.cpp	2011-05-11 12:17:46 +0000
@@ -513,7 +513,7 @@
  */
 Vector3r Shop::scalarOnColorScale(Real x, Real xmin, Real xmax){
 	Real xnorm=min((Real)1.,max((x-xmin)/(xmax-xmin),(Real)0.));
-	if(xnorm<.25) return Vector3r(0,.4*xnorm,1);
+	if(xnorm<.25) return Vector3r(0,4.*xnorm,1);
 	if(xnorm<.5)  return Vector3r(0,1,1.-4.*(xnorm-.25));
 	if(xnorm<.75) return Vector3r(4*(xnorm-.5),1.,0);
 	return Vector3r(1,1-4*(xnorm-.75),0);