Commit a01207f1 by wester

rotation

parent 013f4714
......@@ -84,7 +84,8 @@ void ATilesetActor::parseBatched3DTile(const TArray<uint8> data, FTile * tile)
gltf->SetFolderPath(FName(*("SpawnedGLTF/" + this->GetName())));
#endif
gltf->AttachToActor(this, FAttachmentTransformRules::KeepWorldTransform);
gltf->SetActorRelativeTransform(FTransform(*tile->getAbsoluteTransform()));
FMatrix leftToRight(FVector(-1, 0, 0), FVector(0, 0, 1), FVector(0, 1, 0), FVector(0, 0, 0));
gltf->SetActorRelativeTransform(FTransform(leftToRight * *tile->getAbsoluteTransform()));
int GLTFstart = b3dmheader->getGLTFStart();
gltf->loadModel(&data.GetData()[GLTFstart], (data.Num() - GLTFstart));
......@@ -138,11 +139,13 @@ void ATilesetActor::parseInstanced3DTile(const TArray<uint8> data, FTile * tile)
FVector up(pos);
up.Normalize();
FVector Z(0, 0, 1);
FVector east = FVector::CrossProduct( up,Z );
FVector east = FVector::CrossProduct( Z, up );
FVector north = FVector::CrossProduct(east, up);
FMatrix NEU(north, up, east, pos);
clone->SetActorTransform(FTransform(NEU));
}
}
gltf->SetActorTransform(FTransform(positons[0]));
......
......@@ -19,6 +19,9 @@ struct FAsset
UPROPERTY()
FString tilesetVersion;
UPROPERTY()
FString gltfUpAxis;
FAsset() {
version = "";
tilesetVersion = "";
......
......@@ -251,7 +251,6 @@ void AProceduralEntity::loadModel(const uint8* RawFileData, int32 lenght) {
if (MasterMaterialRef == nullptr) {
MasterMaterialRef = LoadObject<UMaterialInterface>(NULL, TEXT("/Game/Materials/TexturedMaterial"), NULL, LOAD_None, NULL);
//= FindObject<UMaterialInterface>(GetWorld(), TEXT("TexturedMaterial"));
UE_LOG(GLTF, Error, TEXT("Material: %s"), *MasterMaterialRef->GetName());
}
if (UniformMaterialRef == nullptr) {
UniformMaterialRef = LoadObject<UMaterialInterface>(NULL, TEXT("/Game/Materials/TexturedMaterial"), NULL, LOAD_None, NULL);
......
http://folk.uio.no/inftt/Div/visualization2.pdf
https://wiki.delphigl.com/index.php/Screenspace_Error
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment