changed Serializable package

h3d/col/Collider.hx

@@ -1,6 +1,6 @@
 package h3d.col;
 
-interface Collider extends h3d.impl.Serializable.StructSerializable {
+interface Collider extends hxd.impl.Serializable.StructSerializable {
 
 	/**
 		Returns the distance of intersection between the ray and the collider, or negative if no collision.
@@ -12,7 +12,7 @@ interface Collider extends h3d.impl.Serializable.StructSerializable {
 }
 
 
-class OptimizedCollider implements h3d.impl.Serializable implements Collider {
+class OptimizedCollider implements hxd.impl.Serializable implements Collider {
 
 	@:s public var a : Collider;
 	@:s public var b : Collider;

h3d/col/ObjectCollider.hx

@@ -1,6 +1,6 @@
 package h3d.col;
 
-class ObjectCollider implements Collider implements h3d.impl.Serializable {
+class ObjectCollider implements Collider implements hxd.impl.Serializable {
 
 	@:s public var obj : h3d.scene.Object;
 	@:s public var collider : Collider;

h3d/col/SkinCollider.hx

@@ -2,7 +2,7 @@ package h3d.col;
 
 @:access(h3d.col.PolygonBuffer)
 @:access(h3d.scene.Skin)
-class SkinCollider implements h3d.impl.Serializable implements Collider {
+class SkinCollider implements hxd.impl.Serializable implements Collider {
 
 	@:s var obj : h3d.scene.Skin;
 	@:s var col : PolygonBuffer;

h3d/mat/BaseMaterial.hx

@@ -2,7 +2,7 @@ package h3d.mat;
 import h3d.mat.Data;
 import h3d.mat.Pass;
 
-class BaseMaterial implements h3d.impl.Serializable {
+class BaseMaterial implements hxd.impl.Serializable {
 
 	@:s var passes : Pass;
 	@:s public var name : String;

h3d/mat/Pass.hx

@@ -3,7 +3,7 @@ import h3d.mat.Data;
 
 @:allow(h3d.mat.BaseMaterial)
 @:build(hxd.impl.BitsBuilder.build())
-class Pass implements h3d.impl.Serializable {
+class Pass implements hxd.impl.Serializable {
 
 	@:s public var name(default, null) : String;
 	var passId : Int;
@@ -207,7 +207,7 @@ class Pass implements h3d.impl.Serializable {
 	#if hxbit
 
 	public function customSerialize( ctx : hxbit.Serializer ) {
-		var ctx : h3d.impl.Serializable.SceneSerializer = cast ctx;
+		var ctx : hxd.fmt.hsd.Serializer = cast ctx;
 		var s = shaders;
 		while( s != parentShaders ) {
 			ctx.addShader(s.s);
@@ -216,7 +216,7 @@ class Pass implements h3d.impl.Serializable {
 		ctx.addShader(null);
 	}
 	public function customUnserialize( ctx : hxbit.Serializer ) {
-		var ctx : h3d.impl.Serializable.SceneSerializer = cast ctx;
+		var ctx : hxd.fmt.hsd.Serializer = cast ctx;
 		var head = null;
 		while( true ) {
 			var s = ctx.getShader();

h3d/mat/Stencil.hx

@@ -3,7 +3,7 @@ import h3d.mat.Data;
 
 @:allow(h3d.mat.Material)
 @:build(hxd.impl.BitsBuilder.build())
-class Stencil implements h3d.impl.Serializable {
+class Stencil implements hxd.impl.Serializable {
 
 	@:s var frontRefBits : Int = 0;
 	@:s var backRefBits  : Int = 0;

h3d/prim/HMDModel.hx

@@ -187,7 +187,7 @@ class HMDModel extends MeshPrimitive {
 	override function customUnserialize(ctx:hxbit.Serializer) {
 		var libPath = ctx.getString();
 		var modelPath = ctx.getString();
-		var ctx : h3d.impl.Serializable.SceneSerializer = cast ctx;
+		var ctx : hxd.fmt.hsd.Serializer = cast ctx;
 		lib = ctx.loadHMD(libPath);
 		for( m in lib.header.models )
 			if( m.name == modelPath ) {

h3d/prim/Primitive.hx

@@ -1,6 +1,6 @@
 package h3d.prim;
 
-class Primitive implements h3d.impl.Serializable {
+class Primitive implements hxd.impl.Serializable {
 
 	public var buffer : Buffer;
 	public var indexes : Indexes;

h3d/scene/Object.hx

@@ -23,7 +23,7 @@ package h3d.scene;
 	}
 }
 
-class Object implements h3d.impl.Serializable {
+class Object implements hxd.impl.Serializable {
 
 	static inline var ROT2RAD = -0.017453292519943295769236907684886;
 

h3d/scene/Scene.hx

@@ -378,7 +378,7 @@ class Scene extends Object implements h3d.IDrawable implements hxd.SceneEvents.I
 
 	public function serializeScene() : haxe.io.Bytes {
 		#if hxbit
-		var s = new h3d.impl.Serializable.SceneSerializer();
+		var s = new hxd.fmt.hsd.Serializer();
 		return s.saveHSD(this, false, camera);
 		#else
 		throw "You need -lib hxbit to serialize the scene data";

hxd/fmt/hsd/Serializer.hx

@@ -4,7 +4,7 @@ class Serializer extends hxbit.Serializer {
 
 	var version = 0;
 
-	public var resPath : String = MacroHelper.getResourcesPath();
+	public var resPath : String = h3d.impl.MacroHelper.getResourcesPath();
 	var shaderVarIndex : Int;
 	var shaderUID = 0;
 	var shaderIndexes = new Map<hxsl.Shader,Int>();

hxd/impl/Serializable.hx

@@ -0,0 +1,17 @@
+package hxd.impl;
+
+#if (!hxbit || macro)
+
+// disable serialization support
+private interface NoSerializeSupport {
+}
+typedef Serializable = NoSerializeSupport;
+typedef StructSerializable = NoSerializeSupport;
+
+#else
+
+typedef Serializable = hxbit.Serializable;
+typedef StructSerializable = hxbit.StructSerializable;
+
+#end
+