remove ballsocketjoint, add vec2, vec3, vec4 script attribute types

build/dependencies.txt

@@ -131,9 +131,6 @@
 ../src/framework/components/physics/collision/collision_system.js
 ../src/framework/components/physics/collision/collision_component.js
 ../src/framework/components/physics/collision/collision_data.js
-../src/framework/components/physics/joints/ballsocketjoint_system.js
-../src/framework/components/physics/joints/ballsocketjoint_component.js
-../src/framework/components/physics/joints/ballsocketjoint_data.js
 ../src/framework/components/particlesystem/particlesystem_system.js
 ../src/framework/components/particlesystem/particlesystem_component.js
 ../src/framework/components/particlesystem/particlesystem_data.js

src/framework/components/particlesystem/particlesystem_system.js

@@ -66,8 +66,8 @@ pc.extend(pc, function() {
         ];
 
         this.propertyTypes = {
-            emitterExtents: 'vector',
-            wrapBounds: 'vector',
+            emitterExtents: 'vec3',
+            wrapBounds: 'vec3',
             localVelocityGraph: 'curveset',
             localVelocityGraph2: 'curveset',
             velocityGraph: 'curveset',
@@ -103,7 +103,7 @@ pc.extend(pc, function() {
                     data[prop] = _data[prop];
                 }
 
-                if (types[prop] === 'vector') {
+                if (types[prop] === 'vec3') {
                     if (pc.type(data[prop]) === 'array') {
                         data[prop] = new pc.Vec3(data[prop][0], data[prop][1], data[prop][2]);
                     }

src/framework/components/script/script_system.js

@@ -559,14 +559,22 @@ pc.extend(pc, function () {
                                       new pc.Color(attribute.value[0], attribute.value[1], attribute.value[2]) :
                                       new pc.Color(attribute.value[0], attribute.value[1], attribute.value[2], attribute.value[3]);
                 }
-            } else if (attribute.type === 'vector') {
-                if (pc.type(attribute.value) === 'array') {
+            } else if (attribute.type === 'vec2') {
+                if (pc.type(attribute.value) === 'array')
+                    attribute.value = new pc.Vec2(attribute.value[0], attribute.value[1]);
+
+            } else if (attribute.type === 'vec3' || attribute.type === 'vector') {
+                if (pc.type(attribute.value) === 'array')
                     attribute.value = new pc.Vec3(attribute.value[0], attribute.value[1], attribute.value[2]);
-                }
+
+            } else if (attribute.type === 'vec4') {
+                if (pc.type(attribute.value) === 'array')
+                    attribute.value = new pc.Vec4(attribute.value[0], attribute.value[1], attribute.value[2], attribute.value[3]);
+
             } else if (attribute.type === 'entity') {
-                if (attribute.value !== null && typeof attribute.value === 'string') {
+                if (attribute.value !== null && typeof attribute.value === 'string')
                     attribute.value = this.app.root.findByGuid(attribute.value);
-                }
+
             } else if (attribute.type === 'curve' || attribute.type === 'colorcurve') {
                 var curveType = attribute.value.keys[0] instanceof Array ? pc.CurveSet : pc.Curve;
                 attribute.value = new curveType(attribute.value.keys);

src/framework/framework_application.js

@@ -93,7 +93,6 @@ pc.extend(pc, function () {
 
         var rigidbodysys = new pc.RigidBodyComponentSystem(this);
         var collisionsys = new pc.CollisionComponentSystem(this);
-        var ballsocketjointsys = new pc.BallSocketJointComponentSystem(this);
         var animationsys = new pc.AnimationComponentSystem(this);
         var modelsys = new pc.ModelComponentSystem(this);
         var camerasys = new pc.CameraComponentSystem(this);