Merge branch 'master' into features/python3

.gitignore

@@ -1,56 +1,12 @@
 # libavg specific
-Makefile
-*.in
-.deps
-.libs
 *.cache
 core
 
-aclocal.m4
-config.guess
-config.log
-config.status
-config.sub
-configure
-libtool
-depcomp
-missing
-compile
-ltmain.sh
-m4/libtool.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
-py-compile
-src/audio/testlimiter
-src/avgconfig.h
-src/base/testbase
-src/graphics/benchmarkgraphics
-src/graphics/testgpu
-src/graphics/testgraphics
-src/imaging/testimaging
-src/player/testcalibrator
-src/player/testplayer
-src/stamp-h1
-src/version.h
-src/video/testvideo
-src/test/tmp.dot
-test-driver
-*.orig
-
 #libavg dist-check
-version.h
 sphinxdoc/_build
 libavg-*.tar.gz
 libavg-*.zip
 
-# Make check output
-*.log
-*.trs
-src/test/libavg
-src/test/resultimages
-
 # python
 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -81,8 +37,7 @@ __pycache__/
 *.swp
 
 # PyCharm user specific
-.idea/workspace.xml
-.idea/tasks.xml
+.idea
 
 # MSVC
 *.vcxproj.user

src/CMakeLists.txt

@@ -24,3 +24,4 @@ add_subdirectory(video)
 add_subdirectory(player)
 add_subdirectory(anim)
 add_subdirectory(wrapper)
+add_subdirectory(samples)

src/player/Player.cpp

@@ -40,7 +40,6 @@
 #include "FontStyle.h"
 #include "PluginManager.h"
 #include "TextEngine.h"
-#include "TestHelper.h"
 #include "MainCanvas.h"
 #include "OffscreenCanvas.h"
 #include "OffscreenCanvasNode.h"

src/samples/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(firebirds)

src/samples/firebirds/CMakeLists.txt

@@ -0,0 +1 @@
+add_subdirectory(plugin)

src/samples/firebirds/firebirds.py

@@ -256,30 +256,30 @@ def update(self, dt):
 ### gui elements ###
 
 class LifeCounter(avg.DivNode):
-    __NUM_LIVES = 3
+    __NUM_LIFES = 3
 
     def __init__(self, parent=None, **kwargs):
         super().__init__(**kwargs)
         self.registerInstance(self, parent)
-        self.__numLives = 0
+        self.__numLifes = 0
         self.__images = []
         x = 0
-        for i in range(LifeCounter.__NUM_LIVES):
+        for i in range(LifeCounter.__NUM_LIFES):
             avg.ImageNode(href='gui_lives_bg.png', pos=(x, 0), parent=self)
             img = avg.ImageNode(href='gui_lives_fg.png', pos=(x, 0), parent=self)
             self.__images.append(img)
             x += img.width
 
     def reset(self):
-        self.__numLives = 3
+        self.__numLifes = 3
         for img in self.__images:
             avg.Anim.fadeIn(img, 250)
 
     def dec(self):
-        assert(self.__numLives)
-        self.__numLives -= 1
-        avg.Anim.fadeOut(self.__images[self.__numLives], 250)
-        return not self.__numLives
+        assert(self.__numLifes)
+        self.__numLifes -= 1
+        avg.Anim.fadeOut(self.__images[self.__numLifes], 250)
+        return not self.__numLifes
 
 
 class ScoreCounter(avg.DivNode):

src/samples/firebirds/plugin/CMakeLists.txt

@@ -0,0 +1,26 @@
+set(PLUGIN_NAME collisiondetector)
+set(PLUGIN_SRC CollisionDetector.cpp)
+
+add_library(${PLUGIN_NAME} MODULE ${PLUGIN_SRC})
+
+list(APPEND PLUGIN_INCLUDES ${CMAKE_SOURCE_DIR}/src)
+
+list(APPEND PLUGIN_INCLUDES ${PYTHON_INCLUDE_DIRS})
+list(APPEND PLUGIN_LIBS ${PYTHON_LIBRARIES})
+
+list(APPEND PLUGIN_INCLUDES ${Boost_INCLUDE_DIRS})
+list(APPEND PLUGIN_LIBS ${Boost_LIBRARIES})
+
+target_compile_options(collisiondetector PUBLIC ${LIBXML2_CFLAGS})
+target_include_directories(collisiondetector PUBLIC ${PLUGIN_INCLUDES})
+
+#target_compile_definitions(${PLUGIN_NAME} PUBLIC AVG_PLUGIN)
+
+set_target_properties(${PLUGIN_NAME} PROPERTIES PREFIX "")
+
+if (${PLATFORM_LINUX})
+    target_link_libraries(${PLUGIN_NAME} ${PLUGIN_LIBS} avg)
+elseif (${PLATFORM_MACOSX})
+    target_link_libraries(${PLUGIN_NAME} -bundle -flat_namespace "-undefined suppress")
+    target_link_libraries(${PLUGIN_NAME} ${LIBXML2_LDFLAGS} ${PLUGIN_LIBS})
+endif()

src/test/PlayerTest.py

@@ -353,12 +353,12 @@ def activateNode():
 
     def testInvalidVideoFilename(self):
         def tryplay():
-            assertRaises(SystemError, lambda: video.play())
+            self.assertRaises(Exception, lambda: video.play())
 
         root = self.loadEmptyScene()
         video = avg.VideoNode(href="filedoesntexist.avi", parent=root)
         self.start(False,
-                (lambda: tryplay,
+                (lambda: tryplay(),
                  lambda: video.stop()
                 ))