jeena/pixi.js
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/GoodBoyDigital/pixi.js into dev

Browse source 
Conflicts:
	bin/pixi.dev.js
	bin/pixi.js
This commit is contained in:
Mat Groves 2014-01-15 09:28:14 +00:00
commit d262a2c46e
9 changed files with 58 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.travis.yml
View file

@ -8,10 +8,16 @@ branches:
- dev
install:
- npm install -g grunt-cli
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- npm install grunt-cli
- npm install
cache:
directories:
- node_modules
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
script:
- grunt travis
- ./node_modules/.bin/grunt travis

13
Gruntfile.js
View file

@ -103,7 +103,8 @@ module.exports = function(grunt) {
},
files: {
srcBlob: '<%= dirs.src %>/**/*.js',
testBlob: '<%= dirs.test %>/{functional,lib/pixi,unit/pixi}/**/*.js',
testBlob: '<%= dirs.test %>/**/*.js',
testConf: '<%= dirs.test %>/karma.conf.js',
build: '<%= dirs.build %>/pixi.dev.js',
buildMin: '<%= dirs.build %>/pixi.js'
},
@ -131,10 +132,16 @@ module.exports = function(grunt) {
options: {
jshintrc: './.jshintrc'
},
source: srcFiles.filter(function(v) { return v.match(/(Intro|Outro|Spine|Pixi)\.js$/) === null; }).concat('Gruntfile.js'),
source: {
src: srcFiles.concat('Gruntfile.js'),
options: {
ignores: '<%= dirs.src %>/**/{Intro,Outro,Spine,Pixi}.js'
}
},
test: {
src: ['<%= files.testBlob %>'],
options: {
ignores: '<%= dirs.test %>/lib/resemble.js',
jshintrc: undefined, //don't use jshintrc for tests
expr: true,
undef: false,
@ -184,7 +191,7 @@ module.exports = function(grunt) {
},
karma: {
unit: {
configFile: 'test/karma.conf.js',
configFile: '<%= files.testConf %>',
// browsers: ['Chrome'],
singleRun: true
}

4
README.md
View file

@ -17,6 +17,8 @@ any breakthroughs will be posted up there too!
### Demos ###
- [WebGL Filters!](<http://www.goodboydigital.com/pixijs/examples/15/indexAll.html>)
- [Run pixi run](<http://www.goodboydigital.com/runpixierun/>)
- [Fight for Everyone](<http://www.theleisuresociety.co.uk/fightforeveryone>)
@ -150,3 +152,5 @@ It also copies the non-minified version to the examples.
```
This content is released under the (http://opensource.org/licenses/MIT) MIT License.
[![Analytics](https://ga-beacon.appspot.com/UA-39213431-2/pixi.js/index)](https://github.com/igrigorik/ga-beacon)

4
bower.json
View file

@ -1,11 +1,11 @@
{
"name": "pixi.js",
"version": "1.4.0",
"version": "1.4.1",
"main": "bin/pixi.js",
"ignore": [
"**/.*"
"**/.*",
"node_modules",
"bower_components",
"test"

8
package.json
View file

@ -1,6 +1,6 @@
{
"name": "pixi.js",
"version": "1.4.0",
"version": "1.4.2",
"description": "Pixi.js is a fast lightweight 2D library that works across all devices.",
"author": "Mat Groves",
@ -28,7 +28,7 @@
"dependencies": {},
"devDependencies": {
"grunt": "~0.4.1",
"grunt-contrib-jshint": "git+https://github.com/englercj/grunt-contrib-jshint.git",
"grunt-contrib-jshint": "~0.8",
"grunt-contrib-uglify": "~0.2",
"grunt-contrib-connect": "~0.5",
"grunt-contrib-yuidoc": "~0.5",
@ -37,7 +37,9 @@
"mocha": "~1.15",
"chai": "~1.8",
"karma": "~0.10",
"karma-chrome-launcher": "~0.1",
"karma-firefox-launcher": "~0.1",
"karma-mocha": "~0.1"
"karma-mocha": "~0.1",
"karma-spec-reporter": "~0.0.6"
}
}

6
src/pixi/renderers/canvas/utils/CanvasTinter.js
View file

@ -171,9 +171,9 @@ PIXI.CanvasTinter.roundColor = function(color)
var rgbValues = PIXI.hex2rgb(color);
rgbValues[0] = Math.round(rgbValues[0] * step) / step;
rgbValues[1] = Math.round(rgbValues[1] * step) / step;
rgbValues[2] = Math.round(rgbValues[2] * step) / step;
rgbValues[0] = Math.min(255, Math.round(rgbValues[0] / step) * step);
rgbValues[1] = Math.min(255, Math.round(rgbValues[1] / step) * step);
rgbValues[2] = Math.min(255, Math.round(rgbValues[2] / step) * step);
return PIXI.rgb2hex(rgbValues);
};

37
tasks/karma.js
View file

@ -1,27 +1,22 @@
'use strict';
var path = require('path');
var server = require('karma').server;
module.exports = function (grunt) {
grunt.registerMultiTask('karma', 'run karma.', function() {
var done = this.async();
var options = this.options({
background: false
});
var data = this.data;
'use strict';
//merge options onto data, with data taking precedence
data = grunt.util._.merge(options, data);
data.configFile = path.resolve(data.configFile);
if (data.configFile) {
data.configFile = grunt.template.process(data.configFile);
var path = require('path');
var server = require('karma').server;
grunt.registerMultiTask('karma', 'run karma.', function(target) {
//merge data onto options, with data taking precedence
var options = grunt.util._.merge(this.options(), this.data),
done = this.async();
if (options.configFile) {
options.configFile = grunt.template.process(options.configFile);
options.configFile = path.resolve(options.configFile);
}
server.start(
data,
function(code) {
done(!code);
});
done = this.async();
server.start(options, function(code) {
done(!code);
});
});
};

13
test/karma.conf.js
View file

@ -17,12 +17,12 @@ module.exports = function(config) {
],
// list of files to exclude
exclude : [],
//exclude : [],
// use dolts reporter, as travis terminal does not support escaping sequences
// possible values: 'dots', 'progress', 'junit', 'teamcity'
// CLI --reporters progress
reporters : ['progress'],
reporters : ['spec'],
// web server port
// CLI --port 9876
@ -39,7 +39,7 @@ module.exports = function(config) {
// level of logging
// possible values: karma.LOG_DISABLE || karma.LOG_ERROR || karma.LOG_WARN || karma.LOG_INFO || karma.LOG_DEBUG
// CLI --log-level debug
logLevel : config.LOG_DEBUG,
logLevel : config.LOG_INFO,
// enable / disable watching file and executing tests whenever any file changes
// CLI --auto-watch --no-auto-watch
@ -69,14 +69,15 @@ module.exports = function(config) {
reportSlowerThan : 500,
preprocessors : {
// '**/client/js/*.js': 'coverage'
// '**/client/js/*.js': 'coverage'
},
plugins : [
'karma-mocha',
// 'karma-chrome-launcher',
'karma-chrome-launcher',
'karma-firefox-launcher',
'karma-mocha',
// 'karma-phantomjs-launcher'
'karma-spec-reporter'
]
});
};

2
test/unit/pixi/display/Stage.js
View file

@ -19,7 +19,6 @@ describe('pixi/display/Stage', function () {
expect(obj).to.respondTo('updateTransform');
expect(obj).to.respondTo('setBackgroundColor');
expect(obj).to.respondTo('getMousePosition');
// FIXME: duplicate member in DisplayObject
pixi_core_Matrix_confirmNewMat3(obj.worldTransform);
// FIXME: convert arg to bool in constructor
@ -44,6 +43,7 @@ describe('pixi/display/Stage', function () {
expect(obj).to.have.deep.property('backgroundColorSplit[2]', 0);
expect(obj).to.have.property('backgroundColorString', '#000000');
expect(obj).to.have.property('worldVisible', true);
});
});