moved cdb.jq to hxbit.vdom

hxd/inspect/Inspector.hx

@@ -1,5 +1,5 @@
 package hxd.inspect;
-import cdb.jq.JQuery;
+import vdom.JQuery;
 import hxd.inspect.Property;
 
 class Tool {
@@ -215,7 +215,7 @@ class Inspector {
 		return props.connected;
 	}
 
-	public inline function J( ?elt : cdb.jq.Dom, ?query : String ) {
+	public inline function J( ?elt : vdom.Dom, ?query : String ) {
 		return props.J(elt,query);
 	}
 
@@ -239,7 +239,7 @@ class Inspector {
 		panelList.push({ name : name, create : create, p : null });
 	}
 
-	function onKey( e : cdb.jq.Event ) {
+	function onKey( e : vdom.Event ) {
 		switch( e.keyCode ) {
 		case 'S'.code if( e.ctrlKey ):
 			save();

hxd/inspect/Node.hx

@@ -5,7 +5,7 @@ class Node {
 	public var name(default,set) : String;
 	public var parent(default, set) : Node;
 	public var props : Void -> Array<Property>;
-	public var j : cdb.jq.JQuery;
+	public var j : vdom.JQuery;
 	var childs : Array<Node>;
 
 	public function new( name, ?parent ) {

hxd/inspect/Panel.hx

@@ -11,11 +11,11 @@ enum DockDirection {
 class Panel extends Node {
 
 	var inspect : Inspector;
-	var panel : cdb.jq.JQuery;
+	var panel : vdom.JQuery;
 	var saveDock : { align : DockDirection, size : Float, into : Panel };
 	public var visible(default, null) : Bool;
 	public var caption(default, set) : String;
-	public var content : cdb.jq.JQuery;
+	public var content : vdom.JQuery;
 
 	public function new( name, caption, ?panelGroup ) {
 		super(name, panelGroup);

hxd/inspect/PropManager.hx

@@ -1,17 +1,17 @@
 package hxd.inspect;
-import cdb.jq.JQuery;
+import vdom.JQuery;
 import hxd.inspect.Property;
 
 private typedef History = { path : String, oldV : Dynamic, newV : Dynamic };
 
-class PropManager extends cdb.jq.Client {
+class PropManager extends vdom.Client {
 
 	public var host : String = "127.0.0.1";
 	public var port = 6669;
 	public var connected(default,null) = false;
 
 	var sock : hxd.net.Socket;
-	var pendingMessages : Array<cdb.jq.Message>;
+	var pendingMessages : Array<vdom.Message>;
 
 	var refreshProps : Void -> Void;
 	var history : Array<History>;
@@ -38,8 +38,7 @@ class PropManager extends cdb.jq.Client {
 				var len = try sock.input.readUInt16() catch( e : haxe.io.Eof ) -1;
 				if( len < 0 ) break;
 				var data = sock.input.read(len);
-				var msg : cdb.jq.Message.Answer = cdb.BinSerializer.unserialize(data);
-				handle(msg);
+				handle(decodeAnswer(data));
 			}
 		}
 		connect();
@@ -52,7 +51,7 @@ class PropManager extends cdb.jq.Client {
 		}
 	}
 
-	override function onKey(e:cdb.jq.Event) {
+	override function onKey(e:vdom.Event) {
 		switch( e.keyCode ) {
 		case 'Z'.code if( e.ctrlKey ):
 			undo();
@@ -63,7 +62,7 @@ class PropManager extends cdb.jq.Client {
 		}
 	}
 
-	public dynamic function handleKey( e : cdb.jq.Event ) {
+	public dynamic function handleKey( e : vdom.Event ) {
 	}
 
 	function connect() {
@@ -78,17 +77,17 @@ class PropManager extends cdb.jq.Client {
 
 	function flushMessages() {
 		if( pendingMessages == null ) return;
-		var msg = pendingMessages.length == 1 ? pendingMessages[0] : cdb.jq.Message.Group(pendingMessages);
+		var msg = pendingMessages.length == 1 ? pendingMessages[0] : vdom.Message.Group(pendingMessages);
 		pendingMessages = null;
 		if( sock == null ) return;
-		var data = cdb.BinSerializer.serialize(msg);
+		var data = encodeMessage(msg);
 		sock.out.wait();
 		sock.out.writeInt32(data.length);
 		sock.out.write(data);
 		sock.out.flush();
 	}
 
-	override function send( msg : cdb.jq.Message ) {
+	override function send( msg : vdom.Message ) {
 		if( pendingMessages == null ) {
 			pendingMessages = [];
 			haxe.Timer.delay(flushMessages,0);

hxd/inspect/Property.hx

@@ -11,8 +11,8 @@ enum Property {
 	PGroup( name : String, props : Array<Property> );
 	PTexture( name : String, get : Void -> h3d.mat.Texture, set : h3d.mat.Texture -> Void );
 	PFloats( name : String, get : Void -> Array<Float>, set : Array<Float> -> Void );
-#if castle
-	PPopup( p : Property, menu : Array<String>, click : cdb.jq.JQuery -> Int -> Void );
-	PCustom( name : String, content : Void -> cdb.jq.JQuery, ?set : Dynamic -> Void );
+#if hxbit
+	PPopup( p : Property, menu : Array<String>, click : vdom.JQuery -> Int -> Void );
+	PCustom( name : String, content : Void -> vdom.JQuery, ?set : Dynamic -> Void );
 #end
 }

hxd/inspect/ScenePanel.hx

@@ -296,7 +296,7 @@ class ScenePanel extends Panel {
 	var scenePosition = 0;
 	var currentPick(default,set) : h3d.scene.Mesh;
 	var currentPickShader : hxsl.Shader;
-	var btPick : cdb.jq.JQuery;
+	var btPick : vdom.JQuery;
 	var lastPickEvent : Null<Int>;
 	var sprops : SceneProps;
 	public var showHidden(default, null) : Bool = true;

hxd/inspect/StatsPanel.hx

@@ -65,7 +65,7 @@ class StatsPanel extends Panel {
 		}
 	}
 
-	function showMemoryDetails( button : cdb.jq.JQuery ) {
+	function showMemoryDetails( button : vdom.JQuery ) {
 		var id = button.find("span").getAttr("id");
 		button.parent().parent().find(".detail_" + id).remove();
 

hxd/inspect/TreeNode.hx

@@ -4,7 +4,7 @@ class TreeNode extends Node {
 
 	public var icon(default, set) : String;
 	public var openIcon(default, set) : Null<String>;
-	var jchild : cdb.jq.JQuery;
+	var jchild : vdom.JQuery;
 
 	override function initContent() {
 		j = getJRoot().query("<li>");

hxd/net/SocketHost.hx

@@ -74,13 +74,17 @@ class SocketHost extends NetworkHost {
 		isAuth = false;
 	}
 
-	public function close() {
+	public function dispose() {
+		close();
+		if( NetworkHost.current == this ) NetworkHost.current = null;
+	}
+
+	function close() {
 		if( socket != null ) {
 			socket.close();
 			socket = null;
 		}
 		connected = false;
-		if( NetworkHost.current == this ) NetworkHost.current = null;
 	}
 
 	public function connect( host : String, port : Int, ?onConnect : Bool -> Void ) {