Skip to content

Commit ad65945

Browse files
authored
sync v0.5.4 (#152)
1 parent 6306924 commit ad65945

162 files changed

Lines changed: 18924 additions & 10371 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CSG/CSGFoundry.cc

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,15 @@ bool CSGFoundry::isSolidTrimesh_posthoc_kludge(int gas_idx) const
281281
return SLabel::IsIdxLabelListed( mmlabel, gas_idx, ls, ',' );
282282
}
283283

284+
/**
285+
CSGFoundry::isSolidTrimesh
286+
---------------------------
287+
288+
Returns true when getSolidIntent yields 'T'
289+
290+
**/
291+
292+
284293
bool CSGFoundry::isSolidTrimesh(int gas_idx) const
285294
{
286295
char intent = getSolidIntent(gas_idx);
@@ -3537,6 +3546,14 @@ int CSGFoundry::getFrame(sframe& fr, const char* frs ) const
35373546
<< " gord " << gord
35383547
<< " rc " << rc
35393548
;
3549+
3550+
LOG_IF(info, VERBOSE)
3551+
<< "[" << getFrame_VERBOSE << "] " << ( VERBOSE ? "YES" : "NO " )
3552+
<< "[fr.desc\n"
3553+
<< fr.desc()
3554+
<< "]fr.desc\n"
3555+
;
3556+
35403557
}
35413558
else
35423559
{

CSG/CSGImport.cc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,7 @@ CSGPrim* CSGImport::importPrim(int primIdx, const snode& node )
316316
int num_sub_total = sn::GetChildTotal( lns );
317317

318318
int ln = lns.size();
319-
assert( ln == 0 || ln == 1 ); // simplify initial impl
320-
319+
bool ln_expect = ln == 0 || ln == 1 ;
321320

322321

323322
bool dump_LVID = node.lvid == LVID || ln > 0 || idx_rc > 0 ;
@@ -331,6 +330,7 @@ CSGPrim* CSGImport::importPrim(int primIdx, const snode& node )
331330
<< " primIdx " << primIdx
332331
<< " bn " << bn << "(binary nodes)"
333332
<< " ln(subset of bn) " << ln
333+
<< " ln_expect " << ( ln_expect ? "YES" : "NO " )
334334
<< " num_sub_total " << num_sub_total
335335
<< "\n"
336336
<< "[rt.render\n"
@@ -343,6 +343,8 @@ CSGPrim* CSGImport::importPrim(int primIdx, const snode& node )
343343
<< std::endl
344344
;
345345

346+
assert( ln_expect ); // simplify initial impl
347+
346348

347349
// 3. addPrim to foundry with space for binary nodes and all subs
348350

0 commit comments

Comments
 (0)