scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-23 06:23:37 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Version of random that truncates ints

Browse source
This commit is contained in:
Tim Mickel 2016-06-30 19:04:15 -04:00
parent bb5acd1ef4
commit 5876681bc7
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/blocks/scratch3_operators.js
View file

@ -84,16 +84,16 @@ Scratch3OperatorsBlocks.prototype.not = function (args) {
};
Scratch3OperatorsBlocks.prototype.random = function (args) {
// As a demo, this implementation of random returns after 1 second of yield.
// @todo Match Scratch 2.0 implementation with int-truncation.
// See: http://bit.ly/1Qc0GzC
var examplePromise = new Promise(function(resolve) {
setTimeout(function() {
var res = (Math.random() * (args.TO - args.FROM)) + args.FROM;
resolve(res);
}, 1000);
});
return examplePromise;
var low = args.FROM <= args.TO ? args.FROM : args.TO;
var high = args.FROM <= args.TO ? args.TO : args.FROM;
if (low == high) return low;
// If both low and high are ints, truncate the result to an int.
var lowInt = low == parseInt(low);
var highInt = high == parseInt(high);
if (lowInt && highInt) {
return low + parseInt(Math.random() * ((high + 1) - low));
}
return (Math.random() * (high - low)) + low;
};
module.exports = Scratch3OperatorsBlocks;