3a95bdfc65
This patch moves all the functionality previously in SceneRenderLayer to SceneLayer. If we want to rename some of these structs now would be a good time to do it, before they are in SceneLayer. Everything should be working, though I will test things further tomorrow. Once this is committed depsgraph can get rid of the workaround added in rna_Main_meshes_new_from_object and finish whatever this patch was preventing from being finished. This patch also adds a few placeholders for the overrides (samples, ...). These are obviously not working, so some unittests that rely on 'lay', and 'zmask' will fail. This patch does not addressed the change of moving samples to ViewRender (I have this as a separate patch and needs some separate discussion). Following next is the individual note of the individual parts that were committed. Note 1: It is up to Cycles to still get rid of exclude_layer internally. Note 2: Cycles still need to handle its own doversion for the use_layer_samples cases and (1) Remove the override as it is (2) Add a new override (scene.cycles.samples) if scene.cycles.use_layer_samples != IGNORE Respecting the expected behaviour when scene.cycles.use_layer_samples == BOUNDED. Note 3: Cycles still need to implement the per-object holdout (similar to how we do shadow catcher). Note 4: There are parts of the old (Blender Internal) rendering pipeline that is still using lay, e.g., in shi->lay. Honestly it will be easier to purge the entire Blender Internal code away instead of taking things from it bit by bit. Reviewers: sergey, campbellbarton, brecht Differential Revision: https://developer.blender.org/D2919
141 lines
3.8 KiB
C++
141 lines
3.8 KiB
C++
/*
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* 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 General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
#ifndef __BLENDER_FILE_LOADER_H__
|
|
#define __BLENDER_FILE_LOADER_H__
|
|
|
|
/** \file blender/freestyle/intern/blender_interface/BlenderFileLoader.h
|
|
* \ingroup freestyle
|
|
*/
|
|
|
|
#include <string.h>
|
|
#include <float.h>
|
|
|
|
#include "../geometry/BBox.h"
|
|
#include "../geometry/Geom.h"
|
|
#include "../geometry/GeomCleaner.h"
|
|
#include "../geometry/GeomUtils.h"
|
|
#include "../scene_graph/IndexedFaceSet.h"
|
|
#include "../scene_graph/NodeGroup.h"
|
|
#include "../scene_graph/NodeTransform.h"
|
|
#include "../scene_graph/NodeShape.h"
|
|
#include "../system/FreestyleConfig.h"
|
|
#include "../system/RenderMonitor.h"
|
|
|
|
extern "C" {
|
|
#include "DNA_material_types.h"
|
|
#include "DNA_meshdata_types.h"
|
|
#include "DNA_scene_types.h"
|
|
|
|
#include "renderdatabase.h"
|
|
#include "render_types.h"
|
|
|
|
#include "BKE_mesh.h"
|
|
#include "BKE_scene.h"
|
|
|
|
#include "BLI_math.h"
|
|
}
|
|
|
|
#ifdef WITH_CXX_GUARDEDALLOC
|
|
#include "MEM_guardedalloc.h"
|
|
#endif
|
|
|
|
namespace Freestyle {
|
|
|
|
class NodeGroup;
|
|
|
|
struct LoaderState {
|
|
float *pv;
|
|
float *pn;
|
|
IndexedFaceSet::FaceEdgeMark *pm;
|
|
unsigned *pvi;
|
|
unsigned *pni;
|
|
unsigned *pmi;
|
|
unsigned currentIndex;
|
|
unsigned currentMIndex;
|
|
float minBBox[3];
|
|
float maxBBox[3];
|
|
};
|
|
|
|
class BlenderFileLoader
|
|
{
|
|
public:
|
|
/*! Builds a MaxFileLoader */
|
|
BlenderFileLoader(Render *re, SceneLayer *scene_layer);
|
|
virtual ~BlenderFileLoader();
|
|
|
|
/*! Loads the 3D scene and returns a pointer to the scene root node */
|
|
NodeGroup * Load();
|
|
|
|
/*! Gets the number of read faces */
|
|
inline unsigned int numFacesRead() {return _numFacesRead;}
|
|
|
|
#if 0
|
|
/*! Gets the smallest edge size read */
|
|
inline real minEdgeSize() {return _minEdgeSize;}
|
|
#endif
|
|
|
|
/*! Modifiers */
|
|
inline void setRenderMonitor(RenderMonitor *iRenderMonitor) {_pRenderMonitor = iRenderMonitor;}
|
|
|
|
protected:
|
|
void insertShapeNode(ObjectInstanceRen *obi, int id);
|
|
int testDegenerateTriangle(float v1[3], float v2[3], float v3[3]);
|
|
bool testEdgeRotation(float v1[3], float v2[3], float v3[3], float v4[3]);
|
|
int countClippedFaces(float v1[3], float v2[3], float v3[3], int clip[3]);
|
|
void clipLine(float v1[3], float v2[3], float c[3], float z);
|
|
void clipTriangle(int numTris, float triCoords[][3], float v1[3], float v2[3], float v3[3],
|
|
float triNormals[][3], float n1[3], float n2[3], float n3[3],
|
|
bool edgeMarks[5], bool em1, bool em2, bool em3, int clip[3]);
|
|
void addTriangle(struct LoaderState *ls, float v1[3], float v2[3], float v3[3],
|
|
float n1[3], float n2[3], float n3[3], bool fm, bool em1, bool em2, bool em3);
|
|
|
|
protected:
|
|
struct detri_t {
|
|
unsigned viA, viB, viP; // 0 <= viA, viB, viP < viSize
|
|
Vec3r v;
|
|
unsigned n;
|
|
};
|
|
Render *_re;
|
|
SceneLayer *_scene_layer;
|
|
NodeGroup *_Scene;
|
|
unsigned _numFacesRead;
|
|
#if 0
|
|
real _minEdgeSize;
|
|
#endif
|
|
bool _smooth; /* if true, face smoothness is taken into account */
|
|
float _viewplane_left;
|
|
float _viewplane_right;
|
|
float _viewplane_bottom;
|
|
float _viewplane_top;
|
|
float _z_near, _z_far;
|
|
float _z_offset;
|
|
|
|
RenderMonitor *_pRenderMonitor;
|
|
|
|
#ifdef WITH_CXX_GUARDEDALLOC
|
|
MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:BlenderFileLoader")
|
|
#endif
|
|
};
|
|
|
|
} /* namespace Freestyle */
|
|
|
|
#endif // __BLENDER_FILE_LOADER_H__
|