diff --git a/Scripts/010 Editor/ctb.bt b/Scripts/010 Editor/ctb.bt index e45a4d5..a7773aa 100644 --- a/Scripts/010 Editor/ctb.bt +++ b/Scripts/010 Editor/ctb.bt @@ -52,7 +52,7 @@ struct PREVIEW { uint Unknown3 ; uint Unknown4 ; - byte Data[ImageLength] ; + ubyte Data[ImageLength] ; }; struct PRINT_PARAMETERS { @@ -149,7 +149,7 @@ if(header.Version >= 4) uint Padding6 ; uint Unknown5 ; // 23047 but changes uint Unknown6 ; // 320 but changes - byte Reserved[420] ; + ubyte Reserved[420] ; } printParametersV4; } @@ -183,7 +183,7 @@ typedef struct() { typedef struct(int size) { - byte layerDataBlock[size] ; + ubyte layerDataBlock[size] ; } LAYER_RLE; FSeek(header.LayersDefinitionOffsetAddress); diff --git a/Scripts/010 Editor/cxdlp_v1.bt b/Scripts/010 Editor/cxdlp_v1.bt index e1f85db..09d98cf 100644 --- a/Scripts/010 Editor/cxdlp_v1.bt +++ b/Scripts/010 Editor/cxdlp_v1.bt @@ -21,29 +21,29 @@ typedef struct() { uint32 LayerPointNum ; layerPointsData pD()[LayerPointNum]; - BYTE CR_LF2[2] ; + ubyte CR_LF2[2] ; } layerData; typedef struct(int size) { - BYTE layerDataBlock[size] ; + ubyte layerDataBlock[size] ; } rgbPreviewImageRawData; struct HEADER { uint32 headerSize ; - BYTE header[header.headerSize] ; + ubyte header[header.headerSize] ; uint16 totalLayers ; uint16 resolutionX ; uint16 resolutionY ; rgbPreviewImageRawData preview(116*116*2); - BYTE rn0[2] ; + ubyte rn0[2] ; rgbPreviewImageRawData preview2(290*290*2); - BYTE rn1[2] ; + ubyte rn1[2] ; rgbPreviewImageRawData preview2(290*290*2); - BYTE rn2[2] ; + ubyte rn2[2] ; uint32 plateformXLength ; wchar_t plateformX[plateformXLength/2]; @@ -73,7 +73,7 @@ struct LAYER_DEF { for( i = 0; i < header.totalLayers; i++ ){ layerDef lD(); } - BYTE rn3[2] ; + ubyte rn3[2] ; } layerDefs; struct LAYERS { @@ -85,7 +85,7 @@ struct LAYERS { struct FOOTER { uint32 footerSize ; - BYTE str[footer.footerSize] ; + ubyte str[footer.footerSize] ; uint32 checkSum ; } footer; \ No newline at end of file diff --git a/Scripts/010 Editor/cxdlp_v2.bt b/Scripts/010 Editor/cxdlp_v2.bt index 91322ed..a442af0 100644 --- a/Scripts/010 Editor/cxdlp_v2.bt +++ b/Scripts/010 Editor/cxdlp_v2.bt @@ -6,8 +6,8 @@ //------------------------------------------------ // CHANGELOG: // Add uint16 unknown after header (Set to 2) -// Add uint32 modelSize and BYTE model[modelSize] after unknown -// Add byte offset[64] after resolutionY (Zeros) +// Add uint32 modelSize and ubyte model[modelSize] after unknown +// Add ubyte offset[64] after resolutionY (Zeros) BigEndian(); @@ -26,36 +26,36 @@ typedef struct() { uint32 layerPointNum ; layerPointsData pD()[layerPointNum]; - BYTE CR_LF2[2] ; + ubyte CR_LF2[2] ; } layerData; typedef struct(int size) { - BYTE layerDataBlock[size] ; + ubyte layerDataBlock[size] ; } rgbPreviewImageRawData; struct HEADER { uint32 headerSize ; - BYTE header[headerSize] ; + ubyte header[headerSize] ; uint16 version ; uint32 modelSize ; - BYTE model[modelSize] ; + ubyte model[modelSize] ; uint16 totalLayers ; uint16 resolutionX ; uint16 resolutionY ; - byte offset[64]; + ubyte offset[64]; rgbPreviewImageRawData preview(116*116*2); - BYTE rn0[2] ; + ubyte rn0[2] ; rgbPreviewImageRawData preview2(290*290*2); - BYTE rn1[2] ; + ubyte rn1[2] ; rgbPreviewImageRawData preview2(290*290*2); - BYTE rn2[2] ; + ubyte rn2[2] ; uint32 plateformXLength ; wchar_t plateformX[plateformXLength/2]; @@ -85,7 +85,7 @@ struct LAYER_DEF { for( i = 0; i < header.totalLayers; i++ ){ layerDef lD(); } - BYTE rn3[2] ; + ubyte rn3[2] ; } layerDefs; struct LAYERS { @@ -97,8 +97,8 @@ struct LAYERS { struct FOOTER { uint32 footerSize ; - BYTE str[footer.footerSize] ; + ubyte str[footer.footerSize] ; - byte checkSumControl[3] ; - unsigned byte checkSumByte ; + ubyte checkSumControl[3] ; + ubyte checkSumByte ; } footer; \ No newline at end of file diff --git a/Scripts/010 Editor/gr1.bt b/Scripts/010 Editor/gr1.bt index c55b088..32ec52a 100644 --- a/Scripts/010 Editor/gr1.bt +++ b/Scripts/010 Editor/gr1.bt @@ -18,23 +18,23 @@ typedef struct() { uint32 LayerPointNum ; layerPointsData pD()[LayerPointNum]; - BYTE CR_LF2[2] ; + ubyte CR_LF2[2] ; } layerData; typedef struct(int size) { - BYTE layerDataBlock[size] ; + ubyte layerDataBlock[size] ; } rgbPreviewImageRawData; struct HEADER { char version[2] ; ushort headerSize ; - BYTE header[header.headerSize] ; + ubyte header[header.headerSize] ; rgbPreviewImageRawData preview(116*116*2); - BYTE rn0[2] ; + ubyte rn0[2] ; rgbPreviewImageRawData preview2(290*290*2); - BYTE rn1[2] ; + ubyte rn1[2] ; uint16 totalLayers ; uint16 resolutionX ; @@ -72,5 +72,5 @@ struct LAYERS { struct FOOTER { uint32 footerSize ; - BYTE str[footer.footerSize] ; + ubyte str[footer.footerSize] ; } footer; \ No newline at end of file diff --git a/Scripts/010 Editor/lgs.bt b/Scripts/010 Editor/lgs.bt index 7b917b8..2dacca7 100644 --- a/Scripts/010 Editor/lgs.bt +++ b/Scripts/010 Editor/lgs.bt @@ -9,7 +9,7 @@ LittleEndian(); typedef struct() { uint32 DataSize ; - BYTE LayerRLE[DataSize] ; + ubyte LayerRLE[DataSize] ; } layerData; @@ -62,13 +62,13 @@ struct HEADER { } header; -byte preview_data[header.PreviewSizeX*header.PreviewSizeY*2]; +ubyte preview_data[header.PreviewSizeX*header.PreviewSizeY*2]; if(header.PrinterModel == 120) // .lgs120 { struct PNG_PREVIEW { uint32 pngLength ; - byte png[pngLength] ; + ubyte png[pngLength] ; ushort padding ; } png_preview; } diff --git a/Scripts/010 Editor/mdlp.bt b/Scripts/010 Editor/mdlp.bt index 501b06e..f8e95fb 100644 --- a/Scripts/010 Editor/mdlp.bt +++ b/Scripts/010 Editor/mdlp.bt @@ -18,23 +18,23 @@ typedef struct() { uint32 LayerPointNum ; layerPointsData pD()[LayerPointNum]; - BYTE CR_LF2[2] ; + ubyte CR_LF2[2] ; } layerData; typedef struct(int size) { - BYTE layerDataBlock[size] ; + ubyte layerDataBlock[size] ; } rgbPreviewImageRawData; struct HEADER { char version[2] ; ushort headerSize ; - BYTE header[header.headerSize] ; + ubyte header[header.headerSize] ; rgbPreviewImageRawData preview(116*116*2); - BYTE rn0[2] ; + ubyte rn0[2] ; rgbPreviewImageRawData preview2(290*290*2); - BYTE rn1[2] ; + ubyte rn1[2] ; uint16 totalLayers ; uint16 resolutionX ; @@ -64,5 +64,5 @@ struct LAYERS { struct FOOTER { uint32 footerSize ; - BYTE str[footer.footerSize] ; + ubyte str[footer.footerSize] ; } footer; \ No newline at end of file diff --git a/Scripts/010 Editor/osla.bt b/Scripts/010 Editor/osla.bt index 355ac8a..a270c45 100644 --- a/Scripts/010 Editor/osla.bt +++ b/Scripts/010 Editor/osla.bt @@ -57,7 +57,7 @@ if(header.TableSize > headerSize) struct CUSTOM { uint TableSize ; if(TableSize > 0){ - byte Data[TableSize] ; + ubyte Data[TableSize] ; } } custom; diff --git a/Scripts/010 Editor/photons.bt b/Scripts/010 Editor/photons.bt index bc04d37..c8ebdfe 100644 --- a/Scripts/010 Editor/photons.bt +++ b/Scripts/010 Editor/photons.bt @@ -15,11 +15,11 @@ typedef struct() { uint32 ResolutionY ; uint32 DataSize ; uint32 Unknown4 ; // 2684702720 - BYTE LayerRLE[DataSize / 8 - 4] ; + ubyte LayerRLE[DataSize / 8 - 4] ; } layerData; typedef struct(int size) { - BYTE layerDataBlock[size] ; + ubyte layerDataBlock[size] ; } rgbPreviewImageRawData; struct HEADER {