瀏覽代碼

Merge branch 'features/ncoder/references2' into features/ncoder/references

# Conflicts:
#	src/Layer/babylon.highlightlayer.ts
Nicolas Coderre 8 年之前
父節點
當前提交
20ec44c22e
共有 3 個文件被更改,包括 8 次插入2 次删除
  1. 4 1
      src/Cameras/babylon.arcRotateCamera.ts
  2. 1 0
      src/Layer/babylon.highlightlayer.ts
  3. 3 1
      src/babylon.node.ts

+ 4 - 1
src/Cameras/babylon.arcRotateCamera.ts

@@ -1,4 +1,7 @@
-module BABYLON {
+/// <reference path="babylon.targetCamera.ts" />
+/// <reference path="..\Tools\babylon.tools.ts" />
+
+module BABYLON {
     export class ArcRotateCamera extends TargetCamera {
         @serialize()
         public alpha: number;

+ 1 - 0
src/Layer/babylon.highlightlayer.ts

@@ -1,4 +1,5 @@
 /// <reference path="..\PostProcess\babylon.postProcess.ts" />
+/// <reference path="..\Math\babylon.math.ts" />
 
 module BABYLON {
     /**

+ 3 - 1
src/babylon.node.ts

@@ -1,4 +1,6 @@
-module BABYLON {
+/// <reference path="Tools\babylon.decorators.ts" />
+
+module BABYLON {
 
     /**
      * Node is the basic class for all scene objects (Mesh, Light Camera).