/trunk Developers: chrg

Activity by Clock Time

Activity in Directories

Most Recent Commits

chrg 2011-11-10 03:25 Rev.: 999

Fixed a typo.

CGB

1 lines of code changed in 1 file:

• mgllib/mglEyelink: mglEyelinkSetup.m (+1 -1)

chrg 2011-11-10 02:07 Rev.: 998

Updated the mglEyelinkSetup function so that calibration target parameters can be passed. Needs to be bugtested.

CGB

431 lines of code changed in 3 files:

• mgllib/mglEyelink: mglEyelinkSetup.m (+78 -10), mglPrivateEyelinkSetup.c (+342 -328), mglPrivateEyelinkSetup.h (+11)

chrg 2011-11-01 13:47 Rev.: 991

- Fixed the Windows section of mgl.h to get rid of some compiler warnings.
- mglMake adjusted to set more mex parameters for Windows.

22 lines of code changed in 2 files:

• mgllib: mgl.h (+3 -3), mglMake.m (+19 -10)

chrg 2011-10-26 03:01 Rev.: 989

Fixed a bug in mglFillRect3D which caused rotations to be off by a little bit.

CGB

1 lines of code changed in 1 file:

• mgllib: mglFillRect3D.c (+1 -1)

chrg 2011-10-25 05:54 Rev.: 982

Updated documentation.

CGB

1 lines of code changed in 1 file:

• mgllib: mglUnbindFrameBufferObject.m (+1 -1)

chrg 2011-10-25 05:52 Rev.: 981

Framebuffer objects now support multisampling.

CGB

107 lines of code changed in 3 files:

• mgllib: mglBindFrameBufferObject.c (+19 -6), mglCreateFrameBufferObject.c (+48 -21), mglUnbindFrameBufferObject.c (+40 -1)

chrg 2011-10-25 03:27 Rev.: 980

mglEyeLinkGetCurrentEyePos now also returns the timestamp associated with the eye position.

CGB

40 lines of code changed in 1 file:

• mgllib/mglEyelink: mglEyelinkGetCurrentEyePos.m (+40 -19)

chrg 2011-10-13 01:03 Rev.: 972

- Added new function to render polygons in 3D.

CGB

80 lines of code changed in 1 file:

• mgllib: mglPolygon3D.c (new 80)

chrg 2011-10-01 01:28 Rev.: 970

- Updated mglGetMouse to have the ability to return mouse coordinates relative to a display if specified.
- Didn't recompile anything since I don't have Lion.

CGB

80 lines of code changed in 4 files:

• mgllib: mglGetMouse.c (+56 -6), mglGetMouse.m (+13 -5), mglSetMousePosition.c (-1), mglSetMousePosition.m (+11 -5)

chrg 2011-09-20 05:26 Rev.: 969

- Updated the help documentation.

CGB

7 lines of code changed in 1 file:

• mgllib: mglFillRect3D.m (+7 -6)

chrg 2011-09-14 14:00 Rev.: 967

- Deleted the mexopts.bat files. Library inclusions are now made using #pragma commands in mgl.h.
Now people can use the stock mexopts.sh.
- Changed some of the preprocessor defines in order to make use of the built in Visual Studio ones.
- Recompiled everything under 2010a x64.

CGB

108 lines of code changed in 62 files:

• mgllib: mexopts64-2010a.bat (del), mexopts64-2011a.bat (del), mgl.h (+10 -3), mglBindFrameBufferObject.mexw64 (changed), mglBltTexture.c (+1 -1), mglBltTexture.mexw64 (changed), mglCharToKeycode.c (+1 -1), mglCharToKeycode.mexw64 (changed), mglClearScreen.mexw64 (changed), mglCreateFrameBufferObject.mexw64 (changed), mglDisplayCursor.c (+5 -2), mglDisplayCursor.mexw64 (changed), mglDrawImage.mexw64 (changed), mglFillOval.mexw64 (changed), mglFillRect.mexw64 (changed), mglFillRect3D.mexw64 (changed), mglFlush.c (+2 -2), mglFlush.mexw64 (changed), mglFrameGrab.mexw64 (changed), mglGetGammaTable.c (+3 -3), mglGetGammaTable.mexw64 (changed), mglGetKeys.mexw64 (changed), mglGetMouse.c (+17 -16), mglGetMouse.mexw64 (changed), mglGetSecs.c (+1 -1), mglGetSecs.mexw64 (changed), mglGluAnnulus.mexw64 (changed), mglGluDisk.mexw64 (changed), mglGluPartialDisk.mexw64 (changed), mglIsCursorVisible.c (+15), mglKeycodeToChar.c (+1 -1), mglKeycodeToChar.mexw64 (changed), mglLines2.mexw64 (changed), mglPoints2.mexw64 (changed), mglPoints3.mexw64 (changed), mglPolygon.mexw64 (changed), mglPrivateClose.c (+2 -2), mglPrivateClose.mexw64 (changed), mglPrivateCreateTexture.mexw64 (changed), mglPrivateDeleteTexture.mexw64 (changed), mglPrivateDescribeDisplays.c (+1 -1), mglPrivateDescribeDisplays.mexw64 (changed), mglPrivateInstallSound.c (+17), mglPrivateMoveWindow.mexw64 (changed), mglPrivateOpen.c (+22 -2), mglPrivateOpen.mexw64 (changed), mglPrivateSwitchDisplay.c (+2 -2), mglPrivateSwitchDisplay.mexw64 (changed), mglQuad.mexw64 (changed), mglResolution.c (+2 -2), mglResolution.mexw64 (changed), mglSetGammaTable.c (+2 -2), mglSetGammaTable.mexw64 (changed), mglSetMousePosition.mexw64 (changed), mglShader.c (+4 -4), mglShader.mexw64 (changed), mglStencilCreateBegin.mexw64 (changed), mglStencilCreateEnd.mexw64 (changed), mglStencilSelect.mexw64 (changed), mglStrokeText.mexw64 (changed), mglTransform.mexw64 (changed), mglUnbindFrameBufferObject.mexw64 (changed)

chrg 2011-09-13 13:36 Rev.: 966

- Added Windows versions of mglKeycodeToChar and mglCharToKeycode.
- Recompiled everything under Matlab 2010a for x64.

Chris

212 lines of code changed in 46 files:

• mgllib: mexopts64-2010a.bat (new 63), mexopts64-2011a.bat (new 62), mexopts64.bat (del), mglBindFrameBufferObject.mexw64 (changed), mglBltTexture.mexw64 (changed), mglCharToKeycode.c (+49 -4), mglCharToKeycode.mexw64 (new), mglClearScreen.mexw64 (changed), mglCreateFrameBufferObject.mexw64 (changed), mglDisplayCursor.mexw64 (changed), mglDrawImage.mexw64 (changed), mglFillOval.mexw64 (changed), mglFillRect.mexw64 (changed), mglFillRect3D.mexw64 (changed), mglFlush.mexw64 (changed), mglFrameGrab.mexw64 (changed), mglGetGammaTable.mexw64 (changed), mglGetMouse.mexw64 (changed), mglGetSecs.mexw64 (changed), mglGluAnnulus.mexw64 (changed), mglGluDisk.mexw64 (changed), mglGluPartialDisk.mexw64 (changed), mglKeycodeToChar.c (+38 -3), mglKeycodeToChar.mexw64 (new), mglLines2.mexw64 (changed), mglPoints2.mexw64 (changed), mglPoints3.mexw64 (changed), mglPolygon.mexw64 (changed), mglPrivateClose.mexw64 (changed), mglPrivateCreateTexture.mexw64 (changed), mglPrivateDeleteTexture.mexw64 (changed), mglPrivateDescribeDisplays.mexw64 (changed), mglPrivateMoveWindow.mexw64 (changed), mglPrivateOpen.mexw64 (changed), mglPrivateSwitchDisplay.mexw64 (changed), mglQuad.mexw64 (changed), mglResolution.mexw64 (changed), mglSetGammaTable.mexw64 (changed), mglSetMousePosition.mexw64 (changed), mglShader.mexw64 (changed), mglStencilCreateBegin.mexw64 (changed), mglStencilCreateEnd.mexw64 (changed), mglStencilSelect.mexw64 (changed), mglStrokeText.mexw64 (changed), mglTransform.mexw64 (changed), mglUnbindFrameBufferObject.mexw64 (changed)

chrg 2011-09-06 11:59 Rev.: 965

Added fullscreen functionality for the Windows version of MGL. Compiled under 2011a for x64.

Chris

45 lines of code changed in 41 files:

• mgllib: mglBindFrameBufferObject.mexw64 (changed), mglBltTexture.mexw64 (changed), mglClearScreen.mexw64 (changed), mglCreateFrameBufferObject.mexw64 (changed), mglDisplayCursor.mexw64 (changed), mglDrawImage.mexw64 (changed), mglFillOval.mexw64 (changed), mglFillRect.mexw64 (changed), mglFillRect3D.mexw64 (changed), mglFlush.mexw64 (changed), mglFrameGrab.mexw64 (changed), mglGetGammaTable.mexw64 (changed), mglGetKeys.mexw64 (changed), mglGetMouse.mexw64 (changed), mglGetSecs.mexw64 (changed), mglGluAnnulus.mexw64 (changed), mglGluDisk.mexw64 (changed), mglGluPartialDisk.mexw64 (changed), mglLines2.mexw64 (changed), mglPoints2.mexw64 (changed), mglPoints3.mexw64 (changed), mglPolygon.mexw64 (changed), mglPrivateClose.mexw64 (changed), mglPrivateCreateTexture.mexw64 (changed), mglPrivateDeleteTexture.mexw64 (changed), mglPrivateDescribeDisplays.mexw64 (changed), mglPrivateMoveWindow.mexw64 (changed), mglPrivateOpen.c (+45 -20), mglPrivateOpen.mexw64 (changed), mglPrivateSwitchDisplay.mexw64 (changed), mglQuad.mexw64 (changed), mglResolution.mexw64 (changed), mglSetGammaTable.mexw64 (changed), mglSetMousePosition.mexw64 (changed), mglShader.mexw64 (changed), mglStencilCreateBegin.mexw64 (changed), mglStencilCreateEnd.mexw64 (changed), mglStencilSelect.mexw64 (changed), mglStrokeText.mexw64 (changed), mglTransform.mexw64 (changed), mglUnbindFrameBufferObject.mexw64 (changed)

chrg 2011-07-30 14:40 Rev.: 961

- Multisampling is now available for Windows. Compiled x64 under 2011a.

Chris

161 lines of code changed in 3 files:

• mgllib: mgl.h (+1), mglPrivateOpen.c (+160 -7), mglPrivateOpen.mexw64 (changed)

chrg 2011-07-26 05:46 Rev.: 959

- Added an option to enable multisampling in mglPrivateOpen. To do this one needs to call
mglSetParam('multisampling', 1)
before calling mglOpen. Right now this is only implemented for CGL. Should really add an option to be able to control the number of multisampling pixels used. Currently set to 4.
- Compiled for 2010b x64.

Chris

114 lines of code changed in 2 files:

• mgllib: mglPrivateOpen.c (+114 -71), mglPrivateOpen.mexmaci64 (changed)

chrg 2011-07-25 09:48 Rev.: 958

- Recompiled the Win64 binaries under 2011a. Should fix any GLEW segfaults.

Chris

84 lines of code changed in 44 files:

• mgllib: mgl.h (+1), mglBindFrameBufferObject.mexw64 (changed), mglBltTexture.mexw64 (changed), mglClearScreen.mexw64 (changed), mglCreateFrameBufferObject.mexw64 (changed), mglDisplayCursor.mexw64 (changed), mglDrawImage.mexw64 (changed), mglFillOval.mexw64 (changed), mglFillRect.mexw64 (changed), mglFillRect3D.mexw64 (changed), mglFlush.mexw64 (changed), mglFrameGrab.mexw64 (changed), mglGetGammaTable.mexw64 (changed), mglGetKeys.mexw64 (changed), mglGetMouse.mexw64 (changed), mglGetSecs.mexw64 (changed), mglGluAnnulus.mexw64 (changed), mglGluDisk.mexw64 (changed), mglGluPartialDisk.mexw64 (changed), mglLines2.mexw64 (changed), mglOpen.m (+2 -2), mglPoints2.mexw64 (changed), mglPoints3.mexw64 (changed), mglPolygon.mexw64 (changed), mglPrivateClose.mexw64 (changed), mglPrivateCreateTexture.mexw64 (changed), mglPrivateDeleteTexture.mexw64 (changed), mglPrivateDescribeDisplays.mexw64 (changed), mglPrivateMoveWindow.mexw64 (changed), mglPrivateOpen.c (+7), mglPrivateOpen.mexw64 (changed), mglPrivateSwitchDisplay.mexw64 (changed), mglQuad.mexw64 (changed), mglResolution.mexw64 (changed), mglSetGammaTable.mexw64 (changed), mglSetMousePosition.mexw64 (changed), mglShader.c (+74), mglShader.mexw64 (changed), mglStencilCreateBegin.mexw64 (changed), mglStencilCreateEnd.mexw64 (changed), mglStencilSelect.mexw64 (changed), mglStrokeText.mexw64 (changed), mglTransform.mexw64 (changed), mglUnbindFrameBufferObject.mexw64 (changed)

chrg 2011-07-23 12:36 Rev.: 957

- Recompiled Win64 binaries under 2011a.
- Got a few more mgl functions working for Windows.

CGB

119 lines of code changed in 46 files:

• mgllib: mexopts64.bat (new 62), mgl.h (+8 -4), mglBindFrameBufferObject.mexw64 (new), mglBltTexture.mexw64 (changed), mglClearScreen.mexw64 (changed), mglCreateFrameBufferObject.mexw64 (new), mglDisplayCursor.mexw64 (changed), mglDrawImage.mexw64 (new), mglFillOval.mexw64 (changed), mglFillRect.mexw64 (changed), mglFillRect3D.mexw64 (new), mglFlush.mexw64 (changed), mglFrameGrab.mexw64 (changed), mglGetGammaTable.mexw64 (changed), mglGetKeys.mexw64 (changed), mglGetMouse.mexw64 (changed), mglGetSecs.mexw64 (changed), mglGluAnnulus.mexw64 (changed), mglGluDisk.mexw64 (changed), mglGluPartialDisk.mexw64 (changed), mglLines2.mexw64 (changed), mglPoints2.mexw64 (changed), mglPoints3.mexw64 (changed), mglPolygon.mexw64 (changed), mglPrivateClose.mexw64 (changed), mglPrivateCreateTexture.mexw64 (changed), mglPrivateDeleteTexture.mexw64 (changed), mglPrivateDescribeDisplays.mexw64 (changed), mglPrivateGetKeyEvent.mexw64 (changed), mglPrivateGetMouseEvent.mexw64 (changed), mglPrivateMoveWindow.mexw64 (changed), mglPrivateOpen.mexw64 (changed), mglPrivateSwitchDisplay.mexw64 (changed), mglQuad.mexw64 (changed), mglResolution.c (+1 -1), mglResolution.mexw64 (changed), mglSetGammaTable.mexw64 (changed), mglSetMousePosition.mexw64 (new), mglShader.c (+48 -2), mglShader.mexw64 (new), mglStencilCreateBegin.mexw64 (changed), mglStencilCreateEnd.mexw64 (changed), mglStencilSelect.mexw64 (changed), mglStrokeText.mexw64 (changed), mglTransform.mexw64 (changed), mglUnbindFrameBufferObject.mexw64 (new)

chrg 2011-07-01 01:02 Rev.: 941

Changed mglSetMousePosition to use the same coordinate system as that used by mglGetMouse. A 3rd parameter has now been added that lets you specify which screen the coordinates are relative to. Compiled under 2010b for 64bit.

CGB

58 lines of code changed in 2 files:

• mgllib: mglSetMousePosition.c (+58 -21), mglSetMousePosition.mexmaci64 (changed)

chrg 2011-06-23 04:42 Rev.: 935

- Updated mglCreateTexture to allow passing some texture arguments. (Compiled under 2009b)
- Fixed a couple documentation errors.

CGB

339 lines of code changed in 6 files:

• mgllib: mglCreateTexture.m (+66 -2), mglGetParam.m (+2 -2), mglPrivateCreateTexture.c (+270 -249), mglPrivateCreateTexture.mexmaci (changed), mglPrivateCreateTexture.mexmaci64 (changed), mglUnbindFrameBufferObject.m (+1 -1)

chrg 2011-06-11 04:46 Rev.: 934

- Added a new 64-bit binary for mglIsCursorVisible. Compiled under 2010b.

Chris

0 lines of code changed in 1 file:

• mgllib: mglIsCursorVisible.mexmaci64 (new)

(19 more)