improved debugtools

minor fixes

.hg_archival.txt

@@ -1,5 +1,5 @@
 repo: b6d71054df5712e643a0685bc3ba54b123db5729
-node: 87a8c46f051d17efdf9b55585fee8dc5b99adb52
+node: d83a31464c793f8339a1f731fbf0c51e11b8972a
 branch: default
 latesttag: oldrender
-latesttagdistance: 339
+latesttagdistance: 347

examples/Demo/proj.ios/demo_ios.xcodeproj/project.pbxproj

@@ -27,9 +27,8 @@
 		C8860D93875589970329DCCD /* ../src/test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DA100C319512824B7570663 /* ../src/test.cpp */; };
 		1E839D002B2BA83FC83A695A /* ../data/demo in Sources */ = {isa = PBXBuildFile; fileRef = 04FE4D4FB640E0DF92DFB865 /* ../data/demo */; };
 		3A631A475DE035FC53ADE5EA /* ../data/ext in Sources */ = {isa = PBXBuildFile; fileRef = 7F3B12E3C9D554D9FE28101D /* ../data/ext */; };
-		CD59C69314E9E74CD0A11E03 /* ../data/ident.free in Sources */ = {isa = PBXBuildFile; fileRef = F6123B1E6FE4471A00F49751 /* ../data/ident.free */; };
-		EFF139F8BA484314F7AAF645 /* ../data/images in Sources */ = {isa = PBXBuildFile; fileRef = 5DE458993031811A4C7D28C1 /* ../data/images */; };
-		F2CFD518E4E2E05ECEDBB262 /* ../data/xmls in Sources */ = {isa = PBXBuildFile; fileRef = BA41FC88D76540A6905224D6 /* ../data/xmls */; };
+		CD59C69314E9E74CD0A11E03 /* ../data/images in Sources */ = {isa = PBXBuildFile; fileRef = F6123B1E6FE4471A00F49751 /* ../data/images */; };
+		EFF139F8BA484314F7AAF645 /* ../data/xmls in Sources */ = {isa = PBXBuildFile; fileRef = 5DE458993031811A4C7D28C1 /* ../data/xmls */; };
 
 /* End PBXBuildFile section */
 
@@ -83,28 +82,27 @@
 		360377333740D8A2FD15BBE6 /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
 		0BF9628FC8D38F9748F0CDEB /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
 		4DA100C319512824B7570663 /* ../src/test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = test.cpp; path = ../src/test.cpp; sourceTree = "<group>"; };
-		2CE4BD5BB9DEF92439C0AB58 /* ../src/TestBox9Sprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestBox9Sprite.h; path = ../src/TestBox9Sprite.h; sourceTree = "<group>"; };
-		F196143B0370A9D348494ACC /* ../src/TestClipRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestClipRect.h; path = ../src/TestClipRect.h; sourceTree = "<group>"; };
-		7746CA7A63049ED8F7D6BF42 /* ../src/TestDrag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestDrag.h; path = ../src/TestDrag.h; sourceTree = "<group>"; };
-		D954BD82D7708B65A08FB6B9 /* ../src/TestInputText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestInputText.h; path = ../src/TestInputText.h; sourceTree = "<group>"; };
-		BD0E956CC3A2F7EB94822B5C /* ../src/TestManageRes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestManageRes.h; path = ../src/TestManageRes.h; sourceTree = "<group>"; };
-		7623D793B59EF0CD569E6EC2 /* ../src/TestMask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestMask.h; path = ../src/TestMask.h; sourceTree = "<group>"; };
-		AFA30E959880563E6ABBBC4F /* ../src/TestPerf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestPerf.h; path = ../src/TestPerf.h; sourceTree = "<group>"; };
-		B52CCD463855CF91A7FBDB8E /* ../src/TestProgressBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestProgressBar.h; path = ../src/TestProgressBar.h; sourceTree = "<group>"; };
-		7EEFDEEC289FCBB5FA67F822 /* ../src/TestRender2Texture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestRender2Texture.h; path = ../src/TestRender2Texture.h; sourceTree = "<group>"; };
-		4E9DE6A8FCBDF43BC876EC90 /* ../src/TestSliding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestSliding.h; path = ../src/TestSliding.h; sourceTree = "<group>"; };
-		8F2AFB956EEAEED67C5B7571 /* ../src/TestTexel2Pixel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestTexel2Pixel.h; path = ../src/TestTexel2Pixel.h; sourceTree = "<group>"; };
-		047F6BD19F885FF186A1447C /* ../src/TestText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestText.h; path = ../src/TestText.h; sourceTree = "<group>"; };
-		C570FAEF487CD34B62389F89 /* ../src/TestTextureFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestTextureFormat.h; path = ../src/TestTextureFormat.h; sourceTree = "<group>"; };
-		2418B9A339E6004913AF5980 /* ../src/TestTweens.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestTweens.h; path = ../src/TestTweens.h; sourceTree = "<group>"; };
-		CAD9D6A98986EA8082368448 /* ../src/TestUserShader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestUserShader.h; path = ../src/TestUserShader.h; sourceTree = "<group>"; };
-		67194AC90FEA68E7C96E6907 /* ../src/example.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = example.h; path = ../src/example.h; sourceTree = "<group>"; };
-		5AFC0664D7BA80AE2A75BF0E /* ../src/test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = test.h; path = ../src/test.h; sourceTree = "<group>"; };
+		BA41FC88D76540A6905224D6 /* ../src/TestBox9Sprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestBox9Sprite.h; path = ../src/TestBox9Sprite.h; sourceTree = "<group>"; };
+		2CE4BD5BB9DEF92439C0AB58 /* ../src/TestClipRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestClipRect.h; path = ../src/TestClipRect.h; sourceTree = "<group>"; };
+		F196143B0370A9D348494ACC /* ../src/TestDrag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestDrag.h; path = ../src/TestDrag.h; sourceTree = "<group>"; };
+		7746CA7A63049ED8F7D6BF42 /* ../src/TestInputText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestInputText.h; path = ../src/TestInputText.h; sourceTree = "<group>"; };
+		D954BD82D7708B65A08FB6B9 /* ../src/TestManageRes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestManageRes.h; path = ../src/TestManageRes.h; sourceTree = "<group>"; };
+		BD0E956CC3A2F7EB94822B5C /* ../src/TestMask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestMask.h; path = ../src/TestMask.h; sourceTree = "<group>"; };
+		7623D793B59EF0CD569E6EC2 /* ../src/TestPerf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestPerf.h; path = ../src/TestPerf.h; sourceTree = "<group>"; };
+		AFA30E959880563E6ABBBC4F /* ../src/TestProgressBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestProgressBar.h; path = ../src/TestProgressBar.h; sourceTree = "<group>"; };
+		B52CCD463855CF91A7FBDB8E /* ../src/TestRender2Texture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestRender2Texture.h; path = ../src/TestRender2Texture.h; sourceTree = "<group>"; };
+		7EEFDEEC289FCBB5FA67F822 /* ../src/TestSliding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestSliding.h; path = ../src/TestSliding.h; sourceTree = "<group>"; };
+		4E9DE6A8FCBDF43BC876EC90 /* ../src/TestTexel2Pixel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestTexel2Pixel.h; path = ../src/TestTexel2Pixel.h; sourceTree = "<group>"; };
+		8F2AFB956EEAEED67C5B7571 /* ../src/TestText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestText.h; path = ../src/TestText.h; sourceTree = "<group>"; };
+		047F6BD19F885FF186A1447C /* ../src/TestTextureFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestTextureFormat.h; path = ../src/TestTextureFormat.h; sourceTree = "<group>"; };
+		C570FAEF487CD34B62389F89 /* ../src/TestTweens.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestTweens.h; path = ../src/TestTweens.h; sourceTree = "<group>"; };
+		2418B9A339E6004913AF5980 /* ../src/TestUserShader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestUserShader.h; path = ../src/TestUserShader.h; sourceTree = "<group>"; };
+		CAD9D6A98986EA8082368448 /* ../src/example.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = example.h; path = ../src/example.h; sourceTree = "<group>"; };
+		67194AC90FEA68E7C96E6907 /* ../src/test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = test.h; path = ../src/test.h; sourceTree = "<group>"; };
 		04FE4D4FB640E0DF92DFB865 /* ../data/demo */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = demo; path = ../data/demo; sourceTree = "<group>"; };
 		7F3B12E3C9D554D9FE28101D /* ../data/ext */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = ext; path = ../data/ext; sourceTree = "<group>"; };
-		F6123B1E6FE4471A00F49751 /* ../data/ident.free */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wtf; name = ident.free; path = ../data/ident.free; sourceTree = "<group>"; };
-		5DE458993031811A4C7D28C1 /* ../data/images */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = images; path = ../data/images; sourceTree = "<group>"; };
-		BA41FC88D76540A6905224D6 /* ../data/xmls */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = xmls; path = ../data/xmls; sourceTree = "<group>"; };
+		F6123B1E6FE4471A00F49751 /* ../data/images */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = images; path = ../data/images; sourceTree = "<group>"; };
+		5DE458993031811A4C7D28C1 /* ../data/xmls */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = xmls; path = ../data/xmls; sourceTree = "<group>"; };
 
 /* End PBXFileReference section */
 
@@ -185,9 +183,8 @@
 			children = (
 				04FE4D4FB640E0DF92DFB865 /* demo */, 
 				7F3B12E3C9D554D9FE28101D /* ext */, 
-				F6123B1E6FE4471A00F49751 /* ident.free */, 
-				5DE458993031811A4C7D28C1 /* images */, 
-				BA41FC88D76540A6905224D6 /* xmls */, 
+				F6123B1E6FE4471A00F49751 /* images */, 
+				5DE458993031811A4C7D28C1 /* xmls */, 
 
 			);
 			name = "Supporting Files";
@@ -207,23 +204,23 @@
 				360377333740D8A2FD15BBE6 /* entry_point.cpp */, 
 				0BF9628FC8D38F9748F0CDEB /* example.cpp */, 
 				4DA100C319512824B7570663 /* test.cpp */, 
-				2CE4BD5BB9DEF92439C0AB58 /* TestBox9Sprite.h */, 
-				F196143B0370A9D348494ACC /* TestClipRect.h */, 
-				7746CA7A63049ED8F7D6BF42 /* TestDrag.h */, 
-				D954BD82D7708B65A08FB6B9 /* TestInputText.h */, 
-				BD0E956CC3A2F7EB94822B5C /* TestManageRes.h */, 
-				7623D793B59EF0CD569E6EC2 /* TestMask.h */, 
-				AFA30E959880563E6ABBBC4F /* TestPerf.h */, 
-				B52CCD463855CF91A7FBDB8E /* TestProgressBar.h */, 
-				7EEFDEEC289FCBB5FA67F822 /* TestRender2Texture.h */, 
-				4E9DE6A8FCBDF43BC876EC90 /* TestSliding.h */, 
-				8F2AFB956EEAEED67C5B7571 /* TestTexel2Pixel.h */, 
-				047F6BD19F885FF186A1447C /* TestText.h */, 
-				C570FAEF487CD34B62389F89 /* TestTextureFormat.h */, 
-				2418B9A339E6004913AF5980 /* TestTweens.h */, 
-				CAD9D6A98986EA8082368448 /* TestUserShader.h */, 
-				67194AC90FEA68E7C96E6907 /* example.h */, 
-				5AFC0664D7BA80AE2A75BF0E /* test.h */, 
+				BA41FC88D76540A6905224D6 /* TestBox9Sprite.h */, 
+				2CE4BD5BB9DEF92439C0AB58 /* TestClipRect.h */, 
+				F196143B0370A9D348494ACC /* TestDrag.h */, 
+				7746CA7A63049ED8F7D6BF42 /* TestInputText.h */, 
+				D954BD82D7708B65A08FB6B9 /* TestManageRes.h */, 
+				BD0E956CC3A2F7EB94822B5C /* TestMask.h */, 
+				7623D793B59EF0CD569E6EC2 /* TestPerf.h */, 
+				AFA30E959880563E6ABBBC4F /* TestProgressBar.h */, 
+				B52CCD463855CF91A7FBDB8E /* TestRender2Texture.h */, 
+				7EEFDEEC289FCBB5FA67F822 /* TestSliding.h */, 
+				4E9DE6A8FCBDF43BC876EC90 /* TestTexel2Pixel.h */, 
+				8F2AFB956EEAEED67C5B7571 /* TestText.h */, 
+				047F6BD19F885FF186A1447C /* TestTextureFormat.h */, 
+				C570FAEF487CD34B62389F89 /* TestTweens.h */, 
+				2418B9A339E6004913AF5980 /* TestUserShader.h */, 
+				CAD9D6A98986EA8082368448 /* example.h */, 
+				67194AC90FEA68E7C96E6907 /* test.h */, 
 
 			);
 			name = src;
@@ -321,9 +318,8 @@
 				04E9AD3F1876FE84006A7317 /* Images.xcassets in Resources */,
 				1E839D002B2BA83FC83A695A /* demo */, 
 				3A631A475DE035FC53ADE5EA /* ext */, 
-				CD59C69314E9E74CD0A11E03 /* ident.free */, 
-				EFF139F8BA484314F7AAF645 /* images */, 
-				F2CFD518E4E2E05ECEDBB262 /* xmls */, 
+				CD59C69314E9E74CD0A11E03 /* images */, 
+				EFF139F8BA484314F7AAF645 /* xmls */, 
 
 			);
 			runOnlyForDeploymentPostprocessing = 0;

examples/Demo/proj.macosx/demo_macosx.xcodeproj/project.pbxproj

@@ -20,9 +20,8 @@
 		C8860D93875589970329DCCD /* ../src/test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4DA100C319512824B7570663 /* ../src/test.cpp */; };
 		1E839D002B2BA83FC83A695A /* ../data/demo in Sources */ = {isa = PBXBuildFile; fileRef = 04FE4D4FB640E0DF92DFB865 /* ../data/demo */; };
 		3A631A475DE035FC53ADE5EA /* ../data/ext in Sources */ = {isa = PBXBuildFile; fileRef = 7F3B12E3C9D554D9FE28101D /* ../data/ext */; };
-		CD59C69314E9E74CD0A11E03 /* ../data/ident.free in Sources */ = {isa = PBXBuildFile; fileRef = F6123B1E6FE4471A00F49751 /* ../data/ident.free */; };
-		EFF139F8BA484314F7AAF645 /* ../data/images in Sources */ = {isa = PBXBuildFile; fileRef = 5DE458993031811A4C7D28C1 /* ../data/images */; };
-		F2CFD518E4E2E05ECEDBB262 /* ../data/xmls in Sources */ = {isa = PBXBuildFile; fileRef = BA41FC88D76540A6905224D6 /* ../data/xmls */; };
+		CD59C69314E9E74CD0A11E03 /* ../data/images in Sources */ = {isa = PBXBuildFile; fileRef = F6123B1E6FE4471A00F49751 /* ../data/images */; };
+		EFF139F8BA484314F7AAF645 /* ../data/xmls in Sources */ = {isa = PBXBuildFile; fileRef = 5DE458993031811A4C7D28C1 /* ../data/xmls */; };
 
 		
 /* End PBXBuildFile section */
@@ -97,28 +96,27 @@
 		360377333740D8A2FD15BBE6 /* ../src/entry_point.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = entry_point.cpp; path = ../src/entry_point.cpp; sourceTree = "<group>"; };
 		0BF9628FC8D38F9748F0CDEB /* ../src/example.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = example.cpp; path = ../src/example.cpp; sourceTree = "<group>"; };
 		4DA100C319512824B7570663 /* ../src/test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = test.cpp; path = ../src/test.cpp; sourceTree = "<group>"; };
-		2CE4BD5BB9DEF92439C0AB58 /* ../src/TestBox9Sprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestBox9Sprite.h; path = ../src/TestBox9Sprite.h; sourceTree = "<group>"; };
-		F196143B0370A9D348494ACC /* ../src/TestClipRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestClipRect.h; path = ../src/TestClipRect.h; sourceTree = "<group>"; };
-		7746CA7A63049ED8F7D6BF42 /* ../src/TestDrag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestDrag.h; path = ../src/TestDrag.h; sourceTree = "<group>"; };
-		D954BD82D7708B65A08FB6B9 /* ../src/TestInputText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestInputText.h; path = ../src/TestInputText.h; sourceTree = "<group>"; };
-		BD0E956CC3A2F7EB94822B5C /* ../src/TestManageRes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestManageRes.h; path = ../src/TestManageRes.h; sourceTree = "<group>"; };
-		7623D793B59EF0CD569E6EC2 /* ../src/TestMask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestMask.h; path = ../src/TestMask.h; sourceTree = "<group>"; };
-		AFA30E959880563E6ABBBC4F /* ../src/TestPerf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestPerf.h; path = ../src/TestPerf.h; sourceTree = "<group>"; };
-		B52CCD463855CF91A7FBDB8E /* ../src/TestProgressBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestProgressBar.h; path = ../src/TestProgressBar.h; sourceTree = "<group>"; };
-		7EEFDEEC289FCBB5FA67F822 /* ../src/TestRender2Texture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestRender2Texture.h; path = ../src/TestRender2Texture.h; sourceTree = "<group>"; };
-		4E9DE6A8FCBDF43BC876EC90 /* ../src/TestSliding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestSliding.h; path = ../src/TestSliding.h; sourceTree = "<group>"; };
-		8F2AFB956EEAEED67C5B7571 /* ../src/TestTexel2Pixel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestTexel2Pixel.h; path = ../src/TestTexel2Pixel.h; sourceTree = "<group>"; };
-		047F6BD19F885FF186A1447C /* ../src/TestText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestText.h; path = ../src/TestText.h; sourceTree = "<group>"; };
-		C570FAEF487CD34B62389F89 /* ../src/TestTextureFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestTextureFormat.h; path = ../src/TestTextureFormat.h; sourceTree = "<group>"; };
-		2418B9A339E6004913AF5980 /* ../src/TestTweens.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestTweens.h; path = ../src/TestTweens.h; sourceTree = "<group>"; };
-		CAD9D6A98986EA8082368448 /* ../src/TestUserShader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestUserShader.h; path = ../src/TestUserShader.h; sourceTree = "<group>"; };
-		67194AC90FEA68E7C96E6907 /* ../src/example.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = example.h; path = ../src/example.h; sourceTree = "<group>"; };
-		5AFC0664D7BA80AE2A75BF0E /* ../src/test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = test.h; path = ../src/test.h; sourceTree = "<group>"; };
+		BA41FC88D76540A6905224D6 /* ../src/TestBox9Sprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestBox9Sprite.h; path = ../src/TestBox9Sprite.h; sourceTree = "<group>"; };
+		2CE4BD5BB9DEF92439C0AB58 /* ../src/TestClipRect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestClipRect.h; path = ../src/TestClipRect.h; sourceTree = "<group>"; };
+		F196143B0370A9D348494ACC /* ../src/TestDrag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestDrag.h; path = ../src/TestDrag.h; sourceTree = "<group>"; };
+		7746CA7A63049ED8F7D6BF42 /* ../src/TestInputText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestInputText.h; path = ../src/TestInputText.h; sourceTree = "<group>"; };
+		D954BD82D7708B65A08FB6B9 /* ../src/TestManageRes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestManageRes.h; path = ../src/TestManageRes.h; sourceTree = "<group>"; };
+		BD0E956CC3A2F7EB94822B5C /* ../src/TestMask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestMask.h; path = ../src/TestMask.h; sourceTree = "<group>"; };
+		7623D793B59EF0CD569E6EC2 /* ../src/TestPerf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestPerf.h; path = ../src/TestPerf.h; sourceTree = "<group>"; };
+		AFA30E959880563E6ABBBC4F /* ../src/TestProgressBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestProgressBar.h; path = ../src/TestProgressBar.h; sourceTree = "<group>"; };
+		B52CCD463855CF91A7FBDB8E /* ../src/TestRender2Texture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestRender2Texture.h; path = ../src/TestRender2Texture.h; sourceTree = "<group>"; };
+		7EEFDEEC289FCBB5FA67F822 /* ../src/TestSliding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestSliding.h; path = ../src/TestSliding.h; sourceTree = "<group>"; };
+		4E9DE6A8FCBDF43BC876EC90 /* ../src/TestTexel2Pixel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestTexel2Pixel.h; path = ../src/TestTexel2Pixel.h; sourceTree = "<group>"; };
+		8F2AFB956EEAEED67C5B7571 /* ../src/TestText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestText.h; path = ../src/TestText.h; sourceTree = "<group>"; };
+		047F6BD19F885FF186A1447C /* ../src/TestTextureFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestTextureFormat.h; path = ../src/TestTextureFormat.h; sourceTree = "<group>"; };
+		C570FAEF487CD34B62389F89 /* ../src/TestTweens.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestTweens.h; path = ../src/TestTweens.h; sourceTree = "<group>"; };
+		2418B9A339E6004913AF5980 /* ../src/TestUserShader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TestUserShader.h; path = ../src/TestUserShader.h; sourceTree = "<group>"; };
+		CAD9D6A98986EA8082368448 /* ../src/example.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = example.h; path = ../src/example.h; sourceTree = "<group>"; };
+		67194AC90FEA68E7C96E6907 /* ../src/test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = test.h; path = ../src/test.h; sourceTree = "<group>"; };
 		04FE4D4FB640E0DF92DFB865 /* ../data/demo */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = demo; path = ../data/demo; sourceTree = "<group>"; };
 		7F3B12E3C9D554D9FE28101D /* ../data/ext */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = ext; path = ../data/ext; sourceTree = "<group>"; };
-		F6123B1E6FE4471A00F49751 /* ../data/ident.free */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wtf; name = ident.free; path = ../data/ident.free; sourceTree = "<group>"; };
-		5DE458993031811A4C7D28C1 /* ../data/images */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = images; path = ../data/images; sourceTree = "<group>"; };
-		BA41FC88D76540A6905224D6 /* ../data/xmls */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = xmls; path = ../data/xmls; sourceTree = "<group>"; };
+		F6123B1E6FE4471A00F49751 /* ../data/images */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = images; path = ../data/images; sourceTree = "<group>"; };
+		5DE458993031811A4C7D28C1 /* ../data/xmls */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = folder; name = xmls; path = ../data/xmls; sourceTree = "<group>"; };
 
 		04A57D761871FFEB0068B1E5 /* oxygine_macosx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = oxygine_macosx.xcodeproj; path = ../../..//oxygine/SDL/macosx/oxygine_macosx/oxygine_macosx.xcodeproj; sourceTree = "<group>"; };
 		04A57D7E1872012A0068B1E5 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = ../../../..//SDL/Xcode/SDL/SDL.xcodeproj; sourceTree = "<group>"; };
@@ -209,9 +207,8 @@
 			children = (
 				04FE4D4FB640E0DF92DFB865 /* demo */, 
 				7F3B12E3C9D554D9FE28101D /* ext */, 
-				F6123B1E6FE4471A00F49751 /* ident.free */, 
-				5DE458993031811A4C7D28C1 /* images */, 
-				BA41FC88D76540A6905224D6 /* xmls */, 
+				F6123B1E6FE4471A00F49751 /* images */, 
+				5DE458993031811A4C7D28C1 /* xmls */, 
 
 				049B57391871FBE900EF3C66 /* Demo_macosx-Info.plist */,
 			);
@@ -224,23 +221,23 @@
 				360377333740D8A2FD15BBE6 /* entry_point.cpp */, 
 				0BF9628FC8D38F9748F0CDEB /* example.cpp */, 
 				4DA100C319512824B7570663 /* test.cpp */, 
-				2CE4BD5BB9DEF92439C0AB58 /* TestBox9Sprite.h */, 
-				F196143B0370A9D348494ACC /* TestClipRect.h */, 
-				7746CA7A63049ED8F7D6BF42 /* TestDrag.h */, 
-				D954BD82D7708B65A08FB6B9 /* TestInputText.h */, 
-				BD0E956CC3A2F7EB94822B5C /* TestManageRes.h */, 
-				7623D793B59EF0CD569E6EC2 /* TestMask.h */, 
-				AFA30E959880563E6ABBBC4F /* TestPerf.h */, 
-				B52CCD463855CF91A7FBDB8E /* TestProgressBar.h */, 
-				7EEFDEEC289FCBB5FA67F822 /* TestRender2Texture.h */, 
-				4E9DE6A8FCBDF43BC876EC90 /* TestSliding.h */, 
-				8F2AFB956EEAEED67C5B7571 /* TestTexel2Pixel.h */, 
-				047F6BD19F885FF186A1447C /* TestText.h */, 
-				C570FAEF487CD34B62389F89 /* TestTextureFormat.h */, 
-				2418B9A339E6004913AF5980 /* TestTweens.h */, 
-				CAD9D6A98986EA8082368448 /* TestUserShader.h */, 
-				67194AC90FEA68E7C96E6907 /* example.h */, 
-				5AFC0664D7BA80AE2A75BF0E /* test.h */, 
+				BA41FC88D76540A6905224D6 /* TestBox9Sprite.h */, 
+				2CE4BD5BB9DEF92439C0AB58 /* TestClipRect.h */, 
+				F196143B0370A9D348494ACC /* TestDrag.h */, 
+				7746CA7A63049ED8F7D6BF42 /* TestInputText.h */, 
+				D954BD82D7708B65A08FB6B9 /* TestManageRes.h */, 
+				BD0E956CC3A2F7EB94822B5C /* TestMask.h */, 
+				7623D793B59EF0CD569E6EC2 /* TestPerf.h */, 
+				AFA30E959880563E6ABBBC4F /* TestProgressBar.h */, 
+				B52CCD463855CF91A7FBDB8E /* TestRender2Texture.h */, 
+				7EEFDEEC289FCBB5FA67F822 /* TestSliding.h */, 
+				4E9DE6A8FCBDF43BC876EC90 /* TestTexel2Pixel.h */, 
+				8F2AFB956EEAEED67C5B7571 /* TestText.h */, 
+				047F6BD19F885FF186A1447C /* TestTextureFormat.h */, 
+				C570FAEF487CD34B62389F89 /* TestTweens.h */, 
+				2418B9A339E6004913AF5980 /* TestUserShader.h */, 
+				CAD9D6A98986EA8082368448 /* example.h */, 
+				67194AC90FEA68E7C96E6907 /* test.h */, 
 
 			);
 			name = src;
@@ -361,9 +358,8 @@
 			files = (
 				1E839D002B2BA83FC83A695A /* demo */, 
 				3A631A475DE035FC53ADE5EA /* ext */, 
-				CD59C69314E9E74CD0A11E03 /* ident.free */, 
-				EFF139F8BA484314F7AAF645 /* images */, 
-				F2CFD518E4E2E05ECEDBB262 /* xmls */, 
+				CD59C69314E9E74CD0A11E03 /* images */, 
+				EFF139F8BA484314F7AAF645 /* xmls */, 
 
 				049B574A1871FBE900EF3C66 /* Images.xcassets in Resources */,
 			);

oxygine/src/Actor.cpp

@@ -141,7 +141,7 @@ namespace oxygine
 			stream << " anchor=(" << getAnchor().x << "," << getAnchor().y << ")";
 
 		if (getRotation() != 0.0f)
-			stream << " rot=" << getRotation() / M_PI * 360.0f << "";
+			stream << " rot=" << getRotation() / MATH_PI * 360.0f << "";
 
 		int tweensCount = 0;
 		spTween t = _tweens._first;

oxygine/src/DebugActor.cpp

@@ -131,6 +131,7 @@ namespace oxygine
 
 		_text = new TextField;
 		addChild(_text);
+		_text->setPosition(2, 5);
 		_text->setInputEnabled(false);
 		_text->setStyle(st);
 		_text->setWidth(getWidth());
@@ -181,11 +182,12 @@ namespace oxygine
 		else
 		{		
 			spDeveloperMenu dm = new DeveloperMenu();
-			dm->setPriority(getPriority() - 1); 
+			dm->setPriority(getPriority()  + 1); 
 			float scale = getRoot()->getScaleX();
 			Vector2 size = core::getDisplaySize();
 
 			Vector2 s = size;// * scale;
+			s.y -= 24;
 			
 			if (name == "tree")
 			{
@@ -202,7 +204,8 @@ namespace oxygine
 			}
 
 			dm->setScale(1.0f / scale);
-			dm->setPosition(-getRoot()->getPosition());
+			Vector2 p = -getRoot()->getPosition() / scale;
+			dm->setPosition(p);
 			getRoot()->addChild(dm);
 		}
 	}
@@ -258,14 +261,17 @@ namespace oxygine
 		s << "textures=" << NativeTexture::created << " ";
 		s << "\nlisteners=" << getRoot()->getListenersCount() << "";
 
-		s << "\n";
-		s << _debugText;
+		if (!_debugText.empty())
+		{
+			s << "\n";
+			s << _debugText;
+		}
 		_debugText = "";
 
 		_text->setText(s.str());
 
 		
-		setHeight(_text->getTextRect().size.y + 2.0f);
+		setHeight(_text->getTextRect().size.y + _text->getY() + 3);
 		_bg->setSize(getSize());
 
 

oxygine/src/core/file.cpp

@@ -186,8 +186,11 @@ namespace oxygine
 
 		
 
-		bool exists(const char *file)
+		bool exists(const char *file_)
 		{
+			char file[512];
+			path::normalize(file_, file);
+
 			return _nfs.isExists(file);
 		}
 

oxygine/src/core/gl/oxgl.cpp

@@ -3,6 +3,11 @@
 
 #ifdef WIN32
 #include "SDL_video.h"
+
+//fix compile time error with latest SDL
+#undef GLAPI
+#define GLAPI
+
 extern "C"
 {
 	PFNGLUSEPROGRAMPROC _glUseProgram = 0;
@@ -29,10 +34,10 @@ extern "C"
 	GLAPI void APIENTRY glDisableVertexAttribArray(GLuint index)
 	{
 		_glDisableVertexAttribArray(index);
-	}
+	} 
 	PFNGLDELETEPROGRAMPROC _glDeleteProgram = 0;
 	GLAPI void APIENTRY glDeleteProgram(GLuint program)
-	{
+	{ 
 		_glDeleteProgram(program);
 	}
 	PFNGLGETSHADERIVPROC _glGetShaderiv = 0;
@@ -47,7 +52,7 @@ extern "C"
 	}
 	PFNGLCREATESHADERPROC _glCreateShader = 0;
 	GLAPI GLuint APIENTRY glCreateShader(GLenum type)
-	{
+	{ 
 		return _glCreateShader(type);
 	}
 	PFNGLCREATEPROGRAMPROC _glCreateProgram = 0;
@@ -164,6 +169,7 @@ extern "C"
 	{
 		_glDeleteBuffers(n, buffers);
 	}
+
 }
 
 void initGLExtensions(myGetProcAdress func)
@@ -202,7 +208,6 @@ void initGLExtensions(myGetProcAdress func)
 	_glGenBuffers = (PFNGLGENBUFFERSPROC)func("glGenBuffers");
 	_glBufferData = (PFNGLBUFFERDATAPROC)func("glBufferData");
 	_glDeleteBuffers = (PFNGLDELETEBUFFERSPROC)func("glDeleteBuffers");
-
 }
 #else
 void initGLExtensions(myGetProcAdress func)

oxygine/src/core/oxygine.cpp

@@ -37,20 +37,13 @@
 #include "s3eOSExec.h"
 #endif
 
-#if __FLASHPLAYER__
-#include "SDL_timer.h"
-#include "AS3/AS3.h"
-#include <Flash++.h>
-#include "agal.h"
-using namespace AS3::ui;
-#include "stage3d/VideoDriverStage3D.h"
-#else
-//#include "gl/VideoDriverGLES11.h"
+
 #include "gl/VideoDriverGLES20.h"
-#endif
+
 
 #ifdef EMSCRIPTEN
 //#include <EGL/egl.h>
+#include <sys/time.h>
 #include <emscripten.h>
 #include <SDL.h>
 #include <SDL_compat.h>
@@ -969,6 +962,13 @@ namespace oxygine
 		return utc;		
 #elif __ANDROID__
 		return jniGetTimeUTCMS();
+#elif EMSCRIPTEN
+		struct timeval tv;
+		gettimeofday(&tv, NULL);
+		int64 tm = 
+			(unsigned long long)(tv.tv_sec) * 1000 +
+			(unsigned long long)(tv.tv_usec) / 1000;
+		return tm;
 #endif
 		return getTimeMS();
 	}

oxygine/src/dev_tools/DeveloperMenu.cpp

@@ -8,10 +8,14 @@
 
 namespace oxygine
 {
+	const Color windowColor(64, 128, 128, 255);
+
 	DeveloperMenu::DeveloperMenu():_resSystem(0)
 	{
 		setName(getDefaultName());
 
+		setColor(windowColor);
+
 		DebugActor::initialize();
 		_resSystem = DebugActor::resSystem;
 
@@ -30,20 +34,28 @@ namespace oxygine
 
 	void DeveloperMenu::init(const Vector2 &size, const char *text, spActor data, const Color &color)
 	{
+		const float BORDER = 3;
+
+		float offset = 24;
+
 		setSize(size);
-		setWidth(data->getWidth());
+		setWidth(data->getWidth() + BORDER * 2);
+		setHeight(size.y + offset);
 		//setSize(data->getSize() + Point(0, offset));
 
 		spColorRectSprite top = new ColorRectSprite();
 		top->setWidth(getWidth());
+		top->setSize(size);
+
 
 		_topDrag.init(top.get());
 		_topDrag.setDragClient(this);
 		
 		addChild(top);
-		float offset = 24;
 
-		top->setColor(Color(64, 128, 128, 255));
+		
+
+		top->setColor(windowColor);
 		top->setSize(Vector2(getWidth(), offset));
 		top->setPriority(100);
 
@@ -51,7 +63,10 @@ namespace oxygine
 		body->setColor(color);
 		addChild(body);
 
-		body->setSize(Vector2(getWidth(), getHeight()));
+		
+
+		body->setSize(Vector2(getWidth() - BORDER * 2, getHeight()));
+		body->setX(BORDER);
 		body->setY((float)offset);
 
 

oxygine/src/dev_tools/DeveloperMenu.h

@@ -1,6 +1,7 @@
 #pragma once
 #include "oxygine_include.h"
 #include "ClipRectActor.h"
+#include "ColorRectSprite.h"
 #include "Draggable.h"
 
 namespace oxygine
@@ -8,7 +9,7 @@ namespace oxygine
 	DECLARE_SMART(DeveloperMenu, spDeveloperMenu);
 	class Resources;
 
-	class DeveloperMenu: public Actor
+	class DeveloperMenu: public ColorRectSprite
 	{
 	public:
 		static string getDefaultName(){return "tree_inspector";}

oxygine/src/dev_tools/TexturesInspector.cpp

@@ -39,14 +39,16 @@ namespace oxygine
 			addChild(image);
 
 			spColorRectSprite rect = initActor(new ColorRectSprite,
-				arg_color = Color(Color::White, 128),
+				arg_color = Color(Color::White, 255),
 				arg_attachTo = this);
 
+			rect->addTween(Sprite::TweenColor(Color(Color::White, 0)), 4000, -1, true);
+
 			char path[255];
 			path::normalize(t->getName().c_str(), path);
 
 			char txt[255];
-			safe_sprintf(txt, "%s\n<div c=\"ff0000\">%s</div>-<div c=\"0000ff\">%dx%d</div>\nid:%d", 
+			safe_sprintf(txt, "%s\n<div c=\"FF0000\">%s</div>-<div c=\"0000ff\">%dx%d</div>\nid: %d", 
 				path,
 				textureFormat2String(t->getFormat()),
 				t->getWidth(), t->getHeight(), t->getObjectID());
@@ -61,6 +63,7 @@ namespace oxygine
 				arg_htmlText = txt
 				);
 
+			text->setBreakLongWords(true);
 
 			rect->setSize(text->getTextRect().size.cast<Vector2>() + Vector2(2, 2));
 			rect->setY((itemSize.y - rect->getHeight())/2.0f);
@@ -84,6 +87,7 @@ namespace oxygine
 		
 		spTextField text = initActor(new TextField,
 			arg_color = Color::White,
+			arg_pos = Vector2(1,1),
 			arg_w = itemSize.x * 3.0f,
 			arg_h = 30.0f,
 			arg_vAlign = TextStyle::VALIGN_TOP,
@@ -92,9 +96,11 @@ namespace oxygine
 			arg_attachTo = slide
 			);
 
+
 		offsetY += text->getTextRect().getBottom() + 5;
 
 		spActor content = new Actor;
+		content->setX(2);
 		
 		
 		int numX = (int)(size.x / itemSize.x);

oxygine/src/dev_tools/TreeInspector.cpp

@@ -153,7 +153,7 @@ namespace oxygine
 		Vector2 size = _rootPage->getSize();
 		_rootPage->updateSizesNew();
 		_rootPage->setPosition(pos);
-		_rootPage->setSize(size);
+		_rootPage->setSize(size + Vector2(0, 24));
 		//_rootPage->setPosition(0, 20);
 		_sliding->snap();
 	}

oxygine/src/math/ScalarMath.h

@@ -9,8 +9,7 @@ namespace oxygine
 	template<class T>
 	inline T interpolate(T a, T b, float v)
 	{
-		T r = T(a + (b - a) * v);
-		return r;
+		return T(a + (b - a) * v);
 	}
 
 	namespace scalar

oxygine/src/oxygine_include.h

@@ -16,7 +16,9 @@
 	#endif
 #elif EMSCRIPTEN
 	#define OXYGINE_EMSCRIPTEN 1
-	
+	#ifndef NDEBUG
+		#define OX_DEBUG 1
+	#endif // DEBUG	
 #else
 	#define OXYGINE_SDL 1
 	#ifdef WIN32
@@ -57,6 +59,8 @@
 namespace oxygine{namespace log{void error(const char *format, ...);}}
 #ifdef OXYGINE_QT
 #define OX_ASSERT(x) if (!(x)) {__asm("int3");oxygine::log::error("Assert! %d %s", __LINE__, __FILE__); }(assert(x))
+#elif EMSCRIPTEN
+#define OX_ASSERT(x) if (!(x)) {oxygine::log::error("Assert! %d %s", __LINE__, __FILE__);}
 #else
 #define OX_ASSERT(x) if (!(x)) {oxygine::log::error("Assert! %d %s", __LINE__, __FILE__);}(assert(x))
 #endif

readme.md

@@ -1,4 +1,5 @@
-**oxygine-framework/readme** folder has insructions how to build and run oxygine on different platforms.
+# BUILD AND RUN 
+See **oxygine-framework/readme/** folder. It has insructions how to build and run oxygine on different platforms.
 
 
 # Oxygine is C++ engine for 2D mobile games. 

tools/gen_view_code.py

@@ -30,7 +30,7 @@ def save_if_changed(name, content):
 
 mp_actor = class_type("spActor", "Actor", "Actor.h")
 mp_button = class_type("spButton", "Button", "Button.h")
-mp_text = class_type("spTextActor", "TextActor", "TextActor.h")
+mp_text = class_type("spTextField", "TextField", "TextField.h")
 mp_bar = class_type("spProgressBar", "ProgressBar", "ProgressBar.h")
 mp_clip = class_type("spClipRectActor", "ClipRectActor", "ClipRectActor.h")
 mp_sprite = class_type("spSprite", "Sprite", "Sprite.h")