From 47b39fa2cbb6f86ae1eb3897f574ca2d2506759b Mon Sep 17 00:00:00 2001 From: zilongshanren Date: Mon, 11 Jan 2016 17:23:37 +0800 Subject: [PATCH] fixup! fix scrollview brake with large content size. --- cocos2d/core/components/CCScrollView.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cocos2d/core/components/CCScrollView.js b/cocos2d/core/components/CCScrollView.js index d4ba4cc387..1a18bd683b 100644 --- a/cocos2d/core/components/CCScrollView.js +++ b/cocos2d/core/components/CCScrollView.js @@ -720,7 +720,9 @@ var ScrollView = cc.Class({ if(this.brake <= 0){ return (1 - this.brake); } - var attenuatedFactor = (1 - this.brake) * (1 / (1 + distance * 0.0000014 + distance * distance * 0.000000008) ); + + //attenuate formula from: http://learnopengl.com/#!Lighting/Light-casters + var attenuatedFactor = (1 - this.brake) * (1 / (1 + distance * 0.000014 + distance * distance * 0.000000008) ); return attenuatedFactor; },