[[ Canvas ]] Change "list of Foo" to "list" in foreign handler signatures

livecodeian · livecodeian · commit f1be22d096fb · 2014-12-08T12:28:31.000Z
[[ Canvas ]] Implement hash &amp; isequal for MCCanvasPathRef type
diff --git a/engine/src/canvas.mlc b/engine/src/canvas.mlc
@@ -469,7 +469,7 @@ end syntax
 // Constructors
 
 public foreign handler MCCanvasGradientStopMake(in pOffset as CanvasFloat, in pColor as Color, out rStop as GradientStop) as undefined binds to "<builtin>"
-public foreign handler MCCanvasGradientMakeWithRamp(in pType as integer, in pRamp as list of GradientStop, out rGradient as Gradient) as undefined binds to "<builtin>"
+public foreign handler MCCanvasGradientMakeWithRamp(in pType as integer, in pRamp as list, out rGradient as Gradient) as undefined binds to "<builtin>"
 
 syntax MakeGradientStop is prefix operator with precedence 4
 	"gradient" "stop" "at" <mOffset: Expression> "with" <mColor: Expression>
@@ -505,10 +505,10 @@ public foreign handler MCCanvasGradientStopSetOffset(in pOffset as CanvasFloat,
 public foreign handler MCCanvasGradientStopGetColor(in pStop as GradientStop, out rColor as Color) as undefined binds to "<builtin>"
 public foreign handler MCCanvasGradientStopSetColor(in pColor as Color, inout xStop as GradientStop) as undefined binds to "<builtin>"
 
-public foreign handler MCCanvasGradientGetRamp(in pGradient as Gradient, out rRamp as list of GradientStop) as undefined binds to "<builtin>"
-public foreign handler MCCanvasGradientSetRamp(in pRamp as list of GradientStop, inout xGradient as Gradient) as undefined binds to "<builtin>"
-// public foreign handler MCCanvasGradientGetStops(in pGradient as Gradient, in pStart as integer, in pEnd as integer, out rStops as list of GradientStop) as undefined binds to "<builtin>"
-// public foreign handler MCCanvasGradientSetStops(in pStart as integer, in pEnd as integer, in rStops as list of GradientStop, inout xGradient as Gradient) as undefined binds to "<builtin>"
+public foreign handler MCCanvasGradientGetRamp(in pGradient as Gradient, out rRamp as list) as undefined binds to "<builtin>"
+public foreign handler MCCanvasGradientSetRamp(in pRamp as list, inout xGradient as Gradient) as undefined binds to "<builtin>"
+// public foreign handler MCCanvasGradientGetStops(in pGradient as Gradient, in pStart as integer, in pEnd as integer, out rStops as list) as undefined binds to "<builtin>"
+// public foreign handler MCCanvasGradientSetStops(in pStart as integer, in pEnd as integer, in rStops as list, inout xGradient as Gradient) as undefined binds to "<builtin>"
 public foreign handler MCCanvasGradientGetTypeAsString(in pGradient as Gradient, out rType as string) as undefined binds to "<builtin>"
 public foreign handler MCCanvasGradientSetTypeAsString(in pType as string, inout xGradient as Gradient) as undefined binds to "<builtin>"
 public foreign handler MCCanvasGradientGetRepeat(in pGradient as Gradient, out rRepeat as integer) as undefined binds to "<builtin>"
diff --git a/engine/src/module-canvas.cpp b/engine/src/module-canvas.cpp
@@ -2783,14 +2783,32 @@ static bool __MCCanvasPathEqual(MCValueRef p_left, MCValueRef p_right)
 	if (p_left == p_right)
 		return true;
 	
-	// TODO - implememt MCGPath comparison
-	return MCCanvasPathGetMCGPath((MCCanvasPathRef)p_left) == MCCanvasPathGetMCGPath((MCCanvasPathRef)p_right);
+	return MCGPathIsEqualTo(MCCanvasPathGetMCGPath(p_left), MCCanvasPathGetMCGPath(p_right));
+}
+
+bool __MCCanvasPathHashCallback(void *p_context, MCGPathCommand p_command, MCGPoint *p_points, uint32_t p_point_count)
+{
+	hash_t *t_hash;
+	t_hash = static_cast<hash_t*>(p_context);
+	
+	t_hash ^= MCHashInteger(p_command);
+	for (uint32_t i = 0; i < p_point_count; i++)
+	{
+		t_hash ^= MCHashDouble(p_points[i].x);
+		t_hash ^= MCHashDouble(p_points[i].y);
+	}
+	
+	return true;
 }
 
 static hash_t __MCCanvasPathHash(MCValueRef p_value)
 {
-	// TODO - implement MCGPath hash
-	return MCHashBytes(MCValueGetExtraBytesPtr(p_value), sizeof(__MCCanvasPathImpl));
+	hash_t t_hash;
+	t_hash = 0;
+	
+	/* UNCHECKED */ MCGPathIterate(MCCanvasPathGetMCGPath((MCCanvasPathRef)p_value), __MCCanvasPathHashCallback, &t_hash);
+	
+	return t_hash;
 }
 
 static bool __MCCanvasPathDescribe(MCValueRef p_value, MCStringRef &r_desc)
diff --git a/libgraphics/include/graphics.h b/libgraphics/include/graphics.h
@@ -735,6 +735,7 @@ void MCGPathRelease(MCGPathRef path);
 
 bool MCGPathIsValid(MCGPathRef path);
 bool MCGPathIsEmpty(MCGPathRef path);
+bool MCGPathIsEqualTo(MCGPathRef a, MCGPathRef b);
 
 void MCGPathCopy(MCGPathRef path, MCGPathRef& r_new_path);
 void MCGPathCopyAndRelease(MCGPathRef path, MCGPathRef& r_new_path);
diff --git a/libgraphics/src/path.cpp b/libgraphics/src/path.cpp
@@ -109,6 +109,11 @@ bool MCGPathIsEmpty(MCGPathRef self)
 	return self -> path -> isEmpty();
 }
 
+bool MCGPathIsEqualTo(MCGPathRef a, MCGPathRef b)
+{
+	return *a->path == *b->path;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 void MCGPathCopy(MCGPathRef self, MCGPathRef& r_new_path)
