Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/collada/CameraExporter.cpp
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/collada/CameraExporter.cpp')
-rw-r--r--source/blender/collada/CameraExporter.cpp97
1 files changed, 48 insertions, 49 deletions
diff --git a/source/blender/collada/CameraExporter.cpp b/source/blender/collada/CameraExporter.cpp
index 618754e1dab..d318a90909e 100644
--- a/source/blender/collada/CameraExporter.cpp
+++ b/source/blender/collada/CameraExporter.cpp
@@ -18,7 +18,6 @@
* \ingroup collada
*/
-
#include <string>
#include "COLLADASWCamera.h"
@@ -30,71 +29,71 @@ extern "C" {
#include "collada_internal.h"
-CamerasExporter::CamerasExporter(COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : COLLADASW::LibraryCameras(sw), export_settings(export_settings) {
+CamerasExporter::CamerasExporter(COLLADASW::StreamWriter *sw,
+ const ExportSettings *export_settings)
+ : COLLADASW::LibraryCameras(sw), export_settings(export_settings)
+{
}
template<class Functor>
void forEachCameraObjectInExportSet(Scene *sce, Functor &f, LinkNode *export_set)
{
- LinkNode *node;
- for (node = export_set; node; node = node->next) {
- Object *ob = (Object *)node->link;
+ LinkNode *node;
+ for (node = export_set; node; node = node->next) {
+ Object *ob = (Object *)node->link;
- if (ob->type == OB_CAMERA && ob->data) {
- f(ob, sce);
- }
- }
+ if (ob->type == OB_CAMERA && ob->data) {
+ f(ob, sce);
+ }
+ }
}
void CamerasExporter::exportCameras(Scene *sce)
{
- openLibrary();
+ openLibrary();
- forEachCameraObjectInExportSet(sce, *this, this->export_settings->export_set);
+ forEachCameraObjectInExportSet(sce, *this, this->export_settings->export_set);
- closeLibrary();
+ closeLibrary();
}
void CamerasExporter::operator()(Object *ob, Scene *sce)
{
- Camera *cam = (Camera *)ob->data;
- std::string cam_id(get_camera_id(ob));
- std::string cam_name(id_name(cam));
+ Camera *cam = (Camera *)ob->data;
+ std::string cam_id(get_camera_id(ob));
+ std::string cam_name(id_name(cam));
- switch (cam->type) {
- case CAM_PANO:
- case CAM_PERSP:
- {
- COLLADASW::PerspectiveOptic persp(mSW);
- persp.setXFov(RAD2DEGF(focallength_to_fov(cam->lens, cam->sensor_x)), "xfov");
- persp.setAspectRatio((float)(sce->r.xsch) / (float)(sce->r.ysch), false, "aspect_ratio");
- persp.setZFar(cam->clip_end, false, "zfar");
- persp.setZNear(cam->clip_start, false, "znear");
- COLLADASW::Camera ccam(mSW, &persp, cam_id, cam_name);
- exportBlenderProfile(ccam, cam);
- addCamera(ccam);
+ switch (cam->type) {
+ case CAM_PANO:
+ case CAM_PERSP: {
+ COLLADASW::PerspectiveOptic persp(mSW);
+ persp.setXFov(RAD2DEGF(focallength_to_fov(cam->lens, cam->sensor_x)), "xfov");
+ persp.setAspectRatio((float)(sce->r.xsch) / (float)(sce->r.ysch), false, "aspect_ratio");
+ persp.setZFar(cam->clip_end, false, "zfar");
+ persp.setZNear(cam->clip_start, false, "znear");
+ COLLADASW::Camera ccam(mSW, &persp, cam_id, cam_name);
+ exportBlenderProfile(ccam, cam);
+ addCamera(ccam);
- break;
- }
- case CAM_ORTHO:
- default:
- {
- COLLADASW::OrthographicOptic ortho(mSW);
- ortho.setXMag(cam->ortho_scale / 2, "xmag");
- ortho.setAspectRatio((float)(sce->r.xsch) / (float)(sce->r.ysch), false, "aspect_ratio");
- ortho.setZFar(cam->clip_end, false, "zfar");
- ortho.setZNear(cam->clip_start, false, "znear");
- COLLADASW::Camera ccam(mSW, &ortho, cam_id, cam_name);
- exportBlenderProfile(ccam, cam);
- addCamera(ccam);
- break;
- }
- }
+ break;
+ }
+ case CAM_ORTHO:
+ default: {
+ COLLADASW::OrthographicOptic ortho(mSW);
+ ortho.setXMag(cam->ortho_scale / 2, "xmag");
+ ortho.setAspectRatio((float)(sce->r.xsch) / (float)(sce->r.ysch), false, "aspect_ratio");
+ ortho.setZFar(cam->clip_end, false, "zfar");
+ ortho.setZNear(cam->clip_start, false, "znear");
+ COLLADASW::Camera ccam(mSW, &ortho, cam_id, cam_name);
+ exportBlenderProfile(ccam, cam);
+ addCamera(ccam);
+ break;
+ }
+ }
}
-bool CamerasExporter::exportBlenderProfile(COLLADASW::Camera &cm,Camera *cam)
+bool CamerasExporter::exportBlenderProfile(COLLADASW::Camera &cm, Camera *cam)
{
- cm.addExtraTechniqueParameter("blender","shiftx",cam->shiftx);
- cm.addExtraTechniqueParameter("blender","shifty",cam->shifty);
- cm.addExtraTechniqueParameter("blender","dof_distance",cam->dof_distance);
- return true;
-
+ cm.addExtraTechniqueParameter("blender", "shiftx", cam->shiftx);
+ cm.addExtraTechniqueParameter("blender", "shifty", cam->shifty);
+ cm.addExtraTechniqueParameter("blender", "dof_distance", cam->dof_distance);
+ return true;
}