spacecruft
/
CelestiaContent
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Atmosphere tools modernization 

scattersim works as in 1.6.x
scattertable generates broken dds files
pull/3/head
Hleb Valoshka 2019-04-05 17:09:23 +03:00
parent 6e90626feb
commit f84ca4277a
7 changed files with 331 additions and 445 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tools/CMakeLists.txt
View File

@ -8,6 +8,7 @@ macro(install_perl_tools)
install(PROGRAMS ${__sources} DESTINATION ${CMAKE_INSTALL_BINDIR})
endmacro()
add_subdirectory(atmosphere)
add_subdirectory(binaries)
add_subdirectory(charm2)
add_subdirectory(cmod)

4
src/tools/atmosphere/CMakeLists.txt 100644
View File

@ -0,0 +1,4 @@
foreach(tool scattersim scattertable)
add_executable(${tool} "${tool}.cpp")
install(TARGETS ${tool} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endforeach()

20
src/tools/atmosphere/Makefile
View File

@ -1,20 +0,0 @@
CXX = g++
CXXFLAGS = -O3 -Wall # -msse -msse2
INSTALL = /usr/bin/install
# tools will be installed into
prefix = /usr/local
exec_prefix = $(prefix)
bindir = $(exec_prefix)/bin
all: scattersim
scattersim: scattersim.cpp
$(CXX) $(CXXFLAGS) -I../.. scattersim.cpp -o scattersim -lpng
clean:
rm -f *.o
install:
$(INSTALL) scattersim $(bindir)
uninstall:
rm -f $(bindir)/scattersim

2
src/tools/atmosphere/build.sh
View File

@ -1,2 +0,0 @@
#!/bin/sh
g++ -O2 scattertable.cpp -o scattertable -I ../../../thirdparty/Eigen

646
src/tools/atmosphere/scattersim.cpp
View File

File diff suppressed because it is too large Load Diff

42
src/tools/atmosphere/scattersim.mak
View File

@ -1,42 +0,0 @@
!INCLUDE "../../win32.mak"
OBJS=\
$(INTDIR)\scattersim.obj
TARGET = scattersim.exe
INCLUDEDIRS= /I ../.. /I ../../../inc/libjpeg /I ../../../inc/libpng /I ../../../inc/libz
LIBDIRS=/LIBPATH:..\..\..\lib
!IF "$(CFG)" == "Release"
LINK32=link.exe
LINK32_FLAGS=intl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib winmm.lib vfw32.lib opengl32.lib glu32.lib libjpeg.lib zlib.lib libpng.lib $(LUALIBS) $(SPICELIBS) $(LIBS) /nologo /incremental:no /pdb:"$(OUTDIR)\celestia.pdb" /machine:I386 $(LIBDIRS)
RSC=rc
RSC_FLAGS=/l 0x409 /d "NDEBUG"
LIBC=libcmt.lib
!ELSE
LINK32=link.exe
LINK32_FLAGS=intl.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib winmm.lib vfw32.lib opengl32.lib glu32.lib libjpegd.lib zlibd.lib libpngd.lib $(LUALIBS) $(SPICELIBS) $(LIBS) /nologo /incremental:yes /pdb:"$(OUTDIR)\celestia.pdb" /debug /machine:I386 $(LIBDIRS)
RSC=rc.exe
RSC_FLAGS=/l 0x409 /d "_DEBUG"
LIBC=libcmtd.lib
!ENDIF
$(OUTDIR)\$(TARGET) : $(OUTDIR) $(OBJS) $(LIBS) $(RESOURCES)
$(LINK32) @<<
$(LINK32_FLAGS) /out:$(OUTDIR)\$(TARGET) $(OBJS) $(RESOURCES)
<<
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
clean:
-@del $(OUTDIR)\$(TARGET) $(OBJS)

61
src/tools/atmosphere/scattertable.cpp
View File

@ -43,15 +43,16 @@
#include <map>
#include <cassert>
#include <Eigen/Core>
#include <Eigen/Array>
#include <celmath/mathlib.h>
using namespace Eigen;
using namespace std;
using namespace celmath;
const unsigned int HeightSamples = 32;
const unsigned int ViewAngleSamples = 256;
const unsigned int SunAngleSamples = 32;
constexpr const unsigned int HeightSamples = 32;
constexpr const unsigned int ViewAngleSamples = 256;
constexpr const unsigned int SunAngleSamples = 32;
// Values settable via the command line
static unsigned int ScatteringIntegrationSteps = 25;
@ -81,8 +82,6 @@ static Vector3f RayleighScatteringCoeff(float n, float N)
class Atmosphere
{
public:
Atmosphere() = default;
float shellRadius() const
{
return planetRadius + max(mieScaleHeight, rayleighScaleHeight) * 8.0f;
@ -91,7 +90,6 @@ public:
Vector3f* computeTransmittanceTable() const;
Vector4f* computeInscatterTable() const;
public:
float planetRadius;
float rayleighScaleHeight;
float mieScaleHeight;
@ -102,24 +100,6 @@ public:
};
// Check to see if a floating point value is a NaN. Useful for debugging.
static inline bool isNaN(float x)
{
return x != x;
}
static inline float sign(float x)
{
if (x < 0.0f)
return -1.0f;
if (x > 0.0f)
return 1.0f;
else
return 0.0f;
}
// Based on approximation from E. Bruneton and F. Neyret,
// - r is distance of eye from planet center
// - mu is the cosine of the view angle (view angle dot zenith direction)
@ -148,7 +128,7 @@ Vector3f transmittance(float r, float mu, float l, const Atmosphere& atm)
float depthM = opticalDepth(r, mu, l, atm.mieScaleHeight, atm.planetRadius);
return (-depthR * atm.rayleighCoeff
- depthM * Vector3f::Constant(atm.mieCoeff)
- depthM * atm.absorptionCoeff).cwise().exp();
- depthM * atm.absorptionCoeff).array().exp();
}
@ -223,7 +203,7 @@ Atmosphere::computeTransmittanceTable() const
transmittanceTable[index] = transmittance(r, mu, pathLength, *this);
// Warning messages
if (isNaN(transmittanceTable[index].x()))
if (isnan(transmittanceTable[index].x()))
{
cout << "NaN in transmittance table at (" << j << ", " << i << ")\n";
cout << transmittanceTable[index].x() << endl;
@ -333,7 +313,7 @@ Atmosphere::computeInscatterTable() const
float sunPathLength = -rx * c + sqrt(Rt2 - rx2 * s2);
Vector3f sunPathTransmittance = transmittance(rx, c, sunPathLength, *this);
t = viewPathTransmittance.cwise() * sunPathTransmittance;
t = viewPathTransmittance.cwiseProduct(sunPathTransmittance);
}
else
{
@ -349,7 +329,7 @@ Atmosphere::computeInscatterTable() const
}
unsigned int index = (i * ViewAngleSamples + j) * SunAngleSamples + k;
inscatter[index] << rayleigh.cwise() * rayleighCoeff,
inscatter[index] << rayleigh.cwiseProduct(rayleighCoeff),
mie * mieCoeff;
if (i == HeightSamples - 1 && k == 0)
{
@ -360,7 +340,7 @@ Atmosphere::computeInscatterTable() const
#if 0
// Emit warnings about NaNs in scatter table
if (isNaN(rayleigh.x()))
if (isnan(rayleigh.x()))
{
cout << "NaN in inscatter table at (" << k << ", " << j << ", " << i << ")\n";
}
@ -402,7 +382,7 @@ void usage()
Vector3f computeRayleighCoeffs(const Vector3f& wavelengths)
{
return wavelengths.cwise().pow(-4.0f);
return wavelengths.array().pow(-4.0f);
}
@ -569,8 +549,6 @@ uint16_t floatToHalf(float f)
FloatInt fi;
fi.f = f;
uint16_t half = 0;
auto signBit = uint16_t((fi.u & 0x80000000) >> 16);
if (f > 65504.0f)
@ -634,8 +612,6 @@ uint16_t floatToHalf(float f)
struct DDSPixelFormat
{
DDSPixelFormat() = default;
uint32_t dwSize{0};
uint32_t dwFlags{0};
uint32_t dwFourCC{0};
@ -652,10 +628,7 @@ struct DDSHeader
{
DDSHeader()
{
for (unsigned int & i : dwReserved1)
{
i = 0;
}
fill(begin(dwReserved1), end(dwReserved1), 0);
}
static const uint32_t CAPS_COMPLEX = 0x000008;
@ -696,7 +669,7 @@ struct DDSHeader
uint32_t dwDepth{0};
uint32_t dwMipMapCount{0};
uint32_t dwReserved1[11];
DDSPixelFormat ddpf;
DDSPixelFormat ddpf;
uint32_t dwCaps{0};
uint32_t dwCaps2{0};
uint32_t dwCaps3{0};
@ -741,7 +714,7 @@ struct DDSHeader
static bool ByteSwapRequired = false;
static bool IsLittleEndian()
{
Uint32_t endiannessTest;
Uint32 endiannessTest;
endiannessTest.u = 0x01020304;
return endiannessTest.bytes[0] == 0x04;
}
@ -752,7 +725,7 @@ static void WriteUint16(ostream& out, uint16_t u)
{
static_assert(sizeof(u) == 2, "");
Uint16_t ub;
Uint16 ub;
ub.u = u;
if (ByteSwapRequired)
{
@ -768,7 +741,7 @@ static void WriteUint32(ostream& out, uint32_t u)
{
static_assert(sizeof(u) == 4, "");
Uint32_t ub;
Uint32 ub;
ub.u = u;
if (ByteSwapRequired)
{
@ -780,6 +753,7 @@ static void WriteUint32(ostream& out, uint32_t u)
}
#if 0
// Write out a single precision floating point number
static void WriteFloat(ostream& out, float f)
{
@ -795,6 +769,7 @@ static void WriteFloat(ostream& out, float f)
out.write(ub.bytes, sizeof(ub.bytes));
}
#endif
// Convert a single precision floating point value to half precision