89e8fa216f
The render generated from Freestyle's data is currently stored in the original scene's render structure ( as 'freestyle_render'): when the render database is generated, the scene's geometrical data is first imported into Freestyle and strokes are calculated. The generated strokes are used to create a Blender scene, rendered independently. The render result is used in the rendering loop.
The final rendering is performed the same way edge rendering is, in a function ('freestyle_enhance_add') operating on each individual render part. Freestyle strokes are only included if the toggle button "Freestyle" (in the 'Output' panel) is active and if the "Freestyle" render layer is also selected. Freestyle's panel appears when the toggle button 'Freestyle' is active.
IMPORTANT: as of now, rendering ONLY works when OSA is disabled and when Xparts = Yparts = 1. If these settings are not set, a bogus image will be created.
To make the render happen, many modifications had to be made:
- the Canvas::Draw and Operators::create methods no longer render strokes. They only generate shading and locational information.
- a BlenderStrokeRenderer class was added to turn Freestyle's strokes into a Blender scene. Basically, the scene consists of strokes in their projected image 2D coordinates and an orthographic camera centered in the middle of the corresponding canvas. The scene is rendered using vertex colors, in shadeless mode (therefore, no lamp is needed). BlenderStrokeRenderer uses the old GLTextureManager to load textures (as required by the StrokeRenderer class), even though stroke textures are probably not supported (not tested). After the scene is rendered, it is safely and automatically discarded.
- AppCanvas' code was greatly reduced to the bare minimum. The former AppCanvas would use an OpenGL-based back buffer and z buffer to determine the scene's color and depth information. In the future, this data will be determined from the corresponding render passes. Currently, the integration is not achieved so all style modules using depth/color information are sure to fail.
- before, Freestyle needed an OpenGL context to determine the camera's information and to compute the view map. As of now, the modelview and projection matrices are fully determined using data provided by Blender. This means both perspective and orthographic projections are supported. The AppGLWidget will very soon be removed completely.
134 lines
3.3 KiB
C++
Executable File
134 lines
3.3 KiB
C++
Executable File
//
|
|
// Filename : PythonInterpreter.h
|
|
// Author(s) : Emmanuel Turquin
|
|
// Purpose : Python Interpreter
|
|
// Date of creation : 17/04/2003
|
|
//
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
//
|
|
// Copyright (C) : Please refer to the COPYRIGHT file distributed
|
|
// with this source distribution.
|
|
//
|
|
// 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
//
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifndef PYTHON_INTERPRETER_H
|
|
# define PYTHON_INTERPRETER_H
|
|
|
|
# include <iostream>
|
|
# include <Python.h>
|
|
# include "StringUtils.h"
|
|
# include "Interpreter.h"
|
|
|
|
//soc
|
|
extern "C" {
|
|
#include "BKE_text.h"
|
|
#include "BPY_extern.h"
|
|
}
|
|
|
|
class LIB_SYSTEM_EXPORT PythonInterpreter : public Interpreter
|
|
{
|
|
public:
|
|
|
|
PythonInterpreter() {
|
|
_language = "Python";
|
|
//Py_Initialize();
|
|
}
|
|
|
|
virtual ~PythonInterpreter() {
|
|
//Py_Finalize();
|
|
}
|
|
|
|
int interpretCmd(const string& cmd) {
|
|
initPath();
|
|
char* c_cmd = strdup(cmd.c_str());
|
|
int err = PyRun_SimpleString(c_cmd);
|
|
free(c_cmd);
|
|
return err;
|
|
}
|
|
|
|
int interpretFile(const string& filename) {
|
|
initPath();
|
|
|
|
char *fn = const_cast<char*>(filename.c_str());
|
|
struct Text *text = add_text( fn );
|
|
|
|
if (text == NULL) {
|
|
cout << "\nError in PythonInterpreter::interpretFile:" << endl;
|
|
cout << "couldn't create Blender text from" << fn << endl;
|
|
}
|
|
|
|
if (BPY_txt_do_python_Text(text) != 1) {
|
|
cout << "\nError executing Python script from PythonInterpreter::interpretFile:" << endl;
|
|
cout << fn << " (at line " << BPY_Err_getLinenumber() << ")" << endl;
|
|
return BPY_Err_getLinenumber();
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
struct Options
|
|
{
|
|
static void setPythonPath(const string& path) {
|
|
_path = path;
|
|
}
|
|
|
|
static string getPythonPath() {
|
|
return _path;
|
|
}
|
|
};
|
|
|
|
void reset() {
|
|
Py_Finalize();
|
|
Py_Initialize();
|
|
_initialized = false;
|
|
}
|
|
|
|
private:
|
|
|
|
static void initPath() {
|
|
if (_initialized)
|
|
return;
|
|
|
|
vector<string> pathnames;
|
|
StringUtils::getPathName(_path, "", pathnames);
|
|
|
|
struct Text *text = add_empty_text("tmp_freestyle_initpath.txt");
|
|
string cmd = "import sys\n";
|
|
txt_insert_buf(text, const_cast<char*>(cmd.c_str()));
|
|
|
|
for (vector<string>::const_iterator it = pathnames.begin(); it != pathnames.end();++it) {
|
|
if ( !it->empty() ) {
|
|
cout << "Adding Python path: " << *it << endl;
|
|
cmd = "sys.path.append(r\"" + *it + "\")\n";
|
|
txt_insert_buf(text, const_cast<char*>(cmd.c_str()));
|
|
}
|
|
}
|
|
|
|
BPY_txt_do_python_Text(text);
|
|
|
|
//PyRun_SimpleString("from Freestyle import *");
|
|
_initialized = true;
|
|
}
|
|
|
|
static bool _initialized;
|
|
static string _path;
|
|
};
|
|
|
|
#endif // PYTHON_INTERPRETER_H
|