Skip to content
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

BlockData reading #7

Merged
merged 1 commit into from
Aug 30, 2022
Merged

BlockData reading #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
122 changes: 61 additions & 61 deletions WolvenKit.CR2W/Types/BufferedTypes/BufferStructs/Complex/SBlockData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,48 +38,48 @@ public override void Read(BinaryReader file, uint size)
{
//TODO: Read the different objects
case Enums.BlockDataObjectType.Collision:
//{
// packedObject = new SBlockDataCollisionObject(cr2w, this, nameof(SBlockDataCollisionObject));
// break;
//}
{
packedObject = new SBlockDataCollisionObject(cr2w, this, nameof(SBlockDataCollisionObject));
break;
}

case Enums.BlockDataObjectType.Particles:
//{
// packedObject = new SBlockDataParticles(cr2w, this, nameof(SBlockDataLight));
// break;
//}
{
packedObject = new SBlockDataParticles(cr2w, this, nameof(SBlockDataLight));
break;
}
case Enums.BlockDataObjectType.RigidBody:
//{
// packedObject = new SBlockDataRigidBody(cr2w, this, nameof(SBlockDataRigidBody));
// break;
//}
{
packedObject = new SBlockDataRigidBody(cr2w, this, nameof(SBlockDataRigidBody));
break;
}
case Enums.BlockDataObjectType.Mesh:
{
// MFP - we need this for the scene viewer
packedObject = new SBlockDataMeshObject(cr2w, this, nameof(SBlockDataMeshObject));
break;
}
case Enums.BlockDataObjectType.Dimmer:
//{
// packedObject = new SBlockDataDimmer(cr2w, this, nameof(SBlockDataDimmer));
// break;
//}
{
packedObject = new SBlockDataDimmer(cr2w, this, nameof(SBlockDataDimmer));
break;
}

case Enums.BlockDataObjectType.PointLight:
//{
// packedObject = new SBlockDataLight(cr2w, this, nameof(SBlockDataLight));
// break;
//}
{
packedObject = new SBlockDataLight(cr2w, this, nameof(SBlockDataLight));
break;
}
case Enums.BlockDataObjectType.SpotLight:
//{
// packedObject = new SBlockDataSpotLight(cr2w, this, nameof(SBlockDataSpotLight));
// break;
//}
{
packedObject = new SBlockDataSpotLight(cr2w, this, nameof(SBlockDataSpotLight));
break;
}
case Enums.BlockDataObjectType.Decal:
//{
// packedObject = new SBlockDataDecal(cr2w, this, nameof(SBlockDataDecal));
// break;
//}
{
packedObject = new SBlockDataDecal(cr2w, this, nameof(SBlockDataDecal));
break;
}
case Enums.BlockDataObjectType.Cloth: //TODO: Implement CClothComponent here
case Enums.BlockDataObjectType.Destruction: //TODO: Implement CDestructionComponent here
case Enums.BlockDataObjectType.Invalid: //TODO: Check why this breaks sometimes?
Expand Down Expand Up @@ -205,45 +205,45 @@ public override List<IEditableVariable> GetEditableVariables()
//TODO: Add here the differnt copy methods

case Enums.BlockDataObjectType.Collision:
//{
// baseobj.Add((SBlockDataCollisionObject)packedObject);
// break;
//}
{
baseobj.Add((SBlockDataCollisionObject)packedObject);
break;
}
case Enums.BlockDataObjectType.Particles:
//{
// baseobj.Add((SBlockDataParticles)packedObject);
// break;
//}
{
baseobj.Add((SBlockDataParticles)packedObject);
break;
}
case Enums.BlockDataObjectType.RigidBody:
//{
// baseobj.Add((SBlockDataRigidBody)packedObject);
// break;
//}
{
baseobj.Add((SBlockDataRigidBody)packedObject);
break;
}
case Enums.BlockDataObjectType.Mesh:
//{
// baseobj.Add((SBlockDataMeshObject)packedObject);
// break;
//}
{
baseobj.Add((SBlockDataMeshObject)packedObject);
break;
}
case Enums.BlockDataObjectType.Dimmer:
//{
// baseobj.Add((SBlockDataDimmer)packedObject);
// break;
//}
{
baseobj.Add((SBlockDataDimmer)packedObject);
break;
}
case Enums.BlockDataObjectType.PointLight:
//{
// baseobj.Add((SBlockDataLight)packedObject);
// break;
//}
{
baseobj.Add((SBlockDataLight)packedObject);
break;
}
case Enums.BlockDataObjectType.SpotLight:
//{
// baseobj.Add((SBlockDataSpotLight)packedObject);
// break;
//}
{
baseobj.Add((SBlockDataSpotLight)packedObject);
break;
}
case Enums.BlockDataObjectType.Decal:
//{
// baseobj.Add((SBlockDataDecal)packedObject);
// break;
//}
{
baseobj.Add((SBlockDataDecal)packedObject);
break;
}
case Enums.BlockDataObjectType.Cloth:
case Enums.BlockDataObjectType.Destruction:
default:
Expand Down
22 changes: 11 additions & 11 deletions WolvenKit.CR2W/Types/Primitive/Enums.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,17 +685,17 @@ public enum EDM_MappinType

public enum BlockDataObjectType
{
Invalid = 0x1,
Mesh = 0x2,
Collision = 0x3,
Decal = 0x4,
Dimmer = 0x5,
PointLight = 0x6,
SpotLight = 0x7,
RigidBody = 0x8,
Cloth = 0x9,
Destruction = 0xA,
Particles = 0xB,
Invalid = 0,
Mesh = 1,
Collision = 2,
Decal = 3,
Dimmer = 4,
PointLight = 5,
SpotLight = 6,
RigidBody = 7,
Cloth = 8,
Destruction = 9,
Particles = 10,
};

public enum EFactValueChangeMethod
Expand Down