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
This commit is contained in:
Mat Groves 2013-10-29 16:59:05 +00:00
commit 2829575604
39 changed files with 49 additions and 170570 deletions
Download patch file Download diff file Expand all files Collapse all files

67
Gruntfile.js
View file

@ -1,10 +1,12 @@
module.exports = function(grunt) { module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-concat-sourcemap');
grunt.loadNpmTasks('grunt-contrib-concat'); grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-jshint'); grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-connect'); grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-contrib-qunit'); grunt.loadNpmTasks('grunt-contrib-qunit');
grunt.loadNpmTasks('grunt-contrib-yuidoc'); grunt.loadNpmTasks('grunt-contrib-yuidoc');
grunt.loadNpmTasks('grunt-contrib-watch');
var root = 'src/pixi/', var root = 'src/pixi/',
debug = 'bin/pixi.dev.js', debug = 'bin/pixi.dev.js',
@ -79,7 +81,6 @@ module.exports = function(grunt) {
dirs: { dirs: {
build: 'bin', build: 'bin',
docs: 'docs', docs: 'docs',
examples: 'examples',
src: 'src/pixi', src: 'src/pixi',
test: 'test' test: 'test'
}, },
@ -98,6 +99,16 @@ module.exports = function(grunt) {
dest: '<%= files.build %>' dest: '<%= files.build %>'
} }
}, },
concat_sourcemap: {
dev: {
files: {
'<%= files.build %>': srcFiles
},
options: {
sourceRoot: '../'
}
}
},
jshint: { jshint: {
beforeconcat: srcFiles, beforeconcat: srcFiles,
test: ['<%= files.testBlob %>'], test: ['<%= files.testBlob %>'],
@ -115,26 +126,6 @@ module.exports = function(grunt) {
dest: '<%= files.buildMin %>' dest: '<%= files.buildMin %>'
} }
}, },
distribute: {
examples: [
'examples/example 1 - Basics',
'examples/example 2 - SpriteSheet',
'examples/example 3 - MovieClip',
'examples/example 4 - Balls',
'examples/example 5 - Morph',
'examples/example 6 - Interactivity',
'examples/example 7 - Transparent Background',
'examples/example 8 - Dragging',
'examples/example 9 - Tiling Texture',
'examples/example 10 - Text',
'examples/example 11 - RenderTexture',
'examples/example 12 - Spine',
'examples/example 13 - Graphics',
'examples/example 14 - Masking',
'examples/example 15 - Filters',
'examples/example 16 - Displacement'
]
},
connect: { connect: {
qunit: { qunit: {
options: { options: {
@ -169,29 +160,23 @@ module.exports = function(grunt) {
outdir: '<%= dirs.docs %>' outdir: '<%= dirs.docs %>'
} }
} }
},
watch: {
dev: {
files: ['Gruntfile.js', 'src/**/*.js', 'examples/**/*.html'],
tasks: ['build-debug'],
// We would need to inject <script> in each HTML...
// options: {
// livereload: true
// }
}
} }
}); });
grunt.registerMultiTask( grunt.registerTask('build-debug', ['concat_sourcemap', 'uglify'])
'distribute', grunt.registerTask('default', ['concat', 'uglify']);
'Copy built file to examples', grunt.registerTask('build', ['concat', 'uglify']);
function(){
var pixi = grunt.file.read( debug );
var dests = this.data;
dests.forEach(function(filepath){
grunt.file.write(filepath + '/pixi.js', pixi);
});
grunt.log.writeln('Pixi copied to examples.');
}
)
grunt.registerTask('default', ['concat', 'uglify', 'distribute']);
grunt.registerTask('build', ['concat', 'uglify', 'distribute']);
grunt.registerTask('test', ['build', 'connect:qunit', 'qunit']); grunt.registerTask('test', ['build', 'connect:qunit', 'qunit']);
grunt.registerTask('docs', ['yuidoc']); grunt.registerTask('docs', ['yuidoc']);

2
examples/example 1 - Basics/index.html
View file

@ -9,7 +9,7 @@
background-color: #000000; background-color: #000000;
} }
</style> </style>
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
</head> </head>
<body> <body>

10649
examples/example 1 - Basics/pixi.js
View file

File diff suppressed because it is too large Load diff

2
examples/example 10 - Text/index.html
View file

@ -12,7 +12,7 @@
</style> </style>
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
</head> </head>
<body> <body>
<script> <script>

10649
examples/example 10 - Text/pixi.js
View file

File diff suppressed because it is too large Load diff

2
examples/example 11 - RenderTexture/index.html
View file

@ -11,7 +11,7 @@
</style> </style>
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
</head> </head>
<body> <body>
<script> <script>

10649
examples/example 11 - RenderTexture/pixi.js
View file

File diff suppressed because it is too large Load diff

2
examples/example 12 - Spine/index.html
View file

@ -11,7 +11,7 @@
</style> </style>
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
</head> </head>
<body> <body>
<script> <script>

2
examples/example 12 - Spine/index_dragon.html
View file

@ -11,7 +11,7 @@
</style> </style>
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
</head> </head>
<body> <body>

2
examples/example 12 - Spine/index_goblins.html
View file

@ -11,7 +11,7 @@
</style> </style>
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
</head> </head>
<body> <body>
<script> <script>

2
examples/example 12 - Spine/index_pixie.html
View file

@ -11,7 +11,7 @@
</style> </style>
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
</head> </head>
<body> <body>
<script> <script>

10649
examples/example 12 - Spine/pixi.js
View file

File diff suppressed because it is too large Load diff

2
examples/example 13 - Graphics/index.html
View file

@ -10,7 +10,7 @@
} }
</style> </style>
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
</head> </head>
<body> <body>

10649
examples/example 13 - Graphics/pixi.js
View file

File diff suppressed because it is too large Load diff

2
examples/example 14 - Masking/Copy of index.html
View file

@ -10,7 +10,7 @@
} }
</style> </style>
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
</head> </head>
<body> <body>
<script> <script>

2
examples/example 14 - Masking/index double mask.html
View file

@ -10,7 +10,7 @@
} }
</style> </style>
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
</head> </head>
<body> <body>
<script> <script>

2
examples/example 14 - Masking/index.html
View file

@ -10,7 +10,7 @@
} }
</style> </style>
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
</head> </head>
<body> <body>
<script> <script>

10649
examples/example 14 - Masking/pixi.js
View file

File diff suppressed because it is too large Load diff

2
examples/example 15 - Filters/index.html
View file

@ -10,7 +10,7 @@
} }
</style> </style>
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
</head> </head>
<body> <body>
<script> <script>

10649
examples/example 15 - Filters/pixi.js
View file

File diff suppressed because it is too large Load diff

2
examples/example 16 - Displacement/index.html
View file

@ -10,7 +10,7 @@
} }
</style> </style>
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
<script src="../../src/pixi/filters/DisplacementFilter.js"></script> <script src="../../src/pixi/filters/DisplacementFilter.js"></script>
<script src="../../src/pixi/renderers/webgl/PixiShader.js"></script> <script src="../../src/pixi/renderers/webgl/PixiShader.js"></script>
</head> </head>

10773
examples/example 16 - Displacement/pixi.js
View file

File diff suppressed because it is too large Load diff

2
examples/example 2 - SpriteSheet/index.html
View file

@ -9,7 +9,7 @@
background-color: #000000; background-color: #000000;
} }
</style> </style>
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
</head> </head>
<body> <body>
<script> <script>

10649
examples/example 2 - SpriteSheet/pixi.js
View file

File diff suppressed because it is too large Load diff

2
examples/example 3 - MovieClip/index.html
View file

@ -9,7 +9,7 @@
background-color: #000000; background-color: #000000;
} }
</style> </style>
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
</head> </head>
<body> <body>
<script> <script>

10649
examples/example 3 - MovieClip/pixi.js
View file

File diff suppressed because it is too large Load diff

2
examples/example 4 - Balls/index.html
View file

@ -6,7 +6,7 @@
<meta name="viewport" content="initial-scale=1 maximum-scale=1 user-scalable=0" /> <meta name="viewport" content="initial-scale=1 maximum-scale=1 user-scalable=0" />
<link rel="stylesheet" href="storm.css"> <link rel="stylesheet" href="storm.css">
<script src="jquery-1.8.3.min.js"></script> <script src="jquery-1.8.3.min.js"></script>
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
</head> </head>
<body> <body>

10649
examples/example 4 - Balls/pixi.js
View file

File diff suppressed because it is too large Load diff

2
examples/example 5 - Morph/index.html
View file

@ -6,7 +6,7 @@
<meta name="viewport" content="initial-scale=1 maximum-scale=1 user-scalable=0" /> <meta name="viewport" content="initial-scale=1 maximum-scale=1 user-scalable=0" />
<link rel="stylesheet" href="storm.css"> <link rel="stylesheet" href="storm.css">
<script src="jquery-1.8.3.min.js"></script> <script src="jquery-1.8.3.min.js"></script>
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
</head> </head>
<body> <body>

10649
examples/example 5 - Morph/pixi.js
View file

File diff suppressed because it is too large Load diff

2
examples/example 6 - Interactivity/index.html
View file

@ -20,7 +20,7 @@
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
</head> </head>
<body> <body>
<script> <script>

10649
examples/example 6 - Interactivity/pixi.js
View file

File diff suppressed because it is too large Load diff

2
examples/example 7 - Transparent Background/index.html
View file

@ -13,7 +13,7 @@
width: 400px; width: 400px;
} }
</style> </style>
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
<script src="../../src/pixi/renderers/WebGLRenderer.js"></script> <script src="../../src/pixi/renderers/WebGLRenderer.js"></script>
</head> </head>
<body> <body>

10649
examples/example 7 - Transparent Background/pixi.js
View file

File diff suppressed because it is too large Load diff

2
examples/example 8 - Dragging/index.html
View file

@ -14,7 +14,7 @@
width: 400px; width: 400px;
} }
</style> </style>
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
</head> </head>
<body> <body>
<script> <script>

10649
examples/example 8 - Dragging/pixi.js
View file

File diff suppressed because it is too large Load diff

2
examples/example 9 - Tiling Texture/index.html
View file

@ -14,7 +14,7 @@
width: 400px; width: 400px;
} }
</style> </style>
<script src="pixi.js"></script> <script src="../../bin/pixi.dev.js"></script>
</head> </head>
<body> <body>
<script> <script>

10649
examples/example 9 - Tiling Texture/pixi.js
View file

File diff suppressed because it is too large Load diff

2
package.json
View file

@ -26,6 +26,8 @@
"grunt-contrib-connect": "0.2.x", "grunt-contrib-connect": "0.2.x",
"grunt-contrib-qunit": "0.2.x", "grunt-contrib-qunit": "0.2.x",
"grunt-contrib-yuidoc": "0.4.x", "grunt-contrib-yuidoc": "0.4.x",
"grunt-contrib-concat": "0.1.x",
"grunt-concat-sourcemap": "0.3.x",
"grunt-contrib-concat": "0.1.x" "grunt-contrib-concat": "0.1.x"
} }
} }