Browse Source

Fragment up sample resources, address #681 (#719)

Pavel Alexandrov 5 years ago
parent
commit
2f9a3649f7

+ 1 - 1
h3d/scene/Skin.hx

@@ -274,7 +274,7 @@ class Skin extends MultiMaterial {
 	#if (hxbit && !macro && heaps_enable_serialize)
 	override function customUnserialize(ctx:hxbit.Serializer) {
 		super.customUnserialize(ctx);
-		var prim = Std.instance(primitive, h3d.prim.HMDModel);
+		var prim = hxd.impl.Api.downcast(primitive, h3d.prim.HMDModel);
 		if( prim == null ) throw "Cannot load skin primitive " + prim;
 		jointsUpdated = true;
 		skinShader = material.mainPass.getShader(h3d.shader.Skin);

+ 1 - 1
samples/Bounds.hx

@@ -50,7 +50,7 @@ class Bounds extends hxd.App {
 		for( i in 1...2 ) {
 			var prev = boxes[i - 1];
 			var b = boxes[i].getBounds(prev);
-			var g = Std.instance(prev.getChildAt(2), h2d.Graphics);
+			var g = hxd.impl.Api.downcast(prev.getChildAt(2), h2d.Graphics);
 			g.clear();
 			g.beginFill(0xFFFFFF, 0.5);
 			g.drawRect(b.x, b.y, b.width, b.height);

+ 2 - 2
samples/Flows.hx

@@ -517,7 +517,7 @@ class Flows extends hxd.App {
 						movingFlow.verticalAlign = vAligns[(vAligns.indexOf(movingFlow.verticalAlign)+1)%3];
 
 						if (movingFlow.verticalAlign == vAligns[0]) {
-							var parent = Std.instance(movingFlow.parent, Flow);
+							var parent = hxd.impl.Api.downcast(movingFlow.parent, Flow);
 
 							parent.horizontalAlign = hAligns[(hAligns.indexOf(parent.horizontalAlign)+1)%3];
 							if (parent.horizontalAlign == hAligns[0]) {
@@ -525,7 +525,7 @@ class Flows extends hxd.App {
 
 								if (parent.verticalAlign == vAligns[0]) {
 
-									var parent = Std.instance(parent.parent, Flow);
+									var parent = hxd.impl.Api.downcast(parent.parent, Flow);
 
 									parent.horizontalAlign = hAligns[(hAligns.indexOf(parent.horizontalAlign)+1)%3];
 									if (parent.horizontalAlign == hAligns[0]) {

+ 2 - 0
samples/HtmlText.hx

@@ -5,6 +5,8 @@ import h2d.Graphics;
 import h2d.Object;
 import h2d.Text.Align;
 
+// Use both text_res and res folders.
+//PARAM=-D resourcesPath=../../text_res;../../res
 class HtmlTextWidget extends Object
 {
 	public var align: Align;

+ 1 - 1
samples/Lights.hx

@@ -142,7 +142,7 @@ class Lights extends SampleApp {
 			m.m.x = m.cx + Math.cos(m.pos) * m.ray;
 			m.m.y = m.cy + Math.sin(m.pos) * m.ray;
 
-			var cc = Std.instance(m.m.cullingCollider, h3d.col.Sphere);
+			var cc = hxd.impl.Api.downcast(m.m.cullingCollider, h3d.col.Sphere);
 			if( cc != null ) {
 				var absPos = m.m.getAbsPos();
 				cc.x = absPos.tx;

+ 1 - 1
samples/Sao.hx

@@ -135,7 +135,7 @@ class Sao extends SampleApp {
 		if(K.isPressed(K.BACKSPACE))
 			reset();
 
-		var r = Std.instance(s3d.renderer, CustomRenderer);
+		var r = hxd.impl.Api.downcast(s3d.renderer, CustomRenderer);
 		if(K.isPressed(K.NUMBER_1))
 			r.mode = 0;
 		if(K.isPressed(K.NUMBER_2))

+ 2 - 0
samples/Text.hx

@@ -5,6 +5,8 @@ import h2d.Graphics;
 import h2d.Object;
 import h2d.Text.Align;
 
+// Use both text_res and res folders.
+//PARAM=-D resourcesPath=../../text_res;../../res
 class TextWidget extends Object
 {
 	public var align: Align;

+ 34 - 34
samples/res/style.css → samples/domkit_res/style.css

@@ -1,35 +1,35 @@
-.mybox {
-	background: #080;
-	padding: -10;
-}
-
-view.mybox {
-	padding: 10;
-}
-
-container {
-	max-width: 300;
-	layout: vertical;
-}
-
-button {
-	background: #333;
-	fill-width: true;
-	height: 30;
-}
-
-button.highlight {
-	background: #a33;
-}
-
-button text {
-	align: middle middle;
-}
-
-button:hover {
-	background: #444;
-}
-
-button:active {
-	background: #222;
+.mybox {
+	background: #080;
+	padding: -10;
+}
+
+view.mybox {
+	padding: 10;
+}
+
+container {
+	max-width: 300;
+	layout: vertical;
+}
+
+button {
+	background: #333;
+	fill-width: true;
+	height: 30;
+}
+
+button.highlight {
+	background: #a33;
+}
+
+button text {
+	align: middle middle;
+}
+
+button:hover {
+	background: #444;
+}
+
+button:active {
+	background: #222;
 }

+ 0 - 0
samples/res/hideEffect.fx → samples/fxview_res/hideEffect.fx


+ 0 - 0
samples/res/ray.jpg → samples/fxview_res/ray.jpg


+ 0 - 0
samples/res/bmfont_binary.fnt → samples/text_res/bmfont_binary.fnt


+ 0 - 0
samples/res/bmfont_binary_0.png → samples/text_res/bmfont_binary_0.png


+ 0 - 0
samples/res/bmfont_text.fnt → samples/text_res/bmfont_text.fnt


+ 0 - 0
samples/res/bmfont_xml.fnt → samples/text_res/bmfont_xml.fnt


+ 0 - 0
samples/res/gravityFont.fnt → samples/text_res/gravityFont.fnt


+ 0 - 0
samples/res/gravityFont.png → samples/text_res/gravityFont.png


+ 0 - 0
samples/res/littera.png → samples/text_res/littera.png


+ 0 - 0
samples/res/littera_text.fnt → samples/text_res/littera_text.fnt


+ 0 - 0
samples/res/littera_xml.fnt → samples/text_res/littera_xml.fnt


+ 0 - 0
samples/res/sdf_font.fnt → samples/text_res/sdf_font.fnt


+ 0 - 0
samples/res/sdf_font.png → samples/text_res/sdf_font.png


+ 0 - 0
samples/res/trueTypeFont.ttf → samples/text_res/trueTypeFont.ttf