olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use "resize" function to circumvent weird crashing issue

This commit is contained in:
Jonathan 2022-06-22 22:55:05 -04:00
parent 1d221d3999
commit eb50be92f8
3 changed files with 66 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/light/light.hh
View File

@ -130,7 +130,7 @@ struct lightsurf_t
qvec2d exactmid;
qvec3d midpoint;
int numpoints;
size_t numpoints;
qvec3d *points; // new'ed array of numpoints
qvec3d *normals; // new'ed array of numpoints
bool *occluded; // new'ed array of numpoints

41
include/light/trace_embree.hh
View File

@ -61,6 +61,17 @@ public:
virtual ~raystream_embree_common_t() = default;
virtual void resize(size_t size)
{
_maxrays = size;
_rays_maxdist.resize(size);
_point_indices.resize(size);
_ray_colors.resize(size);
_ray_normalcontribs.resize(size);
_ray_dynamic_styles.resize(size);
}
constexpr size_t numPushedRays() { return _numrays; }
inline int &getPushedRayPointIndex(size_t j)
@ -188,13 +199,13 @@ inline const sceneinfo &Embree_SceneinfoForGeomID(unsigned int geomID)
class raystream_intersection_t : public raystream_embree_common_t
{
public:
private:
RTCRayHit *_rays = nullptr;
public:
inline raystream_intersection_t() = default;
inline raystream_intersection_t(int maxRays)
inline raystream_intersection_t(size_t maxRays)
: raystream_embree_common_t(maxRays), _rays{static_cast<RTCRayHit *>(
q_aligned_malloc(16, sizeof(RTCRayHit) * maxRays))}
{
@ -202,6 +213,17 @@ public:
inline ~raystream_intersection_t() { q_aligned_free(_rays); _rays = nullptr; }
void resize(size_t size) override
{
if (_rays) {
q_aligned_free(_rays);
}
_rays = static_cast<RTCRayHit *>(q_aligned_malloc(16, sizeof(RTCRayHit) * size));
raystream_embree_common_t::resize(size);
}
inline void pushRay(int i, const qvec3d &origin, const qvec3d &dir, float dist, const qvec3d *color = nullptr,
const qvec3d *normalcontrib = nullptr)
{
@ -274,13 +296,13 @@ public:
class raystream_occlusion_t : public raystream_embree_common_t
{
public:
private:
RTCRay *_rays = nullptr;
public:
inline raystream_occlusion_t() = default;
inline raystream_occlusion_t(int maxRays)
inline raystream_occlusion_t(size_t maxRays)
: raystream_embree_common_t(maxRays), _rays{
static_cast<RTCRay *>(q_aligned_malloc(16, sizeof(RTCRay) * maxRays))}
{
@ -288,6 +310,17 @@ public:
inline ~raystream_occlusion_t() { q_aligned_free(_rays); }
void resize(size_t size) override
{
if (_rays) {
q_aligned_free(_rays);
}
_rays = static_cast<RTCRay *>(q_aligned_malloc(16, sizeof(RTCRay) * size));
raystream_embree_common_t::resize(size);
}
inline void pushRay(int i, const qvec3d &origin, const qvec3d &dir, float dist, const qvec3d *color = nullptr,
const qvec3d *normalcontrib = nullptr)
{

58
light/ltface.cc
View File

@ -965,8 +965,8 @@ static bool Lightsurf_Init(
/* Allocate occlusion array */
lightsurf->occlusion = new float[lightsurf->numpoints]{};
lightsurf->intersection_stream = raystream_intersection_t{lightsurf->numpoints};
lightsurf->occlusion_stream = raystream_occlusion_t{lightsurf->numpoints};
lightsurf->intersection_stream.resize(lightsurf->numpoints);
lightsurf->occlusion_stream.resize(lightsurf->numpoints);
/* Setup vis data */
if (options.visapprox.value() == visapprox_t::VIS) {
@ -3361,8 +3361,6 @@ static void LightFaceShutdown(lightsurf_t *lightsurf)
delete[] lightsurf->occlusion;
delete[] lightsurf->occluded;
delete[] lightsurf->realfacenums;
delete lightsurf;
}
/*
@ -3413,26 +3411,26 @@ void LightFace(const mbsp_t *bsp, mface_t *face, facesup_t *facesup, const setti
return;
/* all good, this face is going to be lightmapped. */
lightsurf_t *lightsurf = new lightsurf_t{};
lightsurf->cfg = &cfg;
lightsurf_t lightsurf{};
lightsurf.cfg = &cfg;
/* if liquid doesn't have the TEX_SPECIAL flag set, the map was qbsp'ed with
* lit water in mind. In that case receive light from both top and bottom.
* (lit will only be rendered in compatible engines, but degrades gracefully.)
*/
if (Face_IsTranslucent(bsp, face)) {
lightsurf->twosided = true;
lightsurf.twosided = true;
}
if (!Lightsurf_Init(modelinfo, face, bsp, lightsurf, facesup)) {
if (!Lightsurf_Init(modelinfo, face, bsp, &lightsurf, facesup)) {
/* invalid texture axes */
return;
}
lightmapdict_t *lightmaps = &lightsurf->lightmapsByStyle;
lightmapdict_t *lightmaps = &lightsurf.lightmapsByStyle;
/* calculate dirt (ambient occlusion) but don't use it yet */
if (dirt_in_use && (options.debugmode != debugmodes::phong))
LightFace_CalculateDirt(lightsurf);
LightFace_CalculateDirt(&lightsurf);
/*
* The lighting procedure is: cast all positive lights, fix
@ -3442,7 +3440,7 @@ void LightFace(const mbsp_t *bsp, mface_t *face, facesup_t *facesup, const setti
if (options.debugmode == debugmodes::none) {
total_samplepoints += lightsurf->numpoints;
total_samplepoints += lightsurf.numpoints;
const surfflags_t &extended_flags = extended_texinfo_flags[face->texinfo];
@ -3454,33 +3452,33 @@ void LightFace(const mbsp_t *bsp, mface_t *face, facesup_t *facesup, const setti
if (entity->nostaticlight.value())
continue;
if (entity->light.value() > 0)
LightFace_Entity(bsp, entity.get(), lightsurf, lightmaps);
LightFace_Entity(bsp, entity.get(), &lightsurf, lightmaps);
}
for (const sun_t &sun : GetSuns())
if (sun.sunlight > 0)
LightFace_Sky(&sun, lightsurf, lightmaps);
LightFace_Sky(&sun, &lightsurf, lightmaps);
// mxd. Add surface lights...
LightFace_SurfaceLight(bsp, lightsurf, lightmaps);
LightFace_SurfaceLight(bsp, &lightsurf, lightmaps);
/* add indirect lighting */
LightFace_Bounce(bsp, face, lightsurf, lightmaps);
LightFace_Bounce(bsp, face, &lightsurf, lightmaps);
}
/* minlight - Use Q2 surface light, or the greater of global or model minlight. */
// FIXME: _surface 2 support
const mtexinfo_t *texinfo = Face_Texinfo(bsp, face); // mxd. Surface lights...
if (texinfo != nullptr && texinfo->value > 0 && (texinfo->flags.native & Q2_SURF_LIGHT)) {
LightFace_Min(bsp, face, Face_LookupTextureColor(bsp, face), texinfo->value * 2.0f, lightsurf,
LightFace_Min(bsp, face, Face_LookupTextureColor(bsp, face), texinfo->value * 2.0f, &lightsurf,
lightmaps); // Playing by the eye here... 2.0 == 256 / 128; 128 is the light value, at which the surface
// is renered fullbright, when using arghrad3
} else if (lightsurf->minlight > cfg.minlight.value()) {
LightFace_Min(bsp, face, lightsurf->minlight_color, lightsurf->minlight, lightsurf, lightmaps);
} else if (lightsurf.minlight > cfg.minlight.value()) {
LightFace_Min(bsp, face, lightsurf.minlight_color, lightsurf.minlight, &lightsurf, lightmaps);
} else {
const float light = cfg.minlight.value();
const qvec3d &color = cfg.minlight_color.value();
LightFace_Min(bsp, face, color, light, lightsurf, lightmaps);
LightFace_Min(bsp, face, color, light, &lightsurf, lightmaps);
}
/* negative lights */
@ -3491,39 +3489,39 @@ void LightFace(const mbsp_t *bsp, mface_t *face, facesup_t *facesup, const setti
if (entity->nostaticlight.value())
continue;
if (entity->light.value() < 0)
LightFace_Entity(bsp, entity.get(), lightsurf, lightmaps);
LightFace_Entity(bsp, entity.get(), &lightsurf, lightmaps);
}
for (const sun_t &sun : GetSuns())
if (sun.sunlight < 0)
LightFace_Sky(&sun, lightsurf, lightmaps);
LightFace_Sky(&sun, &lightsurf, lightmaps);
}
}
/* bounce debug */
// TODO: add a BounceDebug function that clear the lightmap to make the code more clear
if (options.debugmode == debugmodes::bounce)
LightFace_Bounce(bsp, face, lightsurf, lightmaps);
LightFace_Bounce(bsp, face, &lightsurf, lightmaps);
/* replace lightmaps with AO for debugging */
if (options.debugmode == debugmodes::dirt)
LightFace_DirtDebug(lightsurf, lightmaps);
LightFace_DirtDebug(&lightsurf, lightmaps);
if (options.debugmode == debugmodes::phong)
LightFace_PhongDebug(lightsurf, lightmaps);
LightFace_PhongDebug(&lightsurf, lightmaps);
if (options.debugmode == debugmodes::bouncelights)
LightFace_BounceLightsDebug(lightsurf, lightmaps);
LightFace_BounceLightsDebug(&lightsurf, lightmaps);
if (options.debugmode == debugmodes::debugoccluded)
LightFace_OccludedDebug(lightsurf, lightmaps);
LightFace_OccludedDebug(&lightsurf, lightmaps);
if (options.debugmode == debugmodes::debugneighbours)
LightFace_DebugNeighbours(lightsurf, lightmaps);
LightFace_DebugNeighbours(&lightsurf, lightmaps);
/* Apply gamma, rangescale, and clamp */
LightFace_ScaleAndClamp(lightsurf, lightmaps);
LightFace_ScaleAndClamp(&lightsurf, lightmaps);
WriteLightmaps(bsp, face, facesup, lightsurf, lightmaps);
WriteLightmaps(bsp, face, facesup, &lightsurf, lightmaps);
LightFaceShutdown(lightsurf);
LightFaceShutdown(&lightsurf);
}