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

Jump to bottom

Add landscape tools #1326

Merged
merged 16 commits into from
Aug 1, 2023
Merged

Add landscape tools #1326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b98a582
feat: export height field to 16 bit png image
DarcJC Jul 18, 2023
528a6c1
refract: format files
DarcJC Jul 18, 2023
956917d
chore: add new binary serialization library
DarcJC Jul 18, 2023
886d058
refact: format file
DarcJC Jul 18, 2023
9ed27ec
feat: add asset type structure
DarcJC Jul 18, 2023
4f4f9eb
feat: support texture export
DarcJC Jul 18, 2023
764985f
feat: add types
DarcJC Jul 19, 2023
d262eaa
feat: add zeno asset tool
DarcJC Jul 20, 2023
f17e021
feat: add checksum support
DarcJC Jul 25, 2023
70b99c5
feat: add point type
DarcJC Jul 26, 2023
d19edd8
fix: add PointSet to Any type
DarcJC Jul 26, 2023
19905c8
feat: add point set node
DarcJC Jul 26, 2023
ef575a6
fix: make transform default value to 1.0f
DarcJC Jul 27, 2023
5b396eb
feat: update landscape data
DarcJC Jul 27, 2023
601d740
feat: add resample node
DarcJC Jul 27, 2023
7f0e5f6
feat: resample landscape now copy all attributes from source
DarcJC Jul 28, 2023
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
7 changes: 6 additions & 1 deletion projects/UnrealTool/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.10)
cmake_minimum_required(VERSION 3.14)

file(GLOB_RECURSE PROJECT_SOURCE *.h *.cpp)
FILE(GLOB_RECURSE STATIC_DEFINITION "StaticDefinition.cxx")
Expand All @@ -9,5 +9,10 @@ target_compile_definitions(zeno PUBLIC -DWIN32_LEAN_AND_MEAN)

target_include_directories(zeno PUBLIC ./include)

# required libpng for exporting png
find_package(PNG REQUIRED)
include_directories(${PNG_INCLUDE_DIR})
target_link_libraries(zeno PRIVATE ${PNG_LIBRARY})

target_sources(zeno PRIVATE ${PROJECT_SOURCE})
target_sources(zeno PRIVATE ${STATIC_DEFINITION})
246 changes: 134 additions & 112 deletions projects/UnrealTool/ReflectionNodes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,133 +1,155 @@
#include <zeno/zeno.h>
#include <zeno/logger.h>
#include <zeno/PrimitiveObject.h>
#include <zeno/unreal/UnrealTool.h>
#include <zeno/types/DictObject.h>
#include <zeno/funcs/PrimitiveUtils.h>
#include <zeno/logger.h>
#include <zeno/types/DictObject.h>
#include <zeno/unreal/UnrealTool.h>
#include <zeno/zeno.h>

namespace zeno {

// Landscape input node
struct RemoteLandscapeInput : public INode {
void apply() override {
std::string SubjectName = get_input2<std::string>("SubjectName");
std::optional<remote::HeightField> Data = remote::StaticRegistry.Get<remote::HeightField>(SubjectName, zeno::remote::StaticFlags.GetCurrentSession(), true);
if (Data.has_value()) {
const float ScaleX = Data->LandscapeScaleX == .0f ? 100.f : Data->LandscapeScaleX;
const float ScaleY = Data->LandscapeScaleY == .0f ? 100.f : Data->LandscapeScaleY;
const float ScaleZ = Data->LandscapeScaleZ == .0f ? 100.f : Data->LandscapeScaleZ;
// const float Scale = 1.0f;
std::shared_ptr<zeno::PrimitiveObject> Prim = remote::ConvertHeightDataToPrimitiveObject(Data.value(), 0, 0, {ScaleX, ScaleY, ScaleZ});
set_output2("prim", Prim);
} else {
zeno::log_error("landscape data not found.");
// Landscape input node
struct RemoteLandscapeInput : public INode {
void apply() override {
std::string SubjectName = get_input2<std::string>("SubjectName");
std::optional<remote::HeightField> Data =
remote::StaticRegistry.Get<remote::HeightField>(
SubjectName, zeno::remote::StaticFlags.GetCurrentSession(), true);
if (Data.has_value()) {
const float ScaleX =
Data->LandscapeScaleX == .0f ? 100.f : Data->LandscapeScaleX;
const float ScaleY =
Data->LandscapeScaleY == .0f ? 100.f : Data->LandscapeScaleY;
const float ScaleZ =
Data->LandscapeScaleZ == .0f ? 100.f : Data->LandscapeScaleZ;
// const float Scale = 1.0f;
std::shared_ptr<zeno::PrimitiveObject> Prim =
remote::ConvertHeightDataToPrimitiveObject(Data.value(), 0, 0,
{ScaleX, ScaleY, ScaleZ});
set_output2("prim", Prim);
} else {
zeno::log_error("landscape data not found.");
}
}
}
};
};

ZENO_DEFNODE(RemoteLandscapeInput)({
{
{"string", "SubjectName", "ReservedName_Landscape"},
},
{
{"prim"},
},
{},
{"Unreal"},
});
ZENO_DEFNODE(RemoteLandscapeInput)
({
{
{"string", "SubjectName", "ReservedName_Landscape"},
},
{
{"prim"},
},
{},
{"Unreal"},
});

struct RemoteSurfaceSampleInput : public INode {
void apply() override {
std::string SubjectName = get_input2<std::string>("SubjectName");
std::optional<remote::PointSet> Data = remote::StaticRegistry.Get<remote::PointSet>(SubjectName, zeno::remote::StaticFlags.GetCurrentSession(), true);
if (Data.has_value()) {
} else {
zeno::log_error("surface sample data not found.");
struct RemoteSurfaceSampleInput : public INode {
void apply() override {
std::string SubjectName = get_input2<std::string>("SubjectName");
std::optional<remote::PointSet> Data =
remote::StaticRegistry.Get<remote::PointSet>(
SubjectName, zeno::remote::StaticFlags.GetCurrentSession(), true);
if (Data.has_value()) {
} else {
zeno::log_error("surface sample data not found.");
}
}
}
};
};

ZENO_DEFNODE(RemoteSurfaceSampleInput)({
{},
{
{"prim"},
},
{},
{"Unreal"},
});
ZENO_DEFNODE(RemoteSurfaceSampleInput)
({
{},
{
{"prim"},
},
{},
{"Unreal"},
});

struct CreateMetaData : public INode {
void apply() override {
auto dict = get_input2<zeno::DictObject>("dict");
auto meta = std::make_shared<zeno::remote::MetaData>();
if (dict) {
const auto Literial = dict->getLiterial<std::string>();
for (auto& Item : Literial) {
meta->Data.insert_or_assign(Item.first, Item.second);
struct CreateMetaData : public INode {
void apply() override {
auto dict = get_input2<zeno::DictObject>("dict");
auto meta = std::make_shared<zeno::remote::MetaData>();
if (dict) {
const auto Literial = dict->getLiterial<std::string>();
for (auto &Item: Literial) {
meta->Data.insert_or_assign(Item.first, Item.second);
}
}
set_output2("meta", std::move(meta));
}
set_output2("meta", std::move(meta));
}
};
};

ZENO_DEFNODE(CreateMetaData)({
{
{"dict", "dict" },
},
{
{"meta"},
},
{},
{"Unreal"},
});
ZENO_DEFNODE(CreateMetaData)
({
{
{"dict", "dict"},
},
{
{"meta"},
},
{},
{"Unreal"},
});

struct PackVec3fToString : public INode {
void apply() override {
auto vec3f = get_input2<zeno::vec3f>("vec3f");
std::string str = std::to_string(vec3f.at(0)) + "," + std::to_string(vec3f.at(1)) + "," + std::to_string(vec3f.at(2));
set_output2("string", str);
}
};
struct PackVec3fToString : public INode {
void apply() override {
auto vec3f = get_input2<zeno::vec3f>("vec3f");
std::string str = std::to_string(vec3f.at(0)) + "," +
std::to_string(vec3f.at(1)) + "," +
std::to_string(vec3f.at(2));
set_output2("string", str);
}
};

ZENO_DEFNODE(PackVec3fToString)({
{
{ "vec3f", "vec3f" },
},
{
{"string", "string"},
},
{},
{"Unreal"},
});
ZENO_DEFNODE(PackVec3fToString)
({
{
{"vec3f", "vec3f"},
},
{
{"string", "string"},
},
{},
{"Unreal"},
});

struct PackBoundDiffToString : public INode {
void apply() override {
auto OriginPrim = get_input2<zeno::PrimitiveObject>("OriginPrim");
auto CurrentPrim = get_input2<zeno::PrimitiveObject>("CurrentPrim");
struct PackBoundDiffToString : public INode {
void apply() override {
auto OriginPrim = get_input2<zeno::PrimitiveObject>("OriginPrim");
auto CurrentPrim = get_input2<zeno::PrimitiveObject>("CurrentPrim");

auto [OriginMin, OriginMax] = zeno::primBoundingBox(OriginPrim.get());
auto [CurrentMin, CurrentMax] = zeno::primBoundingBox(CurrentPrim.get());
auto OriginEdgeLength = (OriginMax - OriginMin);
float PercentTop = (CurrentMax.at(0) - OriginMax.at(0)) / OriginEdgeLength.at(0);
float PercentBottom = (CurrentMin.at(0) - OriginMin.at(0)) / OriginEdgeLength.at(0);
float PercentLeft = (CurrentMax.at(2) - OriginMax.at(2)) / OriginEdgeLength.at(2);
float PercentRight = (CurrentMin.at(2) - OriginMin.at(2)) / OriginEdgeLength.at(2);
auto [OriginMin, OriginMax] = zeno::primBoundingBox(OriginPrim.get());
auto [CurrentMin, CurrentMax] = zeno::primBoundingBox(CurrentPrim.get());
auto OriginEdgeLength = (OriginMax - OriginMin);
float PercentTop =
(CurrentMax.at(0) - OriginMax.at(0)) / OriginEdgeLength.at(0);
float PercentBottom =
(CurrentMin.at(0) - OriginMin.at(0)) / OriginEdgeLength.at(0);
float PercentLeft =
(CurrentMax.at(2) - OriginMax.at(2)) / OriginEdgeLength.at(2);
float PercentRight =
(CurrentMin.at(2) - OriginMin.at(2)) / OriginEdgeLength.at(2);

std::string str = std::to_string(PercentTop) + "," + std::to_string(PercentBottom) + "," + std::to_string(PercentLeft) + "," + std::to_string(PercentRight);
set_output2("string", str);
}
};
std::string str =
std::to_string(PercentTop) + "," + std::to_string(PercentBottom) + "," +
std::to_string(PercentLeft) + "," + std::to_string(PercentRight);
set_output2("string", str);
}
};

ZENO_DEFNODE(PackBoundDiffToString)({
{
{ "prim", "OriginPrim" },
{ "prim", "CurrentPrim" },
},
{
{"string", "string"},
},
{},
{"Unreal"},
});
ZENO_DEFNODE(PackBoundDiffToString)
({
{
{"prim", "OriginPrim"},
{"prim", "CurrentPrim"},
},
{
{"string", "string"},
},
{},
{"Unreal"},
});

}
}// namespace zeno
Loading
Loading