Skip to content

fix(VRSL): apply outputConfig to VRSL deserializer #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Happyrobot33 merged 2 commits into from
May 12, 2026
Merged

fix(VRSL): apply outputConfig to VRSL deserializer #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1a7a51
Some preparations for the updates in SerializerVRSL.cs
Miniontoby Apr 29, 2026
d5a4d0c
Fixed the Deserializer for VRSL
Miniontoby Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Assets/Loader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ void Start()
showconf.Serializer = new VRSL();
showconf.Deserializer = new VRSL();
//showconf.Transcode = false;
showconf.TranscodeUniverseCount = 3;
showconf.TranscodeUniverseCount = 9;
showconf.SerializeUniverseCount = int.MaxValue;

//setup framerate
Expand Down
83 changes: 39 additions & 44 deletions Assets/Plugin/Serializers/SerializerVRSL.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public enum OutputConfigs
VerticalRight,
HorizontalBottom,
}
const int blockSize = 16; // 10x10 pixels per channel block
const int blockSize = 16; // 16x16 pixels per channel block
const int blocksPerCol = 13; // channels per column
public bool GammaCorrection = true;
public bool RGBGridMode = false;
Expand All @@ -25,40 +25,7 @@ public void CompleteFrame(ref Color32[] pixels, ref List<byte> channelValues, in

public void SerializeChannel(ref Color32[] pixels, byte channelValue, int channel, int textureWidth, int textureHeight)
{
GetPositionData(channel, out int x, out int y, out int universeOffset);

//if vertical, flip
switch (outputConfig)
{
case OutputConfigs.HorizontalTop:
x += universeOffset;
break;
case OutputConfigs.HorizontalBottom:
x += universeOffset;
y += textureHeight - (blocksPerCol * blockSize); // Shift down for horizontal bottom layout
break;
case OutputConfigs.VerticalLeft:
//swap x and y
int temp = x;
x = y;
y = temp;
y += universeOffset;
//flip Y coordinate
y = textureHeight - y - blockSize; // Flip Y coordinate for vertical layout
break;
case OutputConfigs.VerticalRight:
//swap x and y
temp = x;
x = y;
y = temp;
y += universeOffset;
//flip Y coordinate
y = textureHeight - y - blockSize; // Flip Y coordinate for vertical layout
x += textureWidth - (blocksPerCol * blockSize); // Shift to the right for vertical right layout
break;
default:
throw new ArgumentOutOfRangeException(nameof(outputConfig), outputConfig, null);
}
GetPositionData(channel, out int x, out int y, textureWidth, textureHeight);


//convert the x y to pixel index
Expand All @@ -72,7 +39,7 @@ public void SerializeChannel(ref Color32[] pixels, byte channelValue, int channe
if (GammaCorrection) { color = color.linear; } //lol WTF VRSL, you output in a converted color space instead of native linear???????
if (RGBGridMode)
{
byte value = 0;
byte value;
TextureWriter.ColorChannel cchannel;
switch (GetUniverseWrap(channel))
{
Expand Down Expand Up @@ -101,14 +68,16 @@ public void SerializeChannel(ref Color32[] pixels, byte channelValue, int channe

public void DeserializeChannel(Texture2D tex, ref byte channelValue, int channel, int textureWidth, int textureHeight)
{
GetPositionData(channel, out int x, out int y, out int universeOffset);
GetPositionData(channel, out int x, out int y, textureWidth, textureHeight);

if (y < -(blockSize / 2)) return; // Used when in vertical mode, to make sure we don't deserialize from the bottom again, when data is out of bounds

//add a half offset to get the center
x += blockSize / 2;
y += blockSize / 2;

// Get the color block from the texture
Color color = TextureReader.GetColor(tex, x + universeOffset, y);
Color color = TextureReader.GetColor(tex, x, y);
if (GammaCorrection) { color = color.gamma; } //TODO: test this NEEDS MORE TESTING, seems like this actually should be off by default?????

// Convert the color block to a channel value
Expand All @@ -135,22 +104,48 @@ public void DeserializeChannel(Texture2D tex, ref byte channelValue, int channel
}
}

private void GetPositionData(int channel, out int x, out int y, out int universeOffset)
private void GetPositionData(int channel, out int x, out int y, int textureWidth, int textureHeight)
{
int universe = channel / 512; // Assuming 512 channels per universe
int channelInUniverse = channel % 512; // Channel within the universe
int universe = (channel - channelInUniverse) / 512; // Assuming 512 channels per universe

//if rgb grid, make every 3 universes appear as the first 3
if (RGBGridMode)
{
universe = universe % 3; // Limit to 3 channels for RGB grid
}

x = (channelInUniverse / blocksPerCol) * blockSize;
y = (channelInUniverse % blocksPerCol) * blockSize;

//stupid universe bullshit in VRSL
universeOffset = universe * (512 / blocksPerCol * blockSize) + (universe * blockSize);
int universeOffset = universe * ((512 / blocksPerCol * blockSize) + blockSize);

int tempY = (channelInUniverse % blocksPerCol) * blockSize;
int tempX = ((channelInUniverse / blocksPerCol) * blockSize) + universeOffset;

// Swap X and Y when vertical mode
bool isVertical = outputConfig == OutputConfigs.VerticalLeft || outputConfig == OutputConfigs.VerticalRight;
x = isVertical ? tempY : tempX;
y = isVertical ? tempX : tempY;

//if vertical, flip
switch (outputConfig)
{
case OutputConfigs.HorizontalTop:
break;
case OutputConfigs.HorizontalBottom:
y += textureHeight - (blocksPerCol * blockSize); // Shift down for horizontal bottom layout
break;
case OutputConfigs.VerticalLeft:
//flip Y coordinate
y = textureHeight - y - blockSize; // Flip Y coordinate for vertical layout
break;
case OutputConfigs.VerticalRight:
//flip Y coordinate
y = textureHeight - y - blockSize; // Flip Y coordinate for vertical layout
x += textureWidth - (blocksPerCol * blockSize); // Shift to the right for vertical right layout
break;
default:
throw new ArgumentOutOfRangeException(nameof(outputConfig), outputConfig, null);
}
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion Assets/ShowConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class ShowConfiguration
[YamlMember(Description = "Whether to enable transcoding from the deserializer to the serializer. This is useful for converting between different pixel mapping formats.")]
public bool Transcode { get; set; }
[YamlMember(Description = "The number of universes to do transcoding for. This is useful for limiting the amount of data being processed if you know you only need a certain number of universes.")]
public int TranscodeUniverseCount { get; set; } = 3;
public int TranscodeUniverseCount { get; set; } = 9;
[YamlMember(Description = "The maximum number of universes that will be serialized. This usually doesnt need to be changed")]
public int SerializeUniverseCount { get; set; } = int.MaxValue; //this is the maximum number of universes that can be used for serializing.
[YamlMember(Description = "A list of channels to mask out. These channels will be forced to transparent. Define a start and end channel for each mask.")]
Expand Down
Loading