Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed Panoramic Camera for gcc 8 #820

Merged
merged 1 commit into from
Sep 13, 2019
Merged

Fixed Panoramic Camera for gcc 8 #820

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions engines/ospray/ispc/camera/PanoramicCamera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ void PanoramicCamera::commit()
// ------------------------------------------------------------------
dir = normalize(dir);
vec3f dirU = normalize(cross(dir, up));
vec3f dirV =
cross(dirU, dir); // rotate film to be perpendicular to 'dir'
vec3f dirV = cross(dirU, dir); // rotate film to be perpendicular to 'dir'

vec3f org = pos;
const vec3f ipd_offset = 0.5f * interpupillaryDistance * dirU;
Expand All @@ -80,13 +79,11 @@ void PanoramicCamera::commit()
const size_t numClipPlanes = clipPlanes ? clipPlanes->numItems : 0;

ispc::PanoramicCamera_set(getIE(), (const ispc::vec3f&)org,
(const ispc::vec3f&)dir,
(const ispc::vec3f&)dirU,
(const ispc::vec3f&)dir, (const ispc::vec3f&)dirU,
(const ispc::vec3f&)dirV,
(const ispc::vec3f&)ipd_offset,
(const ispc::vec4f*)clipPlaneData,
numClipPlanes,
(const bool)half);
(const ispc::vec4f*)clipPlaneData, numClipPlanes,
half);
}

OSP_REGISTER_CAMERA(PanoramicCamera, panoramic);
Expand Down