← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/freestyle/intern/scene_graph/NodeCamera.h

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/freestyle/intern/scene_graph/NodeCamera.h
83
83
        double projection_matrix_[16];
84
84
 
85
85
        CameraType camera_type_;
 
86
 
 
87
#ifdef WITH_CXX_GUARDEDALLOC
 
88
        MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:NodeCamera")
 
89
#endif
 
90
 
86
91
};
87
92
 
88
93
class LIB_SCENE_GRAPH_EXPORT NodeOrthographicCamera : public NodeCamera
145
150
        double top_;
146
151
        double zNear_;
147
152
        double zFar_;
 
153
 
 
154
#ifdef WITH_CXX_GUARDEDALLOC
 
155
        MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:NodeOrthographicCamera")
 
156
#endif
 
157
 
148
158
};
149
159
 
150
160
class LIB_SCENE_GRAPH_EXPORT NodePerspectiveCamera : public NodeCamera
205
215
         *           zFar-zNear
206
216
         */
207
217
        NodePerspectiveCamera(double left, double right, double bottom, double top, double zNear, double zFar);
 
218
 
 
219
#ifdef WITH_CXX_GUARDEDALLOC
 
220
        MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:NodePerspectiveCamera")
 
221
#endif
 
222
 
208
223
};
209
224
 
210
225
} /* namespace Freestyle */