Commit 311c1bbf by wester

gitmodules

big pointclouds
parent 0e37126e
...@@ -9,4 +9,5 @@ Saved ...@@ -9,4 +9,5 @@ Saved
*.sln *.sln
*.suo *.suo
*.xcodeproj *.xcodeproj
*.xcworkspace *.xcworkspace
\ No newline at end of file /gdal-2.1.3
...@@ -4,3 +4,4 @@ ...@@ -4,3 +4,4 @@
[submodule "ThirdParty/assimp"] [submodule "ThirdParty/assimp"]
path = assimp path = assimp
url = https://github.com/assimp/assimp.git url = https://github.com/assimp/assimp.git
ignore = dirty
This source diff could not be displayed because it is too large. You can view the blob instead.
No preview for this file type
...@@ -35,13 +35,14 @@ APointCloudActor::APointCloudActor(const FObjectInitializer& ObjectInitializer) ...@@ -35,13 +35,14 @@ APointCloudActor::APointCloudActor(const FObjectInitializer& ObjectInitializer)
} }
void APointCloudActor::setPoints(UTexture2D* PointCloud, FVector pos, FVector scale){ void APointCloudActor::setPoints(UTexture2D* PointCloud, FVector pos, FVector scale, float TextureOffset){
if (pos.Y < 0) pos.Y = 0; if (pos.Y < 0) pos.Y = 0;
UE_LOG(TILES, Log, TEXT("PointclodActor pos: %s size: %s"), *pos.ToString(), *scale.ToString()); UE_LOG(TILES, Log, TEXT("PointclodActor pos: %s size: %s"), *pos.ToString(), *scale.ToString());
Material->SetTextureParameterValue(FName("PointCloud"), PointCloud); Material->SetTextureParameterValue(FName("PointCloud"), PointCloud);
Material->SetScalarParameterValue(FName("TextureSize"), PointCloud->GetSizeX()); Material->SetScalarParameterValue(FName("TextureSize"), PointCloud->GetSizeX());
Material->SetVectorParameterValue(FName("CloudCenter"), pos); Material->SetVectorParameterValue(FName("CloudCenter"), pos);
Material->SetVectorParameterValue(FName("BoundigBox"), scale); Material->SetVectorParameterValue(FName("BoundigBox"), scale);
Material->SetScalarParameterValue(FName("TextureOffset"), TextureOffset);
Points = PointCloud; Points = PointCloud;
StaticMeshComponent->SetMaterial(0, Material); StaticMeshComponent->SetMaterial(0, Material);
......
...@@ -13,7 +13,7 @@ class MASTERTESTPROJECT_API APointCloudActor : public AActor ...@@ -13,7 +13,7 @@ class MASTERTESTPROJECT_API APointCloudActor : public AActor
public: public:
// Sets default values for this actor's properties // Sets default values for this actor's properties
APointCloudActor(const FObjectInitializer& ObjectInitializer); APointCloudActor(const FObjectInitializer& ObjectInitializer);
void setPoints(UTexture2D* Points, FVector pos, FVector scale); void setPoints(UTexture2D* Points, FVector pos, FVector scale, float TextureOffset);
void setColors(UTexture2D* Colors); void setColors(UTexture2D* Colors);
UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Material") UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Material")
......
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