瀏覽代碼

updated gulp commands

David Catuhe 8 年之前
父節點
當前提交
c9a9e7a957

+ 1 - 1
canvas2D/config.json

@@ -34,7 +34,7 @@
   "shadersDirectories": [
     {
       "variable": "BABYLON.Effect.ShadersStore",
-      "files": "Shaders/*.fx"
+      "files": "src/Shaders/*.fx"
     }
   ]
 }

+ 1 - 8
canvas2D/gulpfile.js

@@ -17,9 +17,7 @@ var optimisejs = require('gulp-optimize-js');
 
 var config = require("./config.json");
 
-var includeShadersStream;
 var shadersStream;
-var workersStream;
 
 var extendsSearchRegex = /var\s__extends[\s\S]+?\};/g;
 var decorateSearchRegex = /var\s__decorate[\s\S]+?\};/g;
@@ -95,12 +93,7 @@ gulp.task("default", ["shaders"], function () {
     return merge2(
         gulp.src(config.core.files).        
             pipe(expect.real({ errorOnFailure: true }, config.core.files)),
-        gulp.src(config.extras.files).        
-            pipe(expect.real({ errorOnFailure: true }, config.extras.files)),   
-        shadersStream,
-        includeShadersStream,
-        workersStream
-        )
+        shadersStream)
         .pipe(concat(config.build.filename))
         .pipe(cleants())
         .pipe(replace(extendsSearchRegex, ""))

+ 13 - 21
canvas2D/readme.md

@@ -1,7 +1,9 @@
-Build Babylon.js with Gulp
+Build Babylon.canvas2d.js with Gulp
 ====================
 
-Build Babylon.js with [gulp](http://gulpjs.com/ "gulp") and npm ([nodejs](http://nodejs.org/ "nodejs")), easy and cross-platform
+More info about [Canvas2D](http://doc.babylonjs.com/overviews/Canvas2D_Home)
+
+Build Babylon.canvas2d.js with [gulp](http://gulpjs.com/ "gulp") and npm ([nodejs](http://nodejs.org/ "nodejs")), easy and cross-platform
 
 (Paths in this file are relative to this file location.)
 
@@ -22,45 +24,35 @@ npm install
 npm update
 ```
 
-### Update config.json if you want to add your own files:
-```
-"extras" : {
-    "files": [
-        "file1.js", "file2.js"
-    ]
-}
-```
 ## From the javascript source
-### Build Babylon.js from the javascript files:
+### Build Babylon.canvas2d.js from the javascript files:
 
 ```
 gulp
 ```
 Will be generated :
-- babylon.js
-- babylon.noworker.js (minified version without collisions workers)
-- babylon.max.js (unminified)
+- babylon.canvas2d.js
+- babylon.canvas2d.max.js (unminified)
 
-### Build Babylon.js when you save a javascript file:
+### Build Babylon.canvas2d.js when you save a javascript file:
 ```
 gulp watch
 ```
 
 ## From the typescript source
-### Build Babylon.js from the typescript files:
+### Build Babylon.canvas2d.js from the typescript files:
 
 ```
 gulp typescript
 ```
 Will be generated :
-- babylon.js
-- babylon.d.ts
-- babylon.noworker.js (minified version without collisions workers)
-- babylon.max.js (unminified)
+- babylon.canvas2d.js
+- babylon.canvas2d.d.ts
+- babylon.canvas2d.max.js (unminified)
 
 Be aware that all js files content will be overwrite.
 
-### Build Babylon.js when you save a typescript file:
+### Build Babylon.canvas2d.js when you save a typescript file:
 ```
 gulp watch-typescript
 ```

+ 4 - 0
dist/preview release/babylon.canvas.d.ts

@@ -2352,6 +2352,7 @@ declare module BABYLON {
         setSize(val: any): void;
         writeData(array: Float32Array, offset: number, val: any): void;
     }
+    function instanceData<T>(category?: string, shaderAttributeName?: string): (target: Object, propName: string | symbol, descriptor: TypedPropertyDescriptor<T>) => void;
     class InstanceDataBase {
         constructor(partId: number, dataElementCount: number);
         id: number;
@@ -2728,6 +2729,9 @@ declare module BABYLON {
         protected _layoutBoundingInfo: BoundingInfo2D;
         protected _instanceDirtyFlags: number;
     }
+    function modelLevelProperty<T>(propId: number, piStore: (pi: Prim2DPropInfo) => void, typeLevelCompare?: boolean, dirtyBoundingInfo?: boolean, dirtyParentBoundingBox?: boolean): (target: Object, propName: string | symbol, descriptor: TypedPropertyDescriptor<T>) => void;
+    function instanceLevelProperty<T>(propId: number, piStore: (pi: Prim2DPropInfo) => void, typeLevelCompare?: boolean, dirtyBoundingInfo?: boolean, dirtyParentBoundingBox?: boolean): (target: Object, propName: string | symbol, descriptor: TypedPropertyDescriptor<T>) => void;
+    function dynamicLevelProperty<T>(propId: number, piStore: (pi: Prim2DPropInfo) => void, typeLevelCompare?: boolean, dirtyBoundingInfo?: boolean, dirtyParentBoundingBox?: boolean): (target: Object, propName: string | symbol, descriptor: TypedPropertyDescriptor<T>) => void;
 }
 
 declare module BABYLON {

File diff suppressed because it is too large
+ 7 - 0
dist/preview release/babylon.canvas2d.js


File diff suppressed because it is too large
+ 11167 - 0
dist/preview release/babylon.canvas2d.max.js


File diff suppressed because it is too large
+ 27 - 27
dist/preview release/babylon.core.js


File diff suppressed because it is too large
+ 5184 - 8221
dist/preview release/babylon.d.ts


File diff suppressed because it is too large
+ 16 - 16
dist/preview release/babylon.js


File diff suppressed because it is too large
+ 1 - 1
dist/preview release/babylon.max.js


File diff suppressed because it is too large
+ 4 - 4
dist/preview release/babylon.noworker.js