v3.0.0 update

cuinjune · Aug 15, 2019 · 31a4ede · 31a4ede
1 parent dd91844
commit 31a4ede
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/ofelia/examples/shader/displacementMap/displacementMap.lua b/ofelia/examples/shader/displacementMap/displacementMap.lua
@@ -35,7 +35,10 @@ function M.setup()
   ofSetWindowTitle("displacement map")
   ofEnableArbTex()
   ofBackground(55)
-  if ofIsGLProgrammableRenderer() then
+  local platform = ofGetTargetPlatform()
+  if platform == OF_TARGET_LINUXARMV6L or platform == OF_TARGET_LINUXARMV7L or platform == OF_TARGET_ANDROID or platform == OF_TARGET_IOS or platform == OF_TARGET_EMSCRIPTEN then
+    shader:load(shaderDir .. "shadersES2/shader")
+  elseif ofIsGLProgrammableRenderer() then
     shader:load(shaderDir .. "shadersGL3/shader")
   else
     shader:load(shaderDir .. "shadersGL2/shader")

diff --git a/ofelia/examples/shader/simpleColorQuad/simpleColorQuad.lua b/ofelia/examples/shader/simpleColorQuad/simpleColorQuad.lua
@@ -30,7 +30,10 @@ end
 function M.setup()
   ofSetWindowTitle("simple color quad")
   ofBackground(255, 255, 255, 255)
-  if ofIsGLProgrammableRenderer() then
+  local platform = ofGetTargetPlatform()
+  if platform == OF_TARGET_LINUXARMV6L or platform == OF_TARGET_LINUXARMV7L or platform == OF_TARGET_ANDROID or platform == OF_TARGET_IOS or platform == OF_TARGET_EMSCRIPTEN then
+    shader:load(shaderDir .. "shadersES2/shader")
+  elseif ofIsGLProgrammableRenderer() then
     shader:load(shaderDir .. "shadersGL3/shader")
   else
     shader:load(shaderDir .. "shadersGL2/shader")

diff --git a/...s/video/loadDisplayMovie/data/fingers.mov → ...s/video/loadDisplayVideo/data/fingers.mov b/...s/video/loadDisplayMovie/data/fingers.mov → ...s/video/loadDisplayVideo/data/fingers.mov
diff --git a/...a/examples/video/loadDisplayMovie/main.pd → ...a/examples/video/loadDisplayVideo/main.pd b/...a/examples/video/loadDisplayMovie/main.pd → ...a/examples/video/loadDisplayVideo/main.pd