Explorar o código

Merge pull request #782 from jbousquie/fix.arc

Fix.arc
Raanan Weber %!s(int64=9) %!d(string=hai) anos
pai
achega
409eeafa8b
Modificáronse 2 ficheiros con 5 adicións e 5 borrados
  1. 3 3
      src/Mesh/babylon.mesh.vertexData.ts
  2. 2 2
      src/Mesh/babylon.meshBuilder.ts

+ 3 - 3
src/Mesh/babylon.mesh.vertexData.ts

@@ -690,7 +690,7 @@
             var diameterX: number = options.diameterX || options.diameter || 1;
             var diameterY: number = options.diameterY || options.diameter || 1;
             var diameterZ: number = options.diameterZ || options.diameter || 1;
-            var arc: number = (options.arc <= 0) ? 1.0 : options.arc || 1.0;
+            var arc: number = (options.arc <= 0 || options.arc > 1) ? 1.0 : options.arc || 1.0;
             var slice: number = (options.slice <= 0) ? 1.0 : options.slice || 1.0;
             var sideOrientation = (options.sideOrientation === 0) ? 0 : options.sideOrientation || Mesh.DEFAULTSIDE;
 
@@ -761,7 +761,7 @@
             var diameterBottom: number = options.diameterBottom || options.diameter || 1;
             var tessellation: number = options.tessellation || 24;
             var subdivisions: number = options.subdivisions || 1;
-            var arc: number = (options.arc <= 0) ? 1.0 : options.arc || 1.0;
+            var arc: number = (options.arc <= 0 || options.arc > 1) ? 1.0 : options.arc || 1.0;
             var sideOrientation: number = (options.sideOrientation === 0) ? 0 : options.sideOrientation || Mesh.DEFAULTSIDE;
             var faceUV: Vector4[] = options.faceUV || new Array<Vector4>(3);
             var faceColors: Color4[] = options.faceColors;
@@ -1293,7 +1293,7 @@
 
             var radius = options.radius || 0.5;
             var tessellation = options.tessellation || 64;
-            var arc: number = (options.arc <= 0) ? 1.0 : options.arc || 1.0;
+            var arc: number = (options.arc <= 0 || options.arc > 1) ? 1.0 : options.arc || 1.0;
             var sideOrientation = (options.sideOrientation === 0) ? 0 : options.sideOrientation || Mesh.DEFAULTSIDE;
 
             // positions and uvs

+ 2 - 2
src/Mesh/babylon.meshBuilder.ts

@@ -258,7 +258,7 @@
         }
 
         public static CreateLathe(name: string, options: { shape: Vector3[], radius?: number, tessellation?: number, arc?: number, closed?: boolean, updatable?: boolean, sideOrientation?: number }, scene: Scene): Mesh {
-            var arc: number = (options.arc <= 0) ? 1.0 : options.arc || 1.0;
+            var arc: number = (options.arc <= 0 || options.arc > 1) ? 1.0 : options.arc || 1.0;
             var closed: boolean = (options.closed === undefined) ? true : options.closed;
             var shape = options.shape;
             var radius = options.radius || 1;
@@ -399,7 +399,7 @@
             var updatable = options.updatable;
             var sideOrientation = options.sideOrientation || Mesh.DEFAULTSIDE;
             var instance = options.instance;
-            options.arc = (options.arc < 0) ? 1 : options.arc || 1;
+            options.arc = (options.arc <= 0 || options.arc > 1) ? 1 : options.arc || 1;
 
             // tube geometry
             var tubePathArray = (path, path3D, circlePaths, radius, tessellation, radiusFunction, cap, arc) => {