From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: 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 --- source/blender/collada/CameraExporter.cpp | 97 +++++++++++++++---------------- 1 file changed, 48 insertions(+), 49 deletions(-) (limited to 'source/blender/collada/CameraExporter.cpp') 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 #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 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; } -- cgit v1.2.3