csm
Merge branch 'master' of https://github.com/wangyanxing/Demi3D
some fixes