Skip to content

Commit

Permalink
Merge pull request #4861 from shehzan10/fix-EllipsoidPrimitiveSpec
Browse files Browse the repository at this point in the history
Fix the ellipsoid primitive spec for Matrix 4 fromScale -> fromUniformScale
  • Loading branch information
pjcozzi authored Jan 12, 2017
2 parents e440efc + bdbe031 commit bc2d859
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Specs/Scene/EllipsoidPrimitiveSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ defineSuite([
var e = new EllipsoidPrimitive({
center : new Cartesian3(1.0, 2.0, 3.0),
radii : new Cartesian3(4.0, 5.0, 6.0),
modelMatrix : Matrix4.fromScale(2.0),
modelMatrix : Matrix4.fromUniformScale(2.0),
show : false,
material : material,
id : 'id',
Expand All @@ -64,7 +64,7 @@ defineSuite([

expect(e.center).toEqual(new Cartesian3(1.0, 2.0, 3.0));
expect(e.radii).toEqual(new Cartesian3(4.0, 5.0, 6.0));
expect(e.modelMatrix).toEqual(Matrix4.fromScale(2.0));
expect(e.modelMatrix).toEqual(Matrix4.fromUniformScale(2.0));
expect(e.show).toEqual(false);
expect(e.material).toBe(material);
expect(e.id).toEqual('id');
Expand Down

0 comments on commit bc2d859

Please sign in to comment.