Bezier curve based animation now properly samples curves based on x (not t) except for quaternion curve animations, entity mouse events now contain ray depth information, entity editor will now select closest entity at first click, added visibility layers to SceneEntityInstance and visibility layer sheets to the entity editor

Author: ivansafrin

Bindings/Scripts/create_lua_library/create_lua_library.py

@@ -52,6 +52,7 @@ def typeFilter(ty):
 	ty = ty.replace("virtual", "")
 	ty = ty.replace("&", "")
 	ty = re.sub(r'^.*\sint\s*$', 'int', ty) # eg "unsigned int"
+	ty = re.sub(r'^.*\schar\s*$', 'char', ty) # eg "unsigned int"
 	ty = re.sub(r'^.*\slong\s*$', 'int', ty)
 	ty = re.sub(r'^.*\sshort\s*$', 'int', ty)
 	ty = re.sub(r'^.*\sfloat\s*$', 'Number', ty)

Core/Contents/Include/PolyBezierCurve.h

@@ -26,11 +26,10 @@
 
 #include "PolyGlobals.h"
 #include "PolyVector3.h"
+#include "PolyVector2.h"
 #include <vector>
 
 
-#define BUFFER_CACHE_PRECISION 100
-
 namespace Polycode {
 
 	/** 
@@ -143,12 +142,6 @@ namespace Polycode {
 		*/										
 		void addControlPoint2d(Number x, Number y);
 
-		/**
-		* Returns the height of the curve at a specified point on the curve. Heights are cached into a buffer with a finite cache precision to speed up the curve usage in animation. If you need to quickly get 2D height out of a curve and you don't care about total precision, use this method.
-		* @param a Normalized (0-1) position along the curve.
-		* @return Height value at specified position.
-		*/												
-		Number getHeightAt(Number a);
 
 		/**
 		* Returns the 3d point of the curve at a specified point on the curve.
@@ -163,33 +156,33 @@ namespace Polycode {
 		* @return 3d point at specified position.
 		*/																				
 		Vector3 getPointBetween(Number a, BezierPoint *bp1, BezierPoint *bp2);
-		
+
 		void clearControlPoints();
-		
-		/** 
-		* Rebuilds the height cache buffers for 2d height curves.
-		*/	
-		void rebuildBuffers();
+        
+        Number getYValueAtX(Number x);
+		Number getTValueAtX(Number x);
 
 		/**
 		* Removes (and deletes!) a given point by pointer
 		*/
 		void removePoint(BezierPoint *point);
-
-		Number heightBuffer[BUFFER_CACHE_PRECISION];
-
+        
 		BezierPoint *insertPoint;
 
 		std::vector<BezierPoint*> controlPoints;
 		std::vector<Number> distances;
 
-		void recalculateDistances();		
+		void recalculateDistances();
+		
+        Number evaluationAccuracy;
 
 		protected:
 
+            Number minX;
+            Number maxX;
+            Number midX;
+        
             bool distancesDirty;
-
-	
 
 	};
 

Core/Contents/Include/PolyEntity.h

@@ -641,7 +641,10 @@ namespace Polycode {
 
 			Entity *getEntityById(String id, bool recursive) const;
 			std::vector<Entity*> getEntitiesByTag(String tag, bool recursive) const;
-			
+
+            std::vector<Entity*> getEntitiesByLayerID(unsigned char layerID, bool recursive) const;
+        
+        
 			std::vector <EntityProp> entityProps;
 			String getEntityProp(const String& propName);
 			void setEntityProp(const String& propName, const String& propValue);
@@ -716,6 +719,8 @@ namespace Polycode {
             void setLocalBoundingBoxZ(Number z);
 
             bool rendererVis;
+        
+            unsigned char layerID;
 
 		protected:
 

Core/Contents/Include/PolyInputEvent.h

@@ -115,6 +115,8 @@ namespace Polycode {
 		unsigned int joystickButton;
 		unsigned int joystickAxis;
 		unsigned int joystickIndex;
+        
+        Number hitDistance;
 
 		protected:
 

Core/Contents/Include/PolyQuaternionCurve.h

@@ -33,7 +33,8 @@ namespace Polycode {
 		public:
 		Quaternion q1;
 		Quaternion q2;
-		Quaternion q3;		
+		Quaternion q3;
+        Number time;
 	};	
 
 	class _PolyExport QuaternionCurve : public PolyBase {
@@ -45,12 +46,9 @@ namespace Polycode {
 			Quaternion interpolate(unsigned int fromIndex, Number t, bool useShortestPath);
 
 			void generatePointsFromCurves(BezierCurve *wCurve, BezierCurve *xCurve, BezierCurve *yCurve, BezierCurve *zCurve);
-			void recalcTangents();
 
 		protected:
 
 			std::vector<QuatTriple> tPoints;
-			std::vector<Quaternion> points;
-			std::vector<Quaternion> tangents;
 	};
 }

Core/Contents/Include/PolyRay.h

@@ -36,7 +36,7 @@ namespace Polycode {
 			Ray();
 			Ray(const Vector3 &origin, const Vector3 &direction);
 
-			bool boxIntersect(const Vector3 &box, const Matrix4 &transformMatrix, float near = 0.0, float far = 9999.0) const;
+			Number boxIntersect(const Vector3 &box, const Matrix4 &transformMatrix, float near = 0.0, float far = 9999.0) const;
 
 			Vector3 planeIntersectPoint(const Vector3 &planeNormal, Number planeDistance) const;
 			Ray tranformByMatrix(const Matrix4& matrix) const;

Core/Contents/Include/PolySceneEntityInstance.h

@@ -36,7 +36,8 @@ THE SOFTWARE.
 namespace Polycode {
 
 class SceneEntityInstanceResourceEntry;
-
+    class SceneEntityInstanceLayer;
+    
 class SceneEntityInstance : public Entity {
 	public:
 
@@ -69,6 +70,13 @@ class SceneEntityInstance : public Entity {
 
         ResourcePool *getTopLevelResourcePool();
 
+        bool hasLayerID(unsigned char layerID) const;
+        unsigned int getNumLayers() const;
+        SceneEntityInstanceLayer *getLayerAtIndex(unsigned int index) const;
+        void removeLayer(SceneEntityInstanceLayer *layer);
+    
+    
+        SceneEntityInstanceLayer *createNewLayer(String name);
 
 		String getFileName() const;
 		bool cloneUsingReload;
@@ -77,6 +85,8 @@ class SceneEntityInstance : public Entity {
 
 	protected:
 
+        std::vector<SceneEntityInstanceLayer*> layers;
+    
         void rebuildResourceLinks();
 
         ResourcePool *topLevelResourcePool;
@@ -85,6 +95,19 @@ class SceneEntityInstance : public Entity {
 		SceneEntityInstanceResourceEntry *resourceEntry;
 
 };
+    
+class SceneEntityInstanceLayer {
+    public:
+        SceneEntityInstanceLayer(SceneEntityInstance *instance,String name);
+    
+        void setLayerVisibility(bool val);
+    
+        String name;
+        unsigned char layerID;
+        bool visible;
+        SceneEntityInstance *instance;
+};
+
 
 class SceneEntityInstanceResourceEntry : public Resource {
 	public:

Core/Contents/Include/PolySkeleton.h

@@ -27,6 +27,7 @@ THE SOFTWARE.
 #include "PolyColor.h"
 #include "PolyVector3.h"
 #include "PolyQuaternion.h"
+#include "PolyQuaternionCurve.h"
 #include "PolyEntity.h"
 #include <vector>
 
@@ -40,13 +41,11 @@ namespace Polycode {
 	class _PolyExport BoneTrack : public PolyBase {
 		public:
 			BoneTrack(Bone *bone, Number length);
-        
-            void initTweens();
 			~BoneTrack();
 
 			void Play(bool once=false);
 			void Stop();
-			void Update();
+			void Update(Number elapsed);
             void Reset();
 
 			void setSpeed(Number speed);
@@ -62,30 +61,21 @@ namespace Polycode {
 			BezierCurve *LocY;
 			BezierCurve *LocZ;
 
-			Vector3 LocXVec;
-			Vector3 LocYVec;
-			Vector3 LocZVec;						
-
-			Vector3 ScaleXVec;
-			Vector3 ScaleYVec;
-			Vector3 ScaleZVec;						
-		
-		
+			Vector3 position;
+            Vector3 scale;
 			Quaternion boneQuat;
-			QuaternionTween *quatTween;
-			
-			Vector3 QuatWVec;
-			Vector3 QuatXVec;
-			Vector3 QuatYVec;			
-			Vector3 QuatZVec;		
-		
+            QuaternionCurve *quatCurve;
+        
             Number weight;
 
 		protected:
 
 			Number length;
+            Number speed;
+            bool paused;
+            Number time;
 			Bone *targetBone;
-			std::vector <BezierPathTween*> pathTweens;
+            bool playOnce;
 
 	};
 

Core/Contents/Source/PolyBezierCurve.cpp

@@ -39,19 +39,12 @@ BezierPoint::BezierPoint(Number p1x, Number p1y, Number p1z, Number p2x, Number
 
 BezierCurve::BezierCurve(){
 	insertPoint = NULL;
-	for(int i=0; i < BUFFER_CACHE_PRECISION; i++) {
-		heightBuffer[i] = 0;
-	}
-	
+	evaluationAccuracy = 0.01;
     distancesDirty =  false;
 }
 
 void BezierCurve::clearControlPoints() {
 	insertPoint = NULL;
-	for(int i=0; i < BUFFER_CACHE_PRECISION; i++) {
-		heightBuffer[i] = 0;
-	}
-	
     distancesDirty =  true;
 	for(int i=0; i < controlPoints.size(); i++) {
 		delete controlPoints[i];
@@ -103,6 +96,7 @@ void BezierCurve::addControlPoint2d(Number x, Number y) {
 void BezierCurve::recalculateDistances() {
 	if(controlPoints.size() < 2)
 		return;
+    
     distancesDirty = false;
 
 	Number dist, lastDist = 0;
@@ -128,7 +122,10 @@ void BezierCurve::recalculateDistances() {
 		distances[i] = distances[i]/totalDistance;
 	}
 
-    rebuildBuffers();
+    minX = getPointAt(0.0).x;
+    maxX = getPointAt(1.0).x;
+    midX = getPointAt(0.5).x;
+    
 }
 
 Vector3 BezierCurve::getPointBetween(Number a, BezierPoint *bp1, BezierPoint *bp2) {
@@ -142,6 +139,46 @@ Vector3 BezierCurve::getPointBetween(Number a, BezierPoint *bp1, BezierPoint *bp
 	return retVector;
 }
 
+Number BezierCurve::getYValueAtX(Number x) {
+    return getPointAt(getTValueAtX(x)).y;
+}
+
+Number BezierCurve::getTValueAtX(Number x) {
+    if(controlPoints.size() < 2) {
+		return 0;
+    }
+    
+	if (distancesDirty)  {
+        recalculateDistances();
+    }    
+    
+    if(x <= minX) {
+        return 0.0;
+    }
+    if(x >= maxX) {
+        return 1.0;
+    }
+    
+    Number _x = midX;
+    
+    Number lower = 0.0;
+    Number upper = 1.0;
+    Number percent = (upper + lower) / 2.0;
+    
+    while(fabs(x - _x) > evaluationAccuracy) {
+        if(x  > _x) {
+            lower = percent;
+        } else {
+            upper = percent;
+        }
+        
+        percent = (upper + lower) / 2.0;
+        _x = getPointAt(percent).x;
+    }
+    
+    return percent;
+}
+
 BezierPoint *BezierCurve::getControlPoint(unsigned int index) {
 	return controlPoints[index];
 } 
@@ -161,26 +198,6 @@ void BezierCurve::removePoint(BezierPoint *point) {
     distancesDirty =  true;
 }
 
-Number BezierCurve::getHeightAt(Number a) {
-	if (distancesDirty)  {
-        recalculateDistances();
-    }
-	
-	int unsigned index = ((Number)(BUFFER_CACHE_PRECISION)) * a;
-	
-	if(index > BUFFER_CACHE_PRECISION-1)
-		index = BUFFER_CACHE_PRECISION-1;
-	return heightBuffer[index];
-	
-//	return getPointAt(a).y;
-}
-
-void BezierCurve::rebuildBuffers() {
-	for(int i=0; i < BUFFER_CACHE_PRECISION; i++) {
-		heightBuffer[i]	= getPointAt(((Number)i)/((Number)BUFFER_CACHE_PRECISION)).y;
-	}
-}
-
 Vector3 BezierCurve::getPointAt(Number a) {
 
 	if (distancesDirty)  {