Skip to content

Commit c85630a

Browse files
boikoboiko
committed
Merge pull request YafaRay#36 from subcomandante/readability
Readability fixes
2 parents 3da7f4a + 636383d commit c85630a

File tree

10 files changed

+542
-595
lines changed

10 files changed

+542
-595
lines changed

‎include/materials/shinydiff.h

+3-4
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@ __BEGIN_YAFRAY
1919
is substracted.
2020
l"' = l"*(1.0 - translucency)
2121
The remaining (l"') light is either reflected diffuse or absorbed.
22-
2322
*/
2423

2524
class shinyDiffuseMat_t: public nodeMaterial_t
2625
{
2726
public:
28-
shinyDiffuseMat_t(const color_t &col, const color_t &srcol, float diffuse, float transp=0.0, float transl=0.0, float sp_refl=0.0, float emit=0.0);
27+
shinyDiffuseMat_t(const color_t &diffuseColor, const color_t &mirrorColor, float diffuseStrength, float transparencyStrength=0.0, float translucencyStrength=0.0, float mirrorStrength=0.0, float emitStrength=0.0, float transmitFilterStrength=1.0);
2928
virtual ~shinyDiffuseMat_t();
3029
virtual void initBSDF(const renderState_t &state, const surfacePoint_t &sp, BSDF_t &bsdfTypes)const;
3130
virtual color_t eval(const renderState_t &state, const surfacePoint_t &sp, const vector3d_t &wo, const vector3d_t &wl, BSDF_t bsdfs)const;
@@ -36,7 +35,7 @@ class shinyDiffuseMat_t: public nodeMaterial_t
3635
virtual color_t emit(const renderState_t &state, const surfacePoint_t &sp, const vector3d_t &wo)const; // { return emitCol; }
3736
virtual void getSpecular(const renderState_t &state, const surfacePoint_t &sp, const vector3d_t &wo, bool &reflect, bool &refract, vector3d_t *const dir, color_t *const col)const;
3837
virtual CFLOAT getAlpha(const renderState_t &state, const surfacePoint_t &sp, const vector3d_t &wo)const;
39-
38+
4039
static material_t* factory(paraMap_t &params, std::list<paraMap_t> &eparams, renderEnvironment_t &render);
4140

4241
struct SDDat_t
@@ -46,7 +45,7 @@ class shinyDiffuseMat_t: public nodeMaterial_t
4645
};
4746

4847
protected:
49-
void config(shaderNode_t *diff, shaderNode_t *refl, shaderNode_t *transp, shaderNode_t *transl, shaderNode_t *bump);
48+
void config();
5049
int getComponents(const bool *useNode, nodeStack_t &stack, float *component) const;
5150
void getFresnel(const vector3d_t &wo, const vector3d_t &N, float &Kr) const;
5251

‎include/yafraycore/nodematerial.h

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@ class YAFRAYCORE_EXPORT nodeMaterial_t: public material_t
1818
nodeMaterial_t(): reqNodeMem(0){}
1919
protected:
2020
/*! load nodes from parameter map list */
21-
bool loadNodes(const std::list<paraMap_t> &eparams, renderEnvironment_t &render);
21+
bool loadNodes(const std::list<paraMap_t> &paramsList, renderEnvironment_t &render);
22+
/** parse node shaders to fill nodeList */
23+
void parseNodes(const paraMap_t &params, std::vector<shaderNode_t *> &roots, std::map<std::string, shaderNode_t *> &nodeList);
2224
/* put nodes in evaluation order in "allSorted" given all root nodes;
2325
sets reqNodeMem to the amount of memory the node stack requires for evaluation of all nodes */
2426
void solveNodesOrder(const std::vector<shaderNode_t *> &roots);
@@ -34,7 +36,7 @@ class YAFRAYCORE_EXPORT nodeMaterial_t: public material_t
3436
virtual ~nodeMaterial_t();
3537

3638
std::vector<shaderNode_t *> allNodes, allSorted, allViewdep, allViewindep, bumpNodes;
37-
std::map<std::string,shaderNode_t *> shader_table;
39+
std::map<std::string,shaderNode_t *> mShadersTable;
3840
size_t reqNodeMem;
3941
};
4042

‎src/materials/blendmat.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,8 @@ material_t* blendMat_t::factory(paraMap_t &params, std::list<paraMap_t> &eparams
394394
{
395395
if(params.getParam("mask", name))
396396
{
397-
std::map<std::string,shaderNode_t *>::const_iterator i=mat->shader_table.find(*name);
398-
if(i!=mat->shader_table.end())
397+
std::map<std::string,shaderNode_t *>::const_iterator i=mat->mShadersTable.find(*name);
398+
if(i!=mat->mShadersTable.end())
399399
{
400400
mat->blendS = i->second;
401401
mat->recalcBlend = true;

‎src/materials/coatedglossy.cc

+1-15
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,6 @@ material_t* coatedGlossyMat_t::factory(paraMap_t &params, std::list< paraMap_t >
463463

464464
std::vector<shaderNode_t *> roots;
465465
std::map<std::string, shaderNode_t *> nodeList;
466-
std::map<std::string, shaderNode_t *>::iterator actNode;
467466

468467
// Prepare our node list
469468
nodeList["diffuse_shader"] = NULL;
@@ -473,20 +472,7 @@ material_t* coatedGlossyMat_t::factory(paraMap_t &params, std::list< paraMap_t >
473472

474473
if(mat->loadNodes(paramList, render))
475474
{
476-
for(actNode = nodeList.begin(); actNode != nodeList.end(); ++actNode)
477-
{
478-
if(params.getParam(actNode->first, name))
479-
{
480-
std::map<std::string,shaderNode_t *>::const_iterator i = mat->shader_table.find(*name);
481-
482-
if(i!=mat->shader_table.end())
483-
{
484-
actNode->second = i->second;
485-
roots.push_back(actNode->second);
486-
}
487-
else Y_WARNING << "CoatedGlossy: Shader node " << actNode->first << " '" << *name << "' does not exist!" << yendl;
488-
}
489-
}
475+
mat->parseNodes(params, roots, nodeList);
490476
}
491477
else Y_ERROR << "CoatedGlossy: loadNodes() failed!" << yendl;
492478

‎src/materials/glass.cc

+1-15
Original file line numberDiff line numberDiff line change
@@ -305,28 +305,14 @@ material_t* glassMat_t::factory(paraMap_t &params, std::list< paraMap_t > &param
305305

306306
std::vector<shaderNode_t *> roots;
307307
std::map<std::string, shaderNode_t *> nodeList;
308-
std::map<std::string, shaderNode_t *>::iterator actNode;
309308

310309
// Prepare our node list
311310
nodeList["mirror_color_shader"] = NULL;
312311
nodeList["bump_shader"] = NULL;
313312

314313
if(mat->loadNodes(paramList, render))
315314
{
316-
for(actNode = nodeList.begin(); actNode != nodeList.end(); ++actNode)
317-
{
318-
if(params.getParam(actNode->first, name))
319-
{
320-
std::map<std::string,shaderNode_t *>::const_iterator i = mat->shader_table.find(*name);
321-
322-
if(i!=mat->shader_table.end())
323-
{
324-
actNode->second = i->second;
325-
roots.push_back(actNode->second);
326-
}
327-
else Y_WARNING << "Glass: Shader node " << actNode->first << " '" << *name << "' does not exist!" << yendl;
328-
}
329-
}
315+
mat->parseNodes(params, roots, nodeList);
330316
}
331317
else Y_ERROR << "Glass: loadNodes() failed!" << yendl;
332318

‎src/materials/glossy_mat.cc

+1-15
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,6 @@ material_t* glossyMat_t::factory(paraMap_t &params, std::list< paraMap_t > &para
392392

393393
std::vector<shaderNode_t *> roots;
394394
std::map<std::string, shaderNode_t *> nodeList;
395-
std::map<std::string, shaderNode_t *>::iterator actNode;
396395

397396
// Prepare our node list
398397
nodeList["diffuse_shader"] = NULL;
@@ -402,20 +401,7 @@ material_t* glossyMat_t::factory(paraMap_t &params, std::list< paraMap_t > &para
402401

403402
if(mat->loadNodes(paramList, render))
404403
{
405-
for(actNode = nodeList.begin(); actNode != nodeList.end(); ++actNode)
406-
{
407-
if(params.getParam(actNode->first, name))
408-
{
409-
std::map<std::string,shaderNode_t *>::const_iterator i = mat->shader_table.find(*name);
410-
411-
if(i!=mat->shader_table.end())
412-
{
413-
actNode->second = i->second;
414-
roots.push_back(actNode->second);
415-
}
416-
else Y_WARNING << "Glossy: Shader node " << actNode->first << " '" << *name << "' does not exist!" << yendl;
417-
}
418-
}
404+
mat->parseNodes(params, roots, nodeList);
419405
}
420406
else Y_ERROR << "Glossy: loadNodes() failed!" << yendl;
421407

‎src/materials/maskmat.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ material_t* maskMat_t::factory(paraMap_t &params, std::list< paraMap_t > &eparam
152152
{
153153
if(params.getParam("mask", name))
154154
{
155-
std::map<std::string,shaderNode_t *>::const_iterator i=mat->shader_table.find(*name);
156-
if(i!=mat->shader_table.end()){ mat->mask = i->second; roots.push_back(mat->mask); }
155+
std::map<std::string,shaderNode_t *>::const_iterator i=mat->mShadersTable.find(*name);
156+
if(i!=mat->mShadersTable.end()){ mat->mask = i->second; roots.push_back(mat->mask); }
157157
else
158158
{
159159
Y_ERROR << "MaskMat: Mask shader node '" << *name << "' does not exist!" << yendl;

‎src/materials/roughglass.cc

+1-15
Original file line numberDiff line numberDiff line change
@@ -219,28 +219,14 @@ material_t* roughGlassMat_t::factory(paraMap_t &params, std::list< paraMap_t > &
219219

220220
std::vector<shaderNode_t *> roots;
221221
std::map<std::string, shaderNode_t *> nodeList;
222-
std::map<std::string, shaderNode_t *>::iterator actNode;
223222

224223
// Prepare our node list
225224
nodeList["mirror_color_shader"] = NULL;
226225
nodeList["bump_shader"] = NULL;
227226

228227
if(mat->loadNodes(paramList, render))
229228
{
230-
for(actNode = nodeList.begin(); actNode != nodeList.end(); ++actNode)
231-
{
232-
if(params.getParam(actNode->first, name))
233-
{
234-
std::map<std::string,shaderNode_t *>::const_iterator i = mat->shader_table.find(*name);
235-
236-
if(i!=mat->shader_table.end())
237-
{
238-
actNode->second = i->second;
239-
roots.push_back(actNode->second);
240-
}
241-
else Y_WARNING << "RoughGlass: Shader node " << actNode->first << " '" << *name << "' does not exist!" << yendl;
242-
}
243-
}
229+
mat->parseNodes(params, roots, nodeList);
244230
}
245231
else Y_ERROR << "RoughGlass: loadNodes() failed!" << yendl;
246232

0 commit comments

Comments
 (0)