Skip to content

Commit bf5d4eb

Browse files
committed
adding in upgraded GLEW for OSX. major rendering improvement over 'native' GLEW
1 parent 480ba59 commit bf5d4eb

File tree

14 files changed

+111
-106
lines changed

14 files changed

+111
-106
lines changed

src/libprojectM/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ if (EMSCRIPTEN)
5151
endif (EMSCRIPTEN)
5252

5353
if (APPLE)
54-
SET(USE_NATIVE_GLEW ON)
55-
SET(USE_FTGL OFF)
54+
SET(USE_NATIVE_GLEW OFF)
55+
SET(USE_FTGL ON)
5656
SET(USE_OPENMP OFF)
5757
SET(BUILD_PROJECTM_STATIC ON)
58-
SET(USE_FBO OFF)
58+
SET(USE_FBO ON)
5959
endif(APPLE)
6060

6161
ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX=\"${CMAKE_INSTALL_PREFIX}\")
1.12 MB
Binary file not shown.
77.3 KB
Binary file not shown.

src/libprojectM/Renderer/FBO.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343

4444
#ifdef MACOS
4545
#include <OpenGL/gl.h>
46-
#include <AGL/agl.h>
4746
#endif /** MACOS */
4847

4948
#ifdef WIN32

src/libprojectM/Renderer/Renderer.hpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#else
1313
#ifdef __APPLE__
1414
#include <OpenGL/gl.h>
15-
#include <OpenGL/glu.h>
1615
#else
1716
#include <GL/gl.h>
1817
#include <GL/glu.h>
534 KB
Binary file not shown.
1.56 MB
Binary file not shown.

src/libprojectM/libprojectM.a

865 KB
Binary file not shown.

src/projectM-iTunes/config.inp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
# Configuration File for projectM
33

44
Texture Size = 2048 # Size of internal rendering texture
5-
Mesh X = 4 # Width of PerPixel Equation mesh
6-
Mesh Y = 3 # Height of PerPixel Equation mesh
7-
FPS = 60 # Frames Per Second
5+
Mesh X = 16 # Width of PerPixel Equation mesh
6+
Mesh Y = 9 # Height of PerPixel Equation mesh
7+
FPS = 60 # Frames Per Second
88
Fullscreen = false
9-
Window Width = 512 # startup window width
10-
Window Height = 512 # startup window height
9+
Window Width = 1920 # startup window width
10+
Window Height = 1280 # startup window height
1111

1212
Smooth Transition Duration = 5 # in seconds
13-
Preset Duration = 30 # in seconds
14-
Easter Egg Parameter = 1
13+
Preset Duration = 20 # in seconds
14+
Easter Egg Parameter = 0
1515

1616
Hard Cut Sensitivity = 10 # Lower to make hard cuts more frequent
17-
Aspect Correction = true # Custom Shape Aspect Correction
17+
Aspect Correction = true # Custom Shape Aspect Correction
1818

1919
Preset Path = /usr/local/share/projectM/presets # preset location
2020
Title Font = /usr/local/share/projectM/fonts/Vera.ttf

src/projectM-iTunes/iProjectM.xcodeproj/project.pbxproj

Lines changed: 74 additions & 91 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)