Server source separated into libraries, this makes the code easier to read.

Signed-off-by: Juan Carlos del Valle <jc.ekinox@gmail.com> (imekinox)

Author: imekinox

wrappers/actionscript/CMakeLists.txt

@@ -1,28 +1,37 @@
-######################################################################################
-# ActionScript socket server builder
-######################################################################################
-
-if (WIN32)
- set_source_files_properties(server/as3-server.c PROPERTIES LANGUAGE CXX)
-
- set(THREADS_USE_PTHREADS_WIN32 true)
- find_package(Threads REQUIRED)
-
- include_directories(${THREADS_PTHREADS_INCLUDE_DIR})
-endif()
-
-add_executable(as3-server server/as3-server.c)
-if(APPLE)
-set(CMAKE_EXE_LINKER_FLAGS "-framework CoreFoundation -framework IOKit")
-else(APPLE)
-find_package(Threads REQUIRED)
-if (WIN32)
- set(MATH_LIB "")
-else(WIN32)
- set(MATH_LIB "m")
-endif()
-
-endif()
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../wrappers/c_sync)
-
-target_link_libraries(as3-server freenect_sync_static ${MATH_LIB} ${CMAKE_THREAD_LIBS_INIT})
+######################################################################################
+# ActionScript socket server builder
+######################################################################################
+
+find_package(JPEG REQUIRED)
+
+include_directories(${JPEG_INCLUDE_DIR})
+
+add_library (as3_jpeg server/as3_jpeg.c)
+target_link_libraries (as3_jpeg ${JPEG_LIBRARIES})
+
+add_library (freenect_network server/freenect_network.c)
+
+if (WIN32)
+ set_source_files_properties(server/as3-server.c PROPERTIES LANGUAGE CXX)
+
+ set(THREADS_USE_PTHREADS_WIN32 true)
+ find_package(Threads REQUIRED)
+
+ include_directories(${THREADS_PTHREADS_INCLUDE_DIR})
+endif()
+
+add_executable(as3-server server/as3-server.c)
+if(APPLE)
+set(CMAKE_EXE_LINKER_FLAGS "-framework CoreFoundation -framework IOKit")
+else(APPLE)
+find_package(Threads REQUIRED)
+if (WIN32)
+ set(MATH_LIB "")
+else(WIN32)
+ set(MATH_LIB "m")
+endif()
+
+endif()
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../wrappers/c_sync)
+
+target_link_libraries(as3-server freenect_sync_static as3_jpeg freenect_network ${MATH_LIB} ${CMAKE_THREAD_LIBS_INIT})

wrappers/actionscript/org/as3kinect/as3kinect.as

@@ -42,11 +42,14 @@
 public static const MIC_ID:int = 2;
 
 public static const GET_DEPTH:int = 0;
-public static const GET_VIDEO:int = 1;
-public static const MIRROR_DEPTH:int = 2;
-public static const MIRROR_VIDEO:int = 3;
-public static const MIN_DEPTH:int = 4;
-public static const MAX_DEPTH:int = 5;
+public static const GET_RAW_DEPTH:int = 1;
+public static const GET_VIDEO:int = 2;
+public static const MIRROR_DEPTH:int = 3;
+public static const MIRROR_VIDEO:int = 4;
+public static const MIN_DEPTH:int = 5;
+public static const MAX_DEPTH:int = 6;
+public static const DEPTH_COMPRESSION:int = 7;
+public static const VIDEO_COMPRESSION:int = 8;
 
 public static const MOVE_MOTOR:int = 0;
 public static const LED_COLOR:int = 1;

wrappers/actionscript/org/as3kinect/as3kinectDepth.as

@@ -40,6 +40,7 @@ package org.as3kinect {
 private var _is_mirrored:Boolean;
 private var _min_distance:int;
 private var _max_distance:int;
+private var _compression:int;
 public var bitmap:BitmapData;
 
 public function as3kinectDepth(){
@@ -49,6 +50,7 @@ package org.as3kinect {
 _is_mirrored = false;
 _min_distance = 600;
 _max_distance = 800;
+_compression = 20;
 bitmap = new BitmapData(as3kinect.IMG_WIDTH, as3kinect.IMG_HEIGHT, false, 0xFF000000);
 }
 
@@ -69,6 +71,23 @@ package org.as3kinect {
 }
 }
 
+/*
+ * Tell server to send the latest depth raw frame
+ * Note: We should lock the command while we are waiting for the data to avoid lag
+ */
+public function getRawBuffer():void {
+if(!_depth_busy){
+_depth_busy = true;
+_data.clear();
+_data.writeByte(as3kinect.CAMERA_ID);
+_data.writeByte(as3kinect.GET_RAW_DEPTH);
+_data.writeInt(0);
+if(_socket.sendCommand(_data) != as3kinect.SUCCESS){
+throw new Error('Data was not complete');
+}
+}
+}
+
 public function set busy(flag:Boolean):void 
 {
 _depth_busy = flag;
@@ -132,5 +151,23 @@ package org.as3kinect {
 {
 return _max_distance;
 }
+
+public function set compression(quality:int):void 
+{
+_data.clear();
+_data.writeByte(as3kinect.CAMERA_ID);
+_data.writeByte(as3kinect.DEPTH_COMPRESSION);
+_data.writeInt(int(quality));
+if(_socket.sendCommand(_data) != as3kinect.SUCCESS){
+throw new Error('Depth: Cannot change depth compression');
+} else {
+_compression = quality;
+}
+}
+
+public function get compression():int 
+{
+return _compression;
+}
 }
 }

wrappers/actionscript/org/as3kinect/as3kinectMotor.as

@@ -38,12 +38,14 @@ package org.as3kinect {
 private var _data:ByteArray;
 private var _motor_busy:Boolean;
 private var _motor_data:motorData;
+private var _motor_position:Number;
 
 public function as3kinectMotor(){
 _socket = as3kinectSocket.instance;
 _data = new ByteArray;
 _motor_busy = false;
 _motor_data = new motorData;
+_motor_position = 0;
 }
 
 
@@ -104,9 +106,16 @@ package org.as3kinect {
 _data.writeInt(position);
 if(_socket.sendCommand(_data) != as3kinect.SUCCESS){
 throw new Error('Data was not complete');
+} else {
+_motor_position = position;
 }
 }
-
+
+public function get position():Number
+{
+return _motor_position;
+}
+
 // 0 = Turn Off
 // 1 = Green
 // 2 = Red