more godot support

Author: ashduino101

css/sheet.png

@@ -22,6 +22,12 @@
   background-position: -72px 0 !important;
 }
 
+.icon-dir {
+  background-image: url('/css/sheet.png') !important;
+  background-size: 192px 192px;
+  background-position: -96px 0 !important;
+}
+
 .icon-object {
   background-image: url('/css/sheet.png') !important;
   background-size: 192px 192px;

css/tree.css

@@ -1,5 +1,5 @@
-mod utils;
-mod pngenc;
-mod texdec;
-mod fp16;
-mod compress;
+pub mod utils;
+pub mod pngenc;
+pub mod texdec;
+pub mod fp16;
+pub mod compress;

encoders/src/lib.rs

@@ -176,14 +176,16 @@ pub fn decode_bgra4444(data: &mut [u8], width: usize, height: usize) -> Box<[u8]
 }
 
 #[wasm_bindgen]
-pub fn decode_normalizedbyte2(data: &mut [u8], width: usize, height: usize) -> Box<[u8]> {
+pub fn decode_rgba5551(data: &mut [u8], width: usize, height: usize) -> Box<[u8]> {
     let mut out = Vec::new();
-    out.resize(width * height * 4, 0);
     for i in 0..(width * height) {
-        out[i * 4] = data[i * 2];
-        out[i * 4 + 1] = data[i * 2];
-        out[i * 4 + 2] = data[i * 2];
-        out[i * 4 + 3] = data[i * 2 + 1];
+        let color = u16::from_le_bytes([data[i * 2], data[i * 2 + 1]]);
+        out.write_all(&[
+            ((color & 0x001F) << 3) as u8,
+            ((color & 0x03E0) >> 2) as u8,
+            ((color & 0x7C00) >> 7) as u8,
+            (if (color & 0x8000) == 0x8000 {0xff} else {0x00}) as u8
+        ]).expect("rgba5551");
     }
     out.into()
 }
@@ -265,6 +267,22 @@ pub fn decode_rghalf(data: &mut [u8], width: usize, height: usize) -> Box<[u8]>
     out.into()
 }
 
+#[wasm_bindgen]
+pub fn decode_rgbhalf(data: &mut [u8], width: usize, height: usize) -> Box<[u8]> {
+    let mut out = Vec::new();
+    for i in 0..(width * height) {
+        let r = ((data[i * 6 + 1] as u16) << 8) | (data[i * 6] as u16);
+        let g = ((data[i * 6 + 3] as u16) << 8) | (data[i * 6 + 2] as u16);
+        let b = ((data[i * 6 + 5] as u16) << 8) | (data[i * 6 + 4] as u16);
+        out.write_all(&[
+            (fp16_ieee_to_fp32_value(r) * 255.0) as u8,
+            (fp16_ieee_to_fp32_value(g) * 255.0) as u8,
+            (fp16_ieee_to_fp32_value(b) * 255.0) as u8,
+        ]).expect("rgbhalf");
+    }
+    out.into()
+}
+
 #[wasm_bindgen]
 pub fn decode_rgbahalf(data: &mut [u8], width: usize, height: usize) -> Box<[u8]> {
     let mut out = Vec::new();
@@ -278,7 +296,7 @@ pub fn decode_rgbahalf(data: &mut [u8], width: usize, height: usize) -> Box<[u8]
             (fp16_ieee_to_fp32_value(g) * 255.0) as u8,
             (fp16_ieee_to_fp32_value(b) * 255.0) as u8,
             (fp16_ieee_to_fp32_value(a) * 255.0) as u8,
-        ]).expect("rghalf");
+        ]).expect("rgbahalf");
     }
     out.into()
 }
@@ -311,6 +329,19 @@ pub fn decode_rgfloat(data: &mut [u8], width: usize, height: usize) -> Box<[u8]>
     out.into()
 }
 
+#[wasm_bindgen]
+pub fn decode_rgbfloat(data: &mut [u8], width: usize, height: usize) -> Box<[u8]> {
+    let mut out = Vec::new();
+    for i in 0..(width * height) {
+        out.write_all(&[
+            f32::from_le_bytes([data[i * 12], data[i * 12 + 1], data[i * 12 + 2], data[i * 12 + 3]]) as u8,
+            f32::from_le_bytes([data[i * 12 + 4], data[i * 12 + 5], data[i * 12 + 6], data[i * 12 + 7]]) as u8,
+            f32::from_le_bytes([data[i * 12 + 8], data[i * 12 + 9], data[i * 12 + 10], data[i * 12 + 11]]) as u8,
+        ]).expect("rgbfloat");
+    }
+    out.into()
+}
+
 #[wasm_bindgen]
 pub fn decode_rgbafloat(data: &mut [u8], width: usize, height: usize) -> Box<[u8]> {
     let mut out = Vec::new();
@@ -408,6 +439,32 @@ pub fn decode_r8(data: &mut [u8], width: usize, height: usize) -> Box<[u8]> {
     out.into()
 }
 
+#[wasm_bindgen]
+pub fn decode_l8(data: &mut [u8], width: usize, height: usize) -> Box<[u8]> {
+    let mut out = Vec::new();
+    out.resize(width * height * 4, 0);
+    for i in 0..(width * height) {
+        out[i * 4] = data[i];
+        out[i * 4 + 1] = data[i];
+        out[i * 4 + 2] = data[i];
+        out[i * 4 + 3] = 0xff;
+    }
+    out.into()
+}
+
+#[wasm_bindgen]
+pub fn decode_la16(data: &mut [u8], width: usize, height: usize) -> Box<[u8]> {
+    let mut out = Vec::new();
+    out.resize(width * height * 4, 0);
+    for i in 0..(width * height) {
+        out[i * 4] = data[i * 2];
+        out[i * 4 + 1] = data[i * 2];
+        out[i * 4 + 2] = data[i * 2];
+        out[i * 4 + 3] = data[i * 2 + 1];
+    }
+    out.into()
+}
+
 #[wasm_bindgen]
 pub fn decode_rg32(data: &mut [u8], width: usize, height: usize) -> Box<[u8]> {
     let mut out = Vec::new();
@@ -617,58 +674,74 @@ pub fn decode(format: &str, data: &mut [u8], width: usize, height: usize, is_xbo
             if is_xbox { swap_bytes_xbox(data) };
             decode_rgb565(data, width, height)
         },
-        "R16" => decode_r16(data, width, height),
-        "DXT1" => {
-            if is_xbox { swap_bytes_xbox(data) };
-            decode_dxt1(data, width, height)
-        },
-        "DXT3" => {
-            decode_dxt3(data, width, height)
-        },
-        "DXT5" => {
-            if is_xbox { swap_bytes_xbox(data) };
-            decode_dxt5(data, width, height)
-        },
-        "RGBA4444" => {
-            decode_rgba4444(data, width, height)
-        },
+        "RGBA4444" => decode_rgba4444(data, width, height),
+        "RGBA5551" => decode_rgba5551(data, width, height),
         "BGRA32" => decode_bgra32(data, width, height),
+
         "RHalf" => decode_rhalf(data, width, height),
         "RGHalf" => decode_rghalf(data, width, height),
+        "RGBHalf" => decode_rgbhalf(data, width, height),
         "RGBAHalf" => decode_rgbahalf(data, width, height),
+
         "RFloat" => decode_rfloat(data, width, height),
         "RGFloat" => decode_rgfloat(data, width, height),
+        "RGBFloat" => decode_rgbfloat(data, width, height),
         "RGBAFloat" => decode_rgbafloat(data, width, height),
+
         "YUY2" => decode_yuy2(data, width, height),
+
         "RGB9e5Float" => decode_rgb9e5float(data, width, height),
+
         "BC6H" => decode_bc6h(data, width, height),
         "BC7" => decode_bc7(data, width, height),
         "BC4" => decode_bc4(data, width, height),
         "BC5" => decode_bc5(data, width, height),
+
+        "DXT1" => {
+            if is_xbox { swap_bytes_xbox(data) };
+            decode_dxt1(data, width, height)
+        },
+        "DXT3" => {
+            decode_dxt3(data, width, height)
+        },
+        "DXT5" => {
+            if is_xbox { swap_bytes_xbox(data) };
+            decode_dxt5(data, width, height)
+        },
         "DXT1Crunched" => decode_dxt1(data, width, height),
         "DXT5Crunched" => decode_dxt5(data, width, height),
+
         "PVRTC_RGB2" | "PVRTC_RGBA2" => decode_pvrtc(data, width, height, true),
         "PVRTC_RGB4" | "PVRTC_RGBA4" => decode_pvrtc(data, width, height, false),
-        "ETC_RGB4" | "ETC_RGB4_3DS" => decode_etc1(data, width, height),
+
         "ATC_RGB4" => decode_atc_rgb4(data, width, height),
         "ATC_RGBA8" => decode_atc_rgba8(data, width, height),
+
         "EAC_R" => decode_eacr(data, width, height),
         "EAC_R_SIGNED" => decode_eacr_signed(data, width, height),
         "EAC_RG" => decode_eacrg(data, width, height),
         "EAC_RG_SIGNED" => decode_eacrg_signed(data, width, height),
+
+        "ETC_RGB4" | "ETC_RGB4_3DS" => decode_etc1(data, width, height),
         "ETC2_RGB" => decode_etc2(data, width, height),
         "ETC2_RGBA1" => decode_etc2_a1(data, width, height),
         "ETC2_RGBA8" | "ETC2_RGBA8_3DS" => decode_etc2_a8(data, width, height),
+        "ETC_RGB4Crunched" => decode_etc1(data, width, height),
+        "ETC_RGBA8Crunched" => decode_etc2_a8(data, width, height),
+
         "ASTC_RGB_4x4" | "ASTC_RGBA_4x4" | "ASTC_HDR_4x4" => decode_astc(data, width, height, 4, 4),
         "ASTC_RGB_5x5" | "ASTC_RGBA_5x5" | "ASTC_HDR_5x5" => decode_astc(data, width, height, 5, 5),
         "ASTC_RGB_6x6" | "ASTC_RGBA_6x6" | "ASTC_HDR_6x6" => decode_astc(data, width, height, 6, 6),
         "ASTC_RGB_8x8" | "ASTC_RGBA_8x8" | "ASTC_HDR_8x8" => decode_astc(data, width, height, 8, 8),
         "ASTC_RGB_10x10" | "ASTC_RGBA_10x10" | "ASTC_HDR_10x10" => decode_astc(data, width, height, 10, 10),
         "ASTC_RGB_12x12" | "ASTC_RGBA_12x12" | "ASTC_HDR_12x12" => decode_astc(data, width, height, 12, 12),
-        "RG16" => decode_rg16(data, width, height),
+
+        "L8" => decode_l8(data, width, height),
+        "LA16" => decode_la16(data, width, height),
+
         "R8" => decode_r8(data, width, height),
-        "ETC_RGB4Crunched" => decode_etc1(data, width, height),
-        "ETC_RGBA8Crunched" => decode_etc2_a8(data, width, height),
+        "R16" => decode_r16(data, width, height),
+        "RG16" => decode_rg16(data, width, height),
         "RG32" => decode_rg32(data, width, height),
         "RGB48" => decode_rgb48(data, width, height),
         "RGBA64" => decode_rgba64(data, width, height),

encoders/src/texdec.rs

@@ -1,13 +1,17 @@
-//! Test suite for the Web and headless browsers.
 
-#![cfg(target_arch = "wasm32")]
-
-extern crate wasm_bindgen_test;
 use wasm_bindgen_test::*;
+use encoders::*;
 
-wasm_bindgen_test_configure!(run_in_browser);
+#[wasm_bindgen_test]
+fn test_swap() {
+    let mut test_data = [0u8, 1, 2, 3, 4, 5, 6, 7];
+    texdec::swap_bytes_xbox(&mut test_data);
+    assert_eq!(test_data, [1u8, 0, 3, 2, 5, 4, 7, 6]);
+}
 
 #[wasm_bindgen_test]
-fn pass() {
-    assert_eq!(1 + 1, 2);
+fn test_bgr2rgb() {
+    let mut test_data = [128u8, 0, 64, 255, 64, 0, 128,  255, 32, 0, 32, 255];
+    texdec::bgr2rgb(&mut test_data);
+    assert_eq!(test_data, [64u8, 0, 128, 255, 128, 0, 64, 255, 32, 0, 32, 255]);
 }

encoders/tests/web.rs

@@ -75,7 +75,7 @@ export function decode_bgra4444(data: Uint8Array, width: number, height: number)
 * @param {number} height
 * @returns {Uint8Array}
 */
-export function decode_normalizedbyte2(data: Uint8Array, width: number, height: number): Uint8Array;
+export function decode_rgba5551(data: Uint8Array, width: number, height: number): Uint8Array;
 /**
 * @param {Uint8Array} data
 * @param {number} width
@@ -117,6 +117,13 @@ export function decode_rghalf(data: Uint8Array, width: number, height: number):
 * @param {number} height
 * @returns {Uint8Array}
 */
+export function decode_rgbhalf(data: Uint8Array, width: number, height: number): Uint8Array;
+/**
+* @param {Uint8Array} data
+* @param {number} width
+* @param {number} height
+* @returns {Uint8Array}
+*/
 export function decode_rgbahalf(data: Uint8Array, width: number, height: number): Uint8Array;
 /**
 * @param {Uint8Array} data
@@ -138,6 +145,13 @@ export function decode_rgfloat(data: Uint8Array, width: number, height: number):
 * @param {number} height
 * @returns {Uint8Array}
 */
+export function decode_rgbfloat(data: Uint8Array, width: number, height: number): Uint8Array;
+/**
+* @param {Uint8Array} data
+* @param {number} width
+* @param {number} height
+* @returns {Uint8Array}
+*/
 export function decode_rgbafloat(data: Uint8Array, width: number, height: number): Uint8Array;
 /**
 * @param {Uint8Array} data
@@ -173,6 +187,20 @@ export function decode_r8(data: Uint8Array, width: number, height: number): Uint
 * @param {number} height
 * @returns {Uint8Array}
 */
+export function decode_l8(data: Uint8Array, width: number, height: number): Uint8Array;
+/**
+* @param {Uint8Array} data
+* @param {number} width
+* @param {number} height
+* @returns {Uint8Array}
+*/
+export function decode_la16(data: Uint8Array, width: number, height: number): Uint8Array;
+/**
+* @param {Uint8Array} data
+* @param {number} width
+* @param {number} height
+* @returns {Uint8Array}
+*/
 export function decode_rg32(data: Uint8Array, width: number, height: number): Uint8Array;
 /**
 * @param {Uint8Array} data