Merge branch 'develop' into ryzomclassic-develop
kaetemi
4 years ago
commit
fdbe73937a
@ -0,0 +1,14 @@
|
|||||||
|
FILE(GLOB SRC *.cpp)
|
||||||
|
|
||||||
|
ADD_EXECUTABLE(nl_sample_font_perf ${SRC})
|
||||||
|
|
||||||
|
ADD_DEFINITIONS(-DFONT_DIR="\\"${NL_SHARE_ABSOLUTE_PREFIX}/nl_sample_font_perf/\\"")
|
||||||
|
|
||||||
|
TARGET_LINK_LIBRARIES(nl_sample_font_perf nelmisc nel3d)
|
||||||
|
NL_DEFAULT_PROPS(nl_sample_font_perf "NeL, Samples, 3D: Font Performance Test")
|
||||||
|
NL_ADD_RUNTIME_FLAGS(nl_sample_font_perf)
|
||||||
|
|
||||||
|
INSTALL(TARGETS nl_sample_font_perf RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT samples3d)
|
||||||
|
INSTALL(FILES beteckna.ttf DESTINATION ${NL_SHARE_PREFIX}/nl_sample_font_perf COMPONENT samples3d)
|
||||||
|
|
||||||
|
|
||||||
Binary file not shown.
@ -0,0 +1,99 @@
|
|||||||
|
// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
|
||||||
|
// Copyright (C) 2020 Winch Gate Property Limited
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU Affero General Public License as
|
||||||
|
// published by the Free Software Foundation, either version 3 of the
|
||||||
|
// License, or (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU Affero General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Affero General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
#include "nel/misc/types_nl.h"
|
||||||
|
|
||||||
|
#include "nel/misc/event_emitter.h"
|
||||||
|
#include "nel/misc/event_listener.h"
|
||||||
|
#include "nel/misc/path.h"
|
||||||
|
#include "nel/misc/random.h"
|
||||||
|
|
||||||
|
// look at 3dinit example
|
||||||
|
#include "nel/3d/nelu.h"
|
||||||
|
|
||||||
|
// used for font management
|
||||||
|
#include "nel/3d/font_manager.h"
|
||||||
|
#include "nel/3d/computed_string.h"
|
||||||
|
#include "nel/3d/text_context.h"
|
||||||
|
#include "nel/3d/driver_user.h"
|
||||||
|
|
||||||
|
#ifdef NL_OS_WINDOWS
|
||||||
|
#ifndef NL_COMP_MINGW
|
||||||
|
#define NOMINMAX
|
||||||
|
#endif
|
||||||
|
#include <windows.h>
|
||||||
|
#endif // NL_OS_WINDOWS
|
||||||
|
|
||||||
|
#ifndef FONT_DIR
|
||||||
|
# define FONT_DIR "."
|
||||||
|
#endif
|
||||||
|
|
||||||
|
using namespace std;
|
||||||
|
using namespace NL3D;
|
||||||
|
using namespace NLMISC;
|
||||||
|
|
||||||
|
int main(int argc, char **argv)
|
||||||
|
{
|
||||||
|
// look at 3dinit example
|
||||||
|
CNELU::init (800, 600, CViewport(), 32, true, 0, false, false);
|
||||||
|
|
||||||
|
NLMISC::CPath::addSearchPath(FONT_DIR);
|
||||||
|
|
||||||
|
// create a font manager
|
||||||
|
CFontManager fontManager;
|
||||||
|
|
||||||
|
// set the font cache to 2 megabytes (default is 1mb)
|
||||||
|
fontManager.setMaxMemory(2000000);
|
||||||
|
|
||||||
|
CTextContext tc;
|
||||||
|
|
||||||
|
tc.init (CNELU::Driver, &fontManager);
|
||||||
|
|
||||||
|
// The first param is the font name (could be ttf, pfb, fon, etc...). The
|
||||||
|
// second one is optional, it's the font kerning file
|
||||||
|
tc.setFontGenerator (NLMISC::CPath::lookup("beteckna.ttf"));
|
||||||
|
|
||||||
|
NLMISC::CRandom rnd;
|
||||||
|
|
||||||
|
uint nbCount = 100000;
|
||||||
|
TTicks startTick = CTime::getPerformanceTime();
|
||||||
|
std::string txt;
|
||||||
|
for(uint i = 0; i < nbCount; ++i)
|
||||||
|
{
|
||||||
|
uint fontSize = rnd.rand(200);
|
||||||
|
bool embolden = rnd.rand(1) == 1;
|
||||||
|
bool oblique = rnd.rand(1) == 1;
|
||||||
|
txt = toString("Lorem ipsum %03d", fontSize);
|
||||||
|
|
||||||
|
CComputedString cs;
|
||||||
|
fontManager.computeString(txt, tc.getFontGenerator(), CRGBA::White, fontSize, embolden, oblique, CNELU::Driver, cs);
|
||||||
|
}
|
||||||
|
|
||||||
|
TTicks endTick = CTime::getPerformanceTime();
|
||||||
|
|
||||||
|
double deltaTime = CTime::ticksToSecond(endTick-startTick);
|
||||||
|
std::string msg = toString("Generated %d strings in %.2fs\n", nbCount, deltaTime);
|
||||||
|
|
||||||
|
nlinfo("%s", msg.c_str());
|
||||||
|
printf("%s", msg.c_str());
|
||||||
|
|
||||||
|
fontManager.dumpCache ("font_pref_cache_dump.tga");
|
||||||
|
|
||||||
|
// look at 3dinit example
|
||||||
|
CNELU::release();
|
||||||
|
|
||||||
|
return EXIT_SUCCESS;
|
||||||
|
}
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
FILE(GLOB SRC *.cpp *.h *.rc)
|
||||||
|
|
||||||
|
SOURCE_GROUP("" FILES ${SRC})
|
||||||
|
|
||||||
|
ADD_EXECUTABLE(unbuild_elevation ${SRC})
|
||||||
|
|
||||||
|
TARGET_LINK_LIBRARIES(unbuild_elevation nel3d nelmisc nelligo)
|
||||||
|
NL_DEFAULT_PROPS(unbuild_elevation "NeL, Tools, 3D: Unbuild Elevation")
|
||||||
|
NL_ADD_RUNTIME_FLAGS(unbuild_elevation)
|
||||||
|
|
||||||
|
INSTALL(TARGETS unbuild_elevation RUNTIME DESTINATION ${NL_BIN_PREFIX} COMPONENT tools3d)
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 3.6 KiB |
@ -0,0 +1,42 @@
|
|||||||
|
#include <windows.h>
|
||||||
|
#include "config.h"
|
||||||
|
|
||||||
|
IDI_MAIN_ICON ICON DISCARDABLE "gold_pill.ico"
|
||||||
|
|
||||||
|
#ifdef _DEBUG
|
||||||
|
#define NL_FILEEXT "_d"
|
||||||
|
#else
|
||||||
|
#define NL_FILEEXT ""
|
||||||
|
#endif
|
||||||
|
|
||||||
|
VS_VERSION_INFO VERSIONINFO
|
||||||
|
FILEVERSION NL_VERSION_RC
|
||||||
|
PRODUCTVERSION NL_VERSION_RC
|
||||||
|
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
|
||||||
|
#ifdef _DEBUG
|
||||||
|
FILEFLAGS VS_FF_DEBUG
|
||||||
|
#else
|
||||||
|
FILEFLAGS 0x0L
|
||||||
|
#endif
|
||||||
|
FILEOS VOS_NT_WINDOWS32
|
||||||
|
FILETYPE VFT_APP
|
||||||
|
FILESUBTYPE 0x0L
|
||||||
|
BEGIN
|
||||||
|
BLOCK "StringFileInfo"
|
||||||
|
BEGIN
|
||||||
|
BLOCK "040904b0"
|
||||||
|
BEGIN
|
||||||
|
VALUE "CompanyName", AUTHOR
|
||||||
|
VALUE "FileDescription", "NeL Zone Elevation"
|
||||||
|
VALUE "FileVersion", NL_VERSION
|
||||||
|
VALUE "LegalCopyright", COPYRIGHT
|
||||||
|
VALUE "OriginalFilename", "zone_elevation" NL_FILEEXT ".exe"
|
||||||
|
VALUE "ProductName", "NeL Tools"
|
||||||
|
VALUE "ProductVersion", NL_PRODUCT_VERSION
|
||||||
|
END
|
||||||
|
END
|
||||||
|
BLOCK "VarFileInfo"
|
||||||
|
BEGIN
|
||||||
|
VALUE "Translation", 0x9, 1200
|
||||||
|
END
|
||||||
|
END
|
||||||
@ -0,0 +1,502 @@
|
|||||||
|
// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
|
||||||
|
// Copyright (C) 2021 Jan BOON (Kaetemi) <jan.boon@kaetemi.be>
|
||||||
|
//
|
||||||
|
// This program is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU Affero General Public License as
|
||||||
|
// published by the Free Software Foundation, either version 3 of the
|
||||||
|
// License, or (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU Affero General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU Affero General Public License
|
||||||
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
#include "../zone_lib/zone_utility.h"
|
||||||
|
|
||||||
|
#include <iostream>
|
||||||
|
#include <nel/misc/types_nl.h>
|
||||||
|
#include <nel/misc/file.h>
|
||||||
|
#include <nel/misc/i_xml.h>
|
||||||
|
#include <nel/misc/common.h>
|
||||||
|
#include <nel/misc/cmd_args.h>
|
||||||
|
#include <nel/misc/bitmap.h>
|
||||||
|
//#include <nel/3d/quad_tree.h>
|
||||||
|
#include <nel/3d/zone.h>
|
||||||
|
//#include <nel/3d/landscape.h>
|
||||||
|
//#include <nel/3d/zone_smoother.h>
|
||||||
|
//#include <nel/3d/zone_tgt_smoother.h>
|
||||||
|
//#include <nel/3d/zone_corner_smoother.h>
|
||||||
|
#include <nel/ligo/zone_region.h>
|
||||||
|
#include <vector>
|
||||||
|
#include <set>
|
||||||
|
|
||||||
|
using namespace NL3D;
|
||||||
|
using namespace NLMISC;
|
||||||
|
using namespace NLLIGO;
|
||||||
|
using namespace std;
|
||||||
|
|
||||||
|
namespace /* anonymous */
|
||||||
|
{
|
||||||
|
|
||||||
|
sint32 s_ZoneMinX, s_ZoneMinY, s_ZoneMaxX, s_ZoneMaxY;
|
||||||
|
float s_CellSize = 160.0f;
|
||||||
|
bool s_ExtendCoords;
|
||||||
|
|
||||||
|
std::string s_SourceDir; /* R:\reference\2008_july\data\r2_desert */
|
||||||
|
std::string s_ReferenceDir; /* R:\pipeline\export\continents\r2_desert\zone_weld */
|
||||||
|
|
||||||
|
std::string s_OutputPy;
|
||||||
|
|
||||||
|
std::string s_SourceExt = "zonel";
|
||||||
|
std::string s_ReferenceExt = "zonenhw";
|
||||||
|
|
||||||
|
CZoneRegion s_Land; /* "R:\graphics\landscape\ligo\desert\r2_desert.land" */
|
||||||
|
|
||||||
|
int s_Warnings;
|
||||||
|
|
||||||
|
// unbuild_elevation --land "R:\graphics\landscape\ligo\desert\r2_desert.land" "Y:\temp\r2_desert_elevation.Py" "R:\reference\2008_july\data\r2_desert" "R:\pipeline\export\continents\r2_desert\zone_weld"
|
||||||
|
// --land "R:\graphics\landscape\ligo\jungle\zorai.land" --referenceext zonenhw "X:\wsl\big_zorai.py" "R:\reference\2008_july\data\zorai_zones" "R:\pipeline\export\continents\zorai\zone_weld"
|
||||||
|
|
||||||
|
// --land "R:\graphics\landscape\ligo\desert\r2_desert.land" "X:\wsl\big_r2_desert.py" "R:\reference\2008_july\data\r2_desert" "R:\pipeline\export\continents\r2_desert\zone_weld" --extendcoords
|
||||||
|
// --land "R:\graphics\landscape\ligo\jungle\r2_jungle.land" "X:\wsl\big_r2_jungle.py" "R:\reference\2008_july\data\r2_jungle" "R:\pipeline\export\continents\r2_jungle\zone_weld" --extendcoords
|
||||||
|
// --land "R:\graphics\landscape\ligo\jungle\r2_forest.land" "X:\wsl\big_r2_forest.py" "R:\reference\2008_july\data\r2_forest" "R:\pipeline\export\continents\r2_forest\zone_weld" --extendcoords
|
||||||
|
// --land "R:\graphics\landscape\ligo\lacustre\r2_lakes.land" "X:\wsl\big_r2_lakes.py" "R:\reference\2008_july\data\r2_lakes" "R:\pipeline\export\continents\r2_lakes\zone_weld" --extendcoords
|
||||||
|
// --land "R:\graphics\landscape\ligo\primes_racines\r2_roots.land" "X:\wsl\big_r2_roots.py" "R:\reference\2008_july\data\r2_roots" "R:\pipeline\export\continents\r2_roots\zone_weld" --extendcoords
|
||||||
|
|
||||||
|
// --land "R:\graphics\landscape\ligo\desert\r2_desert.land" --referenceext zonew "X:\wsl\check_r2_desert.py" "R:\reference\2008_july\data\r2_desert" "R:\pipeline\export\continents\r2_desert\zone_weld" --extendcoords
|
||||||
|
// --land "R:\graphics\landscape\ligo\jungle\r2_jungle.land" --referenceext zonew "X:\wsl\check_r2_jungle.py" "R:\reference\2008_july\data\r2_jungle" "R:\pipeline\export\continents\r2_jungle\zone_weld" --extendcoords
|
||||||
|
// --land "R:\graphics\landscape\ligo\primes_racines\r2_roots.land" --referenceext zonew "X:\wsl\check_r2_roots.py" "R:\reference\2008_july\data\r2_roots" "R:\pipeline\export\continents\r2_roots\zone_weld" --extendcoords
|
||||||
|
|
||||||
|
bool loadLand(const string &filename)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
CIFile fileIn;
|
||||||
|
if (fileIn.open (filename))
|
||||||
|
{
|
||||||
|
CIXml xml(true);
|
||||||
|
nlverify(xml.init(fileIn));
|
||||||
|
s_Land.serial(xml);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
nlwarning("Can't open the land file: %s", filename.c_str());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (const Exception& e)
|
||||||
|
{
|
||||||
|
nlwarning("Error in land file: %s", e.what());
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool getXYFromZoneName(sint32 &x, sint32 &y, const string &zoneName)
|
||||||
|
{
|
||||||
|
string xStr, yStr;
|
||||||
|
uint32 i = 0;
|
||||||
|
while (zoneName[i] != '_')
|
||||||
|
{
|
||||||
|
yStr += zoneName[i];
|
||||||
|
++i;
|
||||||
|
if (i == zoneName.size())
|
||||||
|
goto Fail;
|
||||||
|
}
|
||||||
|
if (!NLMISC::fromString(yStr, y))
|
||||||
|
goto Fail;
|
||||||
|
y = -y;
|
||||||
|
++i;
|
||||||
|
while (i < zoneName.size())
|
||||||
|
{
|
||||||
|
xStr += zoneName[i];
|
||||||
|
++i;
|
||||||
|
}
|
||||||
|
if (xStr.size() != 2)
|
||||||
|
goto Fail;
|
||||||
|
xStr = NLMISC::toUpperAscii(xStr);
|
||||||
|
x = ((xStr[0] - 'A') * 26 + (xStr[1] - 'A'));
|
||||||
|
return true;
|
||||||
|
Fail:
|
||||||
|
x = -1;
|
||||||
|
y = -1;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
void getBitmapSize(int &w, int &h)
|
||||||
|
{
|
||||||
|
sint32 sizeX = s_ZoneMaxX - s_ZoneMinX + 1;
|
||||||
|
sint32 sizeY = s_ZoneMaxY - s_ZoneMinY + 1;
|
||||||
|
w = sizeX * 20;
|
||||||
|
h = sizeY * 20;
|
||||||
|
|
||||||
|
if (!s_ExtendCoords)
|
||||||
|
{
|
||||||
|
++w;
|
||||||
|
++h;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void getBitmapCoord(float &xc, float &yc, float x, float y)
|
||||||
|
{
|
||||||
|
float deltaZ = 0.0f, deltaZ2 = 0.0f;
|
||||||
|
CRGBAF color;
|
||||||
|
sint32 sizeX = s_ZoneMaxX - s_ZoneMinX + 1;
|
||||||
|
sint32 sizeY = s_ZoneMaxY - s_ZoneMinY + 1;
|
||||||
|
|
||||||
|
xc = (x - s_CellSize * s_ZoneMinX) / (s_CellSize * sizeX);
|
||||||
|
yc = 1.0f - ((y - s_CellSize * s_ZoneMinY) / (s_CellSize * sizeY));
|
||||||
|
|
||||||
|
if (s_ExtendCoords)
|
||||||
|
{
|
||||||
|
int w, h;
|
||||||
|
getBitmapSize(w, h);
|
||||||
|
xc -= .5f / (float)w;
|
||||||
|
yc -= .5f / (float)h;
|
||||||
|
xc = xc * (float)(w + 1) / (float)w;
|
||||||
|
yc = yc * (float)(h + 1) / (float)h;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool processZone(std::vector<NLMISC::CVector> &output, const std::string &sourceFile, const std::string &referenceFile)
|
||||||
|
{
|
||||||
|
std::string zone = CFile::getFilenameWithoutExtension(referenceFile);
|
||||||
|
|
||||||
|
std::vector<CVector> sourceVertices;
|
||||||
|
std::vector<CVector> referenceVertices;
|
||||||
|
{
|
||||||
|
CZoneInfo zoneInfo;
|
||||||
|
{
|
||||||
|
CZone zone;
|
||||||
|
{
|
||||||
|
CIFile f(sourceFile);
|
||||||
|
zone.serial(f);
|
||||||
|
f.close();
|
||||||
|
}
|
||||||
|
zone.retrieve(zoneInfo);
|
||||||
|
}
|
||||||
|
for (ptrdiff_t i = 0; i < (ptrdiff_t)zoneInfo.Patchs.size(); ++i)
|
||||||
|
{
|
||||||
|
sourceVertices.push_back(zoneInfo.Patchs[i].Patch.Vertices[0]);
|
||||||
|
sourceVertices.push_back(zoneInfo.Patchs[i].Patch.Vertices[1]);
|
||||||
|
sourceVertices.push_back(zoneInfo.Patchs[i].Patch.Vertices[2]);
|
||||||
|
sourceVertices.push_back(zoneInfo.Patchs[i].Patch.Vertices[3]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
{
|
||||||
|
CZoneInfo zoneInfo;
|
||||||
|
{
|
||||||
|
CZone zone;
|
||||||
|
{
|
||||||
|
CIFile f(referenceFile);
|
||||||
|
zone.serial(f);
|
||||||
|
f.close();
|
||||||
|
}
|
||||||
|
zone.retrieve(zoneInfo);
|
||||||
|
}
|
||||||
|
for (ptrdiff_t i = 0; i < (ptrdiff_t)zoneInfo.Patchs.size(); ++i)
|
||||||
|
{
|
||||||
|
referenceVertices.push_back(zoneInfo.Patchs[i].Patch.Vertices[0]);
|
||||||
|
referenceVertices.push_back(zoneInfo.Patchs[i].Patch.Vertices[1]);
|
||||||
|
referenceVertices.push_back(zoneInfo.Patchs[i].Patch.Vertices[2]);
|
||||||
|
referenceVertices.push_back(zoneInfo.Patchs[i].Patch.Vertices[3]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
printf("Source vertices: %i, reference vertices: %i\n", (int)sourceVertices.size(), (int)referenceVertices.size());
|
||||||
|
if (sourceVertices.size() != referenceVertices.size())
|
||||||
|
{
|
||||||
|
nlwarning("Mismatching vertex count in zone %s, source vertices: %i, reference vertices: %i", zone.c_str(), (int)sourceVertices.size(), (int)referenceVertices.size());
|
||||||
|
++s_Warnings;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::vector<bool> processedSourceIndices;
|
||||||
|
std::vector<bool> processedReferenceIndices;
|
||||||
|
processedSourceIndices.resize(sourceVertices.size());
|
||||||
|
processedReferenceIndices.resize(referenceVertices.size());
|
||||||
|
|
||||||
|
int referenceProcessedCount = 0;
|
||||||
|
int sourceProcessedCount = 0;
|
||||||
|
|
||||||
|
for (ptrdiff_t i = 0; i < (ptrdiff_t)referenceVertices.size(); ++i)
|
||||||
|
{
|
||||||
|
if (processedReferenceIndices[i])
|
||||||
|
continue;
|
||||||
|
|
||||||
|
float referenceHeight = referenceVertices[i].z;
|
||||||
|
int referenceHeightDiv = 1;
|
||||||
|
++referenceProcessedCount;
|
||||||
|
|
||||||
|
for (ptrdiff_t j = i + 1; j < (ptrdiff_t)referenceVertices.size(); ++j)
|
||||||
|
{
|
||||||
|
if (processedReferenceIndices[j])
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (abs(referenceVertices[i].x - referenceVertices[j].x) < 0.1f
|
||||||
|
&& abs(referenceVertices[i].y - referenceVertices[j].y) < 0.1f)
|
||||||
|
{
|
||||||
|
processedReferenceIndices[j] = true;
|
||||||
|
referenceHeight += referenceVertices[j].z;
|
||||||
|
++referenceHeightDiv;
|
||||||
|
++referenceProcessedCount;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
float sourceHeight = 0.f;
|
||||||
|
int sourceHeightDiv = 0;
|
||||||
|
|
||||||
|
for (ptrdiff_t j = 0; j < (ptrdiff_t)sourceVertices.size(); ++j)
|
||||||
|
{
|
||||||
|
if (processedSourceIndices[j])
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (abs(referenceVertices[i].x - sourceVertices[j].x) < 0.1f
|
||||||
|
&& abs(referenceVertices[i].y - sourceVertices[j].y) < 0.1f)
|
||||||
|
{
|
||||||
|
processedSourceIndices[j] = true;
|
||||||
|
sourceHeight += sourceVertices[j].z;
|
||||||
|
++sourceHeightDiv;
|
||||||
|
++sourceProcessedCount;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!sourceHeightDiv)
|
||||||
|
{
|
||||||
|
nlwarning("No matching vertices in source for zone %s, x: %f, y: %f", zone.c_str(), referenceVertices[i].x, referenceVertices[i].y);
|
||||||
|
++s_Warnings;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (referenceHeightDiv != sourceHeightDiv)
|
||||||
|
{
|
||||||
|
nlwarning("Mismatching vertex count for zone %s, x: %f, y: %f (reference: %i, source: %i)", zone.c_str(), referenceVertices[i].x, referenceVertices[i].y, referenceHeightDiv, sourceHeightDiv);
|
||||||
|
++s_Warnings;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
referenceHeight /= (float)referenceHeightDiv;
|
||||||
|
sourceHeight /= (float)sourceHeightDiv;
|
||||||
|
|
||||||
|
output.push_back(NLMISC::CVector(referenceVertices[i].x, referenceVertices[i].y, sourceHeight - referenceHeight));
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool unbuildElevation()
|
||||||
|
{
|
||||||
|
std::vector<std::string> referenceZones;
|
||||||
|
CPath::getPathContent(s_ReferenceDir, true, false, true, referenceZones);
|
||||||
|
int totalZones = 0;
|
||||||
|
|
||||||
|
std::vector<NLMISC::CVector> output;
|
||||||
|
|
||||||
|
for (std::vector<std::string>::iterator it(referenceZones.begin()), end(referenceZones.end()); it != end; ++it)
|
||||||
|
{
|
||||||
|
if (CFile::getExtension(*it) != s_ReferenceExt)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
std::string zone = CFile::getFilenameWithoutExtension(*it);
|
||||||
|
std::string sourceZone = s_SourceDir + "/" + CFile::getFilenameWithoutExtension(*it) + "." + s_SourceExt;
|
||||||
|
|
||||||
|
if (!CFile::fileExists(sourceZone))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (zone == "137_JK") // Bad zone
|
||||||
|
continue;
|
||||||
|
|
||||||
|
printf("%s\n", nlUtf8ToMbcs(zone));
|
||||||
|
++totalZones;
|
||||||
|
|
||||||
|
if (!processZone(output, sourceZone, *it))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
printf("\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
printf("Total zones: %i\n", totalZones);
|
||||||
|
|
||||||
|
#if 1
|
||||||
|
|
||||||
|
std::vector<bool> processedOutput;
|
||||||
|
processedOutput.resize(output.size());
|
||||||
|
std::vector<NLMISC::CVector> reducedOutput;
|
||||||
|
for (ptrdiff_t i = 0; i < (ptrdiff_t)output.size(); ++i)
|
||||||
|
{
|
||||||
|
if (processedOutput[i])
|
||||||
|
continue;
|
||||||
|
|
||||||
|
CVector v = output[i];
|
||||||
|
int div = 1;
|
||||||
|
|
||||||
|
for (ptrdiff_t j = i + 1; j < (ptrdiff_t)output.size(); ++j)
|
||||||
|
{
|
||||||
|
if (processedOutput[j])
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (abs(output[i].x - output[j].x) < 0.1f
|
||||||
|
&& abs(output[i].y - output[j].y) < 0.1f)
|
||||||
|
{
|
||||||
|
processedOutput[j] = true;
|
||||||
|
v.z += output[j].z;
|
||||||
|
++div;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
v.z /= (float)div;
|
||||||
|
reducedOutput.push_back(v);
|
||||||
|
}
|
||||||
|
|
||||||
|
printf("Reduced vertex count from %i to %i\n", (int)output.size(), (int)reducedOutput.size());
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
std::vector<NLMISC::CVector> reducedOutput = output;
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
{
|
||||||
|
int w, h;
|
||||||
|
getBitmapSize(w, h);
|
||||||
|
|
||||||
|
FILE *fo = fopen(nlUtf8ToMbcs(s_OutputPy), "w");
|
||||||
|
if (!fo)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
fprintf(fo, "import naturalneighbor # https://github.com/innolitics/natural-neighbor-interpolation - pip3 install naturalneighbor\n");
|
||||||
|
fprintf(fo, "import numpy as np\n");
|
||||||
|
fprintf(fo, "import png # pip3 install pypng\n");
|
||||||
|
fprintf(fo, "grid_ranges = [[0, 1, %i%s], [0, 1, %i%s], [-1, 1, 1j]]\n", w, "j", h, "j");
|
||||||
|
|
||||||
|
fprintf(fo, "points = np.array([\n");
|
||||||
|
|
||||||
|
for (ptrdiff_t i = 0; i < (ptrdiff_t)reducedOutput.size(); ++i)
|
||||||
|
{
|
||||||
|
float x, y;
|
||||||
|
getBitmapCoord(x, y, reducedOutput[i].x, reducedOutput[i].y);
|
||||||
|
fprintf(fo, "\t[ %f, %f, 0 ], # %f, %f\n", x, y, reducedOutput[i].x, reducedOutput[i].y);
|
||||||
|
}
|
||||||
|
|
||||||
|
fprintf(fo, "])\n");
|
||||||
|
fprintf(fo, "\n");
|
||||||
|
fprintf(fo, "values = np.array([\n");
|
||||||
|
|
||||||
|
for (ptrdiff_t i = 0; i < (ptrdiff_t)reducedOutput.size(); ++i)
|
||||||
|
{
|
||||||
|
fprintf(fo, "\t%f,\n", reducedOutput[i].z);
|
||||||
|
}
|
||||||
|
|
||||||
|
fprintf(fo, "])\n");
|
||||||
|
|
||||||
|
fprintf(fo, "nn_interpolated_values = naturalneighbor.griddata(points, values, grid_ranges)\n");
|
||||||
|
fprintf(fo, "img = []\n");
|
||||||
|
fprintf(fo, "for y in range(0, %i):\n", h);
|
||||||
|
fprintf(fo, "\tline = []\n");
|
||||||
|
fprintf(fo, "\tfor x in range(0, %i):\n", w);
|
||||||
|
fprintf(fo, "\t\tline.append(np.round(nn_interpolated_values[x][y][0]).astype(int) + 127)\n");
|
||||||
|
fprintf(fo, "\timg.append(line)\n");
|
||||||
|
fprintf(fo, "with open('%s.png', 'wb') as f:\n", CFile::getFilenameWithoutExtension(s_OutputPy).c_str());
|
||||||
|
fprintf(fo, "\tw = png.Writer(%i, %i, greyscale=True)\n", w, h);
|
||||||
|
fprintf(fo, "\tw.write(f, img)\n");
|
||||||
|
fflush(fo);
|
||||||
|
fclose(fo);
|
||||||
|
}
|
||||||
|
|
||||||
|
printf("Warnings: %i\n", s_Warnings);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool unbuildElevation(NLMISC::CCmdArgs &args)
|
||||||
|
{
|
||||||
|
s_OutputPy = args.getAdditionalArg("output")[0];
|
||||||
|
s_SourceDir = args.getAdditionalArg("source")[0];
|
||||||
|
s_ReferenceDir = args.getAdditionalArg("reference")[0];
|
||||||
|
|
||||||
|
if (args.haveLongArg("zonemin") && args.haveLongArg("zonemax"))
|
||||||
|
{
|
||||||
|
sint32 zoneMinX, zoneMinY;
|
||||||
|
sint32 zoneMaxX, zoneMaxY;
|
||||||
|
if (!getXYFromZoneName(zoneMinX, zoneMinY, args.getLongArg("zonemin")[0])
|
||||||
|
|| !getXYFromZoneName(zoneMaxX, zoneMaxY, args.getLongArg("zonemax")[0]))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
s_ZoneMinX = min(zoneMinX, zoneMaxX);
|
||||||
|
s_ZoneMaxX = max(zoneMinX, zoneMaxX);
|
||||||
|
s_ZoneMinY = min(zoneMinY, zoneMaxY);
|
||||||
|
s_ZoneMaxY = max(zoneMinY, zoneMaxY);
|
||||||
|
}
|
||||||
|
else if (args.haveLongArg("land"))
|
||||||
|
{
|
||||||
|
if (!loadLand(args.getLongArg("land")[0]))
|
||||||
|
return false;
|
||||||
|
s_ZoneMinX = s_Land.getMinX();
|
||||||
|
s_ZoneMaxX = s_Land.getMaxX();
|
||||||
|
s_ZoneMinY = s_Land.getMinY();
|
||||||
|
s_ZoneMaxY = s_Land.getMaxY();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
nlwarning("Must have either both 'zonemin' and 'zonemax', or 'land' specified");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (args.haveLongArg("cellsize"))
|
||||||
|
{
|
||||||
|
if (!NLMISC::fromString(args.getLongArg("cellsize")[0], s_CellSize))
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
s_ExtendCoords = args.haveLongArg("extendcoords");
|
||||||
|
|
||||||
|
if (args.haveLongArg("sourceext"))
|
||||||
|
{
|
||||||
|
s_SourceExt = args.getLongArg("sourceext")[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (args.haveLongArg("referenceext"))
|
||||||
|
{
|
||||||
|
s_ReferenceExt = args.getLongArg("referenceext")[0];
|
||||||
|
}
|
||||||
|
|
||||||
|
return unbuildElevation();
|
||||||
|
}
|
||||||
|
|
||||||
|
} /* anonymous namespace */
|
||||||
|
|
||||||
|
int main(int argc, char **argv)
|
||||||
|
{
|
||||||
|
NLMISC::CApplicationContext myApplicationContext;
|
||||||
|
|
||||||
|
NLMISC::CCmdArgs args;
|
||||||
|
|
||||||
|
args.addAdditionalArg("output", "Output Python file path");
|
||||||
|
args.addAdditionalArg("source", "Input folder with zones at the right height");
|
||||||
|
args.addAdditionalArg("reference", "Input folder with zones at the wrong height");
|
||||||
|
|
||||||
|
args.addArg("", "sourceext", "extension", "Source zone extension (default: zonel)");
|
||||||
|
args.addArg("", "referenceext", "extension", "Reference zone extension (default: zonew)");
|
||||||
|
|
||||||
|
args.addArg("", "land", "land", "Ligo land file (either specify this or the boundaries)");
|
||||||
|
args.addArg("", "zonemin", "zone", "Zone boundary");
|
||||||
|
args.addArg("", "zonemax", "zone", "Zone boundary");
|
||||||
|
args.addArg("", "cellsize", "meters", "Zone cell size (default: 160)");
|
||||||
|
args.addArg("", "extendcoords", "flag", "Extend coordinates to edge of bitmap pixels");
|
||||||
|
|
||||||
|
if (!args.parse(argc, argv))
|
||||||
|
{
|
||||||
|
return EXIT_FAILURE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!unbuildElevation(args))
|
||||||
|
{
|
||||||
|
args.displayHelp();
|
||||||
|
return EXIT_FAILURE;
|
||||||
|
}
|
||||||
|
|
||||||
|
return EXIT_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* end of file */
|
||||||
Loading…
Reference in New Issue