nexoniarz/Fry3DX
Watch
1
0
Fork
You've already forked Fry3DX
 0
mirror of https://github.com/Nexoniarz/Fry3DX.git synced 2026-11-03 04:24:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Scripts kept in the .fry (the Script panel lists the file's scripts: new, examples, open, duplicate, remove, rename); your own materials (Save its look as a material, kept for every file; fry.material in scripts); plug-ins: scripts in the plug-ins folder that stay loaded and add menu commands with settings (fry.command, fry.plugin), a Plug-ins window, three that come with it (stairs, scatter, more materials); a new About window; tests

Browse source 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Nexoniarz 2026-10-20 19:01:07 +02:00
commit 3bcd50033d
12 changed files with 969 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/CMakeLists.txt
View file

@ -3,5 +3,5 @@ target_link_libraries(mesh_test PRIVATE fry_core)
add_test(NAME mesh_test COMMAND mesh_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
add_executable(script_test script_test.cpp)
target_link_libraries(script_test PRIVATE fry_script)
target_compile_definitions(script_test PRIVATE FRY_SCRIPTS_DIR="${PROJECT_SOURCE_DIR}/content/Fry3DX/scripts")
target_compile_definitions(script_test PRIVATE FRY_SCRIPTS_DIR="${PROJECT_SOURCE_DIR}/content/Fry3DX/scripts" FRY_PLUGINS_DIR="${PROJECT_SOURCE_DIR}/content/Fry3DX/plugins")
add_test(NAME script_test COMMAND script_test)

7
tests/mesh_test.cpp
View file

@ -413,6 +413,13 @@ int main() {
"loads its own file back the same, pictures exactly");
CHECK(std::filesystem::file_size(dir / "p.fry") < 256 * 256 * 4 / 8, "packed small (%zu bytes)", size_t(std::filesystem::file_size(dir / "p.fry")));
CHECK(loadPackage((dir / "a.fry").string()).has_value(), "opens the old text .fry too");
Scene sc = s; // scripts kept in it, any characters and lines (an "end" or "object" line in one too)
sc.scripts = {{"Town", "-- a town\nobject \"x\"\nend\nlocal s = \"\\n\"\n"}, {"Empty", ""}, {"Last", "print(1)"}};
CHECK(savePackage((dir / "s.fry").string(), sc), "saves scripts in it");
auto sb = loadPackage((dir / "s.fry").string());
CHECK(sb && sb->scripts.size() == 3 && sb->scripts[0].name == "Town" && sb->scripts[0].code == sc.scripts[0].code && sb->scripts[1].code.empty() &&
sb->scripts[2].code == "print(1)" && sb->objects.size() == 1 && sb->objects[0].name == s.objects[0].name,
"scripts come back the same, and the model with them");
Scene g = s;
g.folders = {{50, "Parts", 0, true, true, false}, {51, "Screws", 50, false, true, true}};
g.objects[0].folder = 51;

78
tests/script_test.cpp
View file

@ -2,6 +2,7 @@
// errors with their line, and an endless loop is stopped.
#include "script.h"
#include <cmath>
#include <cstdio>
#include <filesystem>
#include <fstream>
@ -67,6 +68,83 @@ int main() {
r = runScript(host, "fry.clear()");
CHECK(r.ok && scene.objects.empty() && active == 0 && selected.empty(), "clear");
{ // Your own materials: from a script, found by name (any case), and as text and back.
clearOwnMaterials("mats.lua");
r = runScript(host, "fry.material{name = 'Teal Plastic', color = '#1f9a96', rough = 0.35}\nlocal o = fry.add('cube')\no.material = 'teal plastic'", "mats.lua");
CHECK(r.ok && findMaterial("teal plastic") && std::abs(scene.objects.back().rough - 0.35f) < 1e-4f && scene.objects.back().color.g > 0.5f,
"fry.material, then o.material (%s)", r.error.c_str());
CHECK(findMaterial("teal plastic")->from == "mats.lua", "it says which script made it");
r = runScript(host, "fry.material{name = 'Gold', color = '#ffffff'}");
CHECK(!r.ok, "not one of Fry3DX's own names");
addOwnMaterial({"", "Mine \"quoted\"", {0.1f, 0.2f, 0.3f}, 0.5f, 0.25f, true, ""});
const std::string text = ownMaterialsText();
removeOwnMaterial(materialId("Mine \"quoted\""));
CHECK(!findMaterial(materialId("Mine \"quoted\"")), "removed");
parseOwnMaterials(text);
const MaterialPreset* m = findMaterial(materialId("Mine \"quoted\""));
CHECK(m && m->keepColor && std::abs(m->metal - 0.5f) < 1e-4f && text.find("Teal") == std::string::npos, "the picker's own as text and back (only those)");
clearOwnMaterials("mats.lua");
CHECK(!findMaterial("teal plastic"), "a script's materials cleared");
}
{ // A plug-in: loaded once, its commands run later (with their settings), its errors taken back.
Plugin p("stairs_and_such.lua");
Scene scratch;
ScriptHost load{&scratch, &selected, &active, {}, {}, 2.0};
std::string error;
const bool ok = p.load(load, R"(
fry.plugin{name = "Boxes", about = "Rows of boxes"}
local made = 0
fry.command{name = "Row", menu = "add", settings = {{"count", 3}, {"gap", 1.5}}, run = function(s)
for i = 1, s.count do fry.add("cube").position = {i * s.gap, 0, 0} end
made = made + 1
print("made " .. made)
end}
fry.command{name = "Broken", run = function() fry.add("cube"); error("no") end}
fry.add("sphere") -- (loading touches only its own scratch scene)
)", &error);
CHECK(ok && p.name == "Boxes" && p.about == "Rows of boxes" && p.commands.size() == 2 && p.commands[0].menu == "add" && p.commands[1].menu == "script" &&
p.commands[0].settings.size() == 2 && p.commands[0].settings[1].second == 1.5,
"a plug-in loads and registers its commands (%s)", error.c_str());
Scene s2;
out.clear();
ScriptHost h{&s2, &selected, &active, [&](const std::string& t) { out += t + "\n"; }, {}, 2.0};
r = p.run(h, 0, {4, 2});
r = p.run(h, 0, {1, 2});
CHECK(r.ok && s2.objects.size() == 5 && std::abs(s2.objects[3].position.x - 8.0f) < 1e-4f && out.find("made 2") != std::string::npos,
"its command runs with the settings, and keeps its state between runs (%s)", r.error.c_str());
r = p.run(h, 1, {});
CHECK(!r.ok && r.error.find("no") != std::string::npos, "an error in a command comes back");
r = runScript(host, "fry.command{name = 'x', run = function() end}");
CHECK(!r.ok && r.error.find("plug-ins") != std::string::npos, "fry.command only in plug-ins");
Plugin bad("bad.lua");
CHECK(!bad.load(load, "fry.command{name = 'x'}", &error) && bad.commands.empty(), "a command with no run: it doesn't load");
}
// The plug-ins that come with it load.
for (const auto& e : std::filesystem::directory_iterator(FRY_PLUGINS_DIR)) {
std::ifstream in(e.path());
const std::string code((std::istreambuf_iterator<char>(in)), {});
Plugin p(e.path().filename().string());
Scene fresh;
std::set<uint32_t> sel;
uint32_t act = 0;
ScriptHost h{&fresh, &sel, &act, {}, {}, 20.0};
std::string error;
const bool ok = p.load(h, code, &error);
bool ran = true;
for (size_t c = 0; c < p.commands.size(); ++c) {
Scene s;
s.objects.push_back(Object{});
s.objects.back().id = s.nextId++, s.objects.back().name = "Rock", s.objects.back().mesh = makeCube();
std::set<uint32_t> picked{s.objects.back().id};
uint32_t last = s.objects.back().id;
ScriptHost run{&s, &picked, &last, {}, {}, 20.0};
const ScriptResult rr = p.run(run, c, {});
if (!rr.ok || s.objects.size() < 2) ran = false, error = p.commands[c].name + ": " + rr.error;
}
CHECK(ok && ran, "plug-in %s (%zu commands) %s", e.path().filename().string().c_str(), p.commands.size(), error.c_str());
clearOwnMaterials(e.path().filename().string());
}
// The examples that come with it all run.
for (const auto& e : std::filesystem::directory_iterator(FRY_SCRIPTS_DIR)) {
std::ifstream in(e.path());