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

Jump to bottom

MacOS #2

Merged
merged 4 commits into from
Apr 27, 2012
Merged

MacOS #2

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6abfbc0
Move GLSL code related to ellipsoid-ray intersection out of Ray.glsl and
kring Apr 27, 2012
05853f7
Undo part of my previous change. I had changed agi_raySegmentCollecti…
kring Apr 27, 2012
36c7020
Merge branch 'master' into macos
kring Apr 27, 2012
da0a292
Merge branch 'master' into macos
kring Apr 27, 2012
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
Prev Previous commit
Merge branch 'master' into macos 
Conflicts:
	Source/Shaders/Ray.glsl
  • Loading branch information
@kring
kring committed Apr 27, 2012
commit da0a292847bfe24bf01a79151a785dce562bb85b
16 changes: 8 additions & 8 deletions Source/Shaders/Ray.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ agi_raySegmentCollection agi_raySegmentCollectionNew()
*/
agi_raySegmentCollection agi_raySegmentCollectionNew(agi_raySegment segment)
{
agi_raySegment intervals[agi_raySegmentCollectionCapacity];
intervals[0] = segment;
agi_raySegmentCollection i = agi_raySegmentCollection(intervals, 1);
agi_raySegment intervals[agi_raySegmentCollectionCapacity];
intervals[0] = segment;
agi_raySegmentCollection i = agi_raySegmentCollection(intervals, 1);
return i;
}

Expand All @@ -61,11 +61,11 @@ agi_raySegmentCollection agi_raySegmentCollectionNew(agi_raySegment segment)
*/
agi_raySegmentCollection agi_raySegmentCollectionNew(agi_raySegment first, agi_raySegment second)
{
agi_raySegment intervals[agi_raySegmentCollectionCapacity];
intervals[0] = first;
intervals[1] = second;
agi_raySegmentCollection i = agi_raySegmentCollection(intervals, 2);
return i;
agi_raySegment intervals[agi_raySegmentCollectionCapacity];
intervals[0] = first;
intervals[1] = second;
agi_raySegmentCollection i = agi_raySegmentCollection(intervals, 2);
return i;
}

///////////////////////////////////////////////////////////////////////////////
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.