archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

soc-2008-mxcurioni: Freestyle now supports camera information (the image is still a bit larger than Blender's internal renderer, probably a field of view problem). 3d scene is now no longer rendered, only 2d scene (strokes from view map information) is. Style module is still static (contour.py), will soon be handled via independent UI panel.

Browse Source 
Phase 1 is considered finished. Phase 2 starts now: the objective is integrating Freestyle as an independent render layer.
This commit is contained in:
Maxime Curioni
2008-06-16 00:51:19 +00:00
parent d8171e4bc6
commit dfa10eba19
5 changed files with 189 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/freestyle/intern/app_blender/AppGLWidget.cpp
View File

@@ -130,7 +130,7 @@ AppGLWidget::AppGLWidget(const char *iName)
_debug = false; _debug = false;
_selection_mode = false; _selection_mode = false;
_Draw2DScene = true; _Draw2DScene = true;
_Draw3DScene = true; _Draw3DScene = false;
_drawEnvMap = false; _drawEnvMap = false;
_currentEnvMap = 1; _currentEnvMap = 1;
_maxId = 0; _maxId = 0;

6
source/blender/freestyle/intern/app_blender/AppGLWidget.h
View File

@@ -401,9 +401,9 @@ public:
inline bool getRecordFlag() const {return _record;} inline bool getRecordFlag() const {return _record;}
void setCameraState(const float* position, const float* orientation) { void setCameraState(const Vec& position, const Quaternion& orientation) {
_camera->setPosition(Vec(position[0], position[1], position[2])); _camera->setPosition(position);
_camera->setOrientation(Quaternion(orientation[0], orientation[1], orientation[2], orientation[3])); _camera->setOrientation(orientation);
} }
void getCameraState(float* position, float* orientation) const { void getCameraState(float* position, float* orientation) const {

288
source/blender/freestyle/intern/app_blender/Controller.cpp
View File

@@ -209,7 +209,7 @@ int Controller::Load3DSFile(const char *iFileName)
_RootNode->UpdateBBox(); // FIXME: Correct that by making a Renderer to compute the bbox _RootNode->UpdateBBox(); // FIXME: Correct that by making a Renderer to compute the bbox
_pView->SetModel(_RootNode); _pView->SetModel(_RootNode);
_pView->FitBBox(); //_pView->FitBBox();
_Chrono.start(); _Chrono.start();
@@ -399,149 +399,149 @@ void Controller::SaveViewMapFile(const char *oFileName)
cout << "ViewMap saving : " << d << endl; cout << "ViewMap saving : " << d << endl;
} }
void Controller::LoadViewMapFile(const char *iFileName, bool only_camera) // void Controller::LoadViewMapFile(const char *iFileName, bool only_camera)
{ // {
ifstream ifs(iFileName, ios::binary); // ifstream ifs(iFileName, ios::binary);
if (!ifs.is_open()) { // if (!ifs.is_open()) {
cerr << "Error: Cannot load this file" << endl; // cerr << "Error: Cannot load this file" << endl;
return; // return;
} // }
// char buffer[buffer_size]; // // char buffer[buffer_size];
// #if defined(__GNUC__) && (__GNUC__ < 3) // // #if defined(__GNUC__) && (__GNUC__ < 3)
// ifs.rdbuf()->setbuf(buffer, buffer_size); // // ifs.rdbuf()->setbuf(buffer, buffer_size);
// # else // // # else
// ifs.rdbuf()->pubsetbuf(buffer, buffer_size); // // ifs.rdbuf()->pubsetbuf(buffer, buffer_size);
// #endif // // #endif
//
// Test File Magic and version // // Test File Magic and version
char tmp_buffer[256]; // char tmp_buffer[256];
string test; // string test;
//
ifs.getline(tmp_buffer, 255); // ifs.getline(tmp_buffer, 255);
test = tmp_buffer; // test = tmp_buffer;
if (test != Config::VIEWMAP_MAGIC) { // if (test != Config::VIEWMAP_MAGIC) {
cerr << "Error: This is not a valid ." << Config::VIEWMAP_EXTENSION << " file" << endl; // cerr << "Error: This is not a valid ." << Config::VIEWMAP_EXTENSION << " file" << endl;
return; // return;
} // }
ifs.getline(tmp_buffer, 255); // ifs.getline(tmp_buffer, 255);
test = tmp_buffer; // test = tmp_buffer;
if (test != Config::VIEWMAP_VERSION && !only_camera) { // if (test != Config::VIEWMAP_VERSION && !only_camera) {
cerr << "Error: This version of the ." << Config::VIEWMAP_EXTENSION << " file format is no longer supported" << endl; // cerr << "Error: This version of the ." << Config::VIEWMAP_EXTENSION << " file format is no longer supported" << endl;
return; // return;
} // }
//
// Read the models filenames and open them (if not already done) // // Read the models filenames and open them (if not already done)
string tmp; // string tmp;
vector<string> tmp_vec; // vector<string> tmp_vec;
unsigned models_nb, i; // unsigned models_nb, i;
//
ifs.getline(tmp_buffer, 255); // ifs.getline(tmp_buffer, 255);
models_nb = atoi(tmp_buffer); // models_nb = atoi(tmp_buffer);
for (i = 0; i < models_nb; i++) { // for (i = 0; i < models_nb; i++) {
ifs.getline(tmp_buffer, 255); // ifs.getline(tmp_buffer, 255);
tmp = tmp_buffer; // tmp = tmp_buffer;
tmp_vec.push_back(tmp); // tmp_vec.push_back(tmp);
} // }
if (_ListOfModels != tmp_vec && !only_camera) { // if (_ListOfModels != tmp_vec && !only_camera) {
CloseFile(); // CloseFile();
vector<string> pathnames; // vector<string> pathnames;
int err = 0; // int err = 0;
for (vector<string>::const_iterator i = tmp_vec.begin(); i != tmp_vec.end(); i++) // for (vector<string>::const_iterator i = tmp_vec.begin(); i != tmp_vec.end(); i++)
{ // {
pathnames.clear(); // pathnames.clear();
StringUtils::getPathName(ViewMapIO::Options::getModelsPath(), *i, pathnames); // StringUtils::getPathName(ViewMapIO::Options::getModelsPath(), *i, pathnames);
for (vector<string>::const_iterator j = pathnames.begin(); j != pathnames.end(); j++) // for (vector<string>::const_iterator j = pathnames.begin(); j != pathnames.end(); j++)
if (!(err = Load3DSFile(j->c_str()))) // if (!(err = Load3DSFile(j->c_str())))
break; // break;
if (err) { // if (err) {
cerr << "Error: cannot find model \"" << *i << "\" - check the path in the Options" << endl; // cerr << "Error: cannot find model \"" << *i << "\" - check the path in the Options" << endl;
return; // return;
} // }
} // }
} // }
//
// Set the camera position // // Set the camera position
float position[3]; // float position[3];
float orientation[4]; // float orientation[4];
ifs.read((char*)position, 3 * sizeof(*position)); // ifs.read((char*)position, 3 * sizeof(*position));
ifs.read((char*)orientation, 4 * sizeof(*orientation)); // ifs.read((char*)orientation, 4 * sizeof(*orientation));
_pView->setCameraState(position, orientation); // _pView->setCameraState(position, orientation);
_pView->saveCameraState(); // _pView->saveCameraState();
//
if (only_camera) { // if (only_camera) {
return; // return;
} // }
//
// Reset ViewMap // // Reset ViewMap
if(NULL != _ViewMap) // if(NULL != _ViewMap)
{ // {
delete _ViewMap; // delete _ViewMap;
_ViewMap = 0; // _ViewMap = 0;
} // }
_pView->DetachSilhouette(); // _pView->DetachSilhouette();
if (NULL != _SilhouetteNode) // if (NULL != _SilhouetteNode)
{ // {
int ref = _SilhouetteNode->destroy(); // int ref = _SilhouetteNode->destroy();
if(0 == ref) // if(0 == ref)
delete _SilhouetteNode; // delete _SilhouetteNode;
} // }
// if(NULL != _ProjectedSilhouette) // // if(NULL != _ProjectedSilhouette)
// { // // {
// int ref = _ProjectedSilhouette->destroy(); // // int ref = _ProjectedSilhouette->destroy();
// if(0 == ref) // // if(0 == ref)
// delete _ProjectedSilhouette; // // delete _ProjectedSilhouette;
// } // // }
// if(NULL != _VisibleProjectedSilhouette) // // if(NULL != _VisibleProjectedSilhouette)
// { // // {
// int ref = _VisibleProjectedSilhouette->destroy(); // // int ref = _VisibleProjectedSilhouette->destroy();
// if(0 == ref) // // if(0 == ref)
// { // // {
// delete _VisibleProjectedSilhouette; // // delete _VisibleProjectedSilhouette;
// _VisibleProjectedSilhouette = 0; // // _VisibleProjectedSilhouette = 0;
// } // // }
// } // // }
_ViewMap = new ViewMap(); // _ViewMap = new ViewMap();
//
// Read ViewMap // // Read ViewMap
_Chrono.start(); // _Chrono.start();
if (ViewMapIO::load(ifs, _ViewMap, 0)) { // if (ViewMapIO::load(ifs, _ViewMap, 0)) {
_Chrono.stop(); // _Chrono.stop();
//
cerr << "Error: This is not a valid ." << Config::VIEWMAP_EXTENSION << " file" << endl; // cerr << "Error: This is not a valid ." << Config::VIEWMAP_EXTENSION << " file" << endl;
return; // return;
} // }
//
// Update display // // Update display
ViewMapTesselator3D sTesselator3d; // ViewMapTesselator3D sTesselator3d;
//ViewMapTesselator2D sTesselator2d; // //ViewMapTesselator2D sTesselator2d;
//sTesselator2d.SetNature(_edgeTesselationNature); // //sTesselator2d.SetNature(_edgeTesselationNature);
sTesselator3d.SetNature(_edgeTesselationNature); // sTesselator3d.SetNature(_edgeTesselationNature);
//
// Tesselate the 3D edges: // // Tesselate the 3D edges:
_SilhouetteNode = sTesselator3d.Tesselate(_ViewMap); // _SilhouetteNode = sTesselator3d.Tesselate(_ViewMap);
_SilhouetteNode->addRef(); // _SilhouetteNode->addRef();
//
// Tesselate 2D edges // // Tesselate 2D edges
// _ProjectedSilhouette = sTesselator2d.Tesselate(_ViewMap); // // _ProjectedSilhouette = sTesselator2d.Tesselate(_ViewMap);
// _ProjectedSilhouette->addRef(); // // _ProjectedSilhouette->addRef();
// // //
_pView->AddSilhouette(_SilhouetteNode); // _pView->AddSilhouette(_SilhouetteNode);
//_pView->Add2DSilhouette(_ProjectedSilhouette); // //_pView->Add2DSilhouette(_ProjectedSilhouette);
//
// Update options window // // Update options window
//_pOptionsWindow->updateViewMapFormat(); // //_pOptionsWindow->updateViewMapFormat();
//
real d = _Chrono.stop(); // real d = _Chrono.stop();
cout << "ViewMap loading : " << d << endl; // cout << "ViewMap loading : " << d << endl;
//
// Compute the Directional ViewMap: // // Compute the Directional ViewMap:
if(_ComputeSteerableViewMap){ // if(_ComputeSteerableViewMap){
ComputeSteerableViewMap(); // ComputeSteerableViewMap();
} // }
//
// Reset Style modules modification flags // // Reset Style modules modification flags
resetModified(true); // resetModified(true);
} // }
void Controller::ComputeViewMap() void Controller::ComputeViewMap()
{ {

33
source/blender/freestyle/intern/app_blender/api.cpp
View File

@@ -35,26 +35,41 @@ extern "C" {
if( view == NULL ) if( view == NULL )
view = new AppGLWidget; view = new AppGLWidget;
controller->SetView(view);
} }
void FRS_execute(Render* re) { void FRS_execute(Render* re) {
// instanciation
Config::Path pathconfig; Config::Path pathconfig;
FRS_initialize(); FRS_initialize();
controller->SetView(view); // initialize view dimensions
unsigned int width = re->winx; unsigned int width = re->winx;
unsigned int height = re->winy; unsigned int height = re->winy;
view->setWidth(width); view->setWidth(width);
view->setHeight(height); view->setHeight(height);
view->_camera->setScreenWidthAndHeight(width, height); view->_camera->setScreenWidthAndHeight(width, height);
//view->setCameraState(const float* position, const float* orientation)
// initialize camera
Object* maincam_obj = re->scene->camera;
Vec camPosition(maincam_obj->obmat[3][0], maincam_obj->obmat[3][1], maincam_obj->obmat[3][2]);
Vec camUp( re->viewmat[0][1], re->viewmat[1][1], re->viewmat[2][1]);
Vec camDirection( -re->viewmat[0][2], -re->viewmat[1][2], - re->viewmat[2][2]);
view->_camera->setType(Camera::PERSPECTIVE);
view->_camera->setPosition(camPosition);
view->_camera->setUpVector(camUp);
view->_camera->setViewDirection(camDirection);
// export scene to 3ds format
string script_3ds_export = pathconfig.getProjectDir() + string script_3ds_export = pathconfig.getProjectDir() +
Config::DIR_SEP + "python" + Config::DIR_SEP + "python" +
Config::DIR_SEP + "3ds_export.py"; Config::DIR_SEP + "3ds_export.py";
BPY_run_python_script( const_cast<char *>(script_3ds_export.c_str()) ); BPY_run_python_script( const_cast<char *>(script_3ds_export.c_str()) );
// load 3ds scene
char btempdir[255]; char btempdir[255];
BLI_where_is_temp(btempdir,1); BLI_where_is_temp(btempdir,1);
string exported_3ds_file = btempdir; string exported_3ds_file = btempdir;
@@ -67,22 +82,30 @@ extern "C" {
return; return;
} }
// add style module
string style_module = pathconfig.getProjectDir() + string style_module = pathconfig.getProjectDir() +
Config::DIR_SEP + "style_modules" + Config::DIR_SEP + "style_modules" +
Config::DIR_SEP + "contour.py"; Config::DIR_SEP + "contour.py";
controller->InsertStyleModule( 0, const_cast<char *>(style_module.c_str()) ); controller->InsertStyleModule( 0, const_cast<char *>(style_module.c_str()) );
controller->toggleLayer(0, true); controller->toggleLayer(0, true);
// compute view map
controller->ComputeViewMap(); controller->ComputeViewMap();
controller->DrawStrokes(); // build strokes // build strokes
view->draw(); // render final result controller->DrawStrokes();
// render final result
view->draw();
// copy result into render window
RenderResult rres; RenderResult rres;
RE_GetResultImage(re, &rres); RE_GetResultImage(re, &rres);
view->readPixels(0,0,width,height,AppGLWidget::RGBA, rres.rectf ); view->readPixels(0,0,width,height,AppGLWidget::RGBA, rres.rectf );
re->result->renlay = render_get_active_layer(re, re->result); re->result->renlay = render_get_active_layer(re, re->result);
re->display_draw(re->result, NULL); re->display_draw(re->result, NULL);
controller->CloseFile();
} }
#ifdef __cplusplus #ifdef __cplusplus

14
source/blender/render/intern/source/pipeline.c
View File

@@ -2194,14 +2194,26 @@ static void do_render_composite_fields_blur_3d(Render *re)
static void freestyleRender(Render *re) static void freestyleRender(Render *re)
{ {
float mat[4][4];
// init render result
RE_FreeRenderResult(re->result); RE_FreeRenderResult(re->result);
re->result = new_render_result(re, &re->disprect, 0, RR_USEMEM); re->result = new_render_result(re, &re->disprect, 0, RR_USEMEM);
// set camera
RE_SetCamera(re, re->scene->camera); RE_SetCamera(re, re->scene->camera);
FRS_execute(re); // set view
Mat4Ortho(re->scene->camera->obmat);
Mat4Invert(mat, re->scene->camera->obmat);
RE_SetView(re, mat);
// run Freestyle
re->i.starttime = PIL_check_seconds_timer();
FRS_execute(re);
re->i.lastframetime = PIL_check_seconds_timer()- re->i.starttime;
re->stats_draw(&re->i); re->stats_draw(&re->i);
RE_Database_Free(re); RE_Database_Free(re);
} }