From e43a24cd60a1ed1dc97a52bb87c075f6c79b251d Mon Sep 17 00:00:00 2001 From: Jean-Nicolas Brunet Date: Thu, 21 Jan 2021 15:15:37 +0100 Subject: [PATCH] [Examples] Remove the pygame scene as it is broken without glew bindings Signed-off-by: Jean-Nicolas Brunet --- examples/CMakeLists.txt | 4 +- .../pygame_renderingloop/backend_pygame.py | 67 ------------------- examples/pygame_renderingloop/pygame_test.py | 61 ----------------- 3 files changed, 1 insertion(+), 131 deletions(-) delete mode 100644 examples/pygame_renderingloop/backend_pygame.py delete mode 100644 examples/pygame_renderingloop/pygame_test.py diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 084d5fd6..74fc8bae 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -18,9 +18,7 @@ set(EXAMPLES_FILES ${CMAKE_CURRENT_SOURCE_DIR}/loadXMLfromPython.py ${CMAKE_CURRENT_SOURCE_DIR}/ReadTheDocs_Example.py ${CMAKE_CURRENT_SOURCE_DIR}/realTimeClockScene.py - ${CMAKE_CURRENT_SOURCE_DIR}/pygame_renderingloop/backend_pygame.py - ${CMAKE_CURRENT_SOURCE_DIR}/pygame_renderingloop/pygame_test.py - ${CMAKE_CURRENT_SOURCE_DIR}/additional-examples/ControllerScene.py + ${CMAKE_CURRENT_SOURCE_DIR}/additional-examples/ControllerScene.py ) add_custom_target(${PROJECT_NAME} SOURCES ${EXAMPLES_FILES}) diff --git a/examples/pygame_renderingloop/backend_pygame.py b/examples/pygame_renderingloop/backend_pygame.py deleted file mode 100644 index 9cf394ff..00000000 --- a/examples/pygame_renderingloop/backend_pygame.py +++ /dev/null @@ -1,67 +0,0 @@ -import pygame -import time -from OpenGL.GL import * -from OpenGL.GLU import * - -import threading -import Sofa, SofaRuntime -root = None - -def startUI(fct): - pygame.display.init() - display = (800,600) - pygame.display.set_mode(display, pygame.DOUBLEBUF|pygame.OPENGL) - - time = 0.0 - while True: - for event in pygame.event.get(): - if event.type == pygame.QUIT: - pygame.quit() - quit() - - #glRotatef(1, 3, 1, 1) - glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT) - glEnable(GL_LIGHTING) - glEnable(GL_DEPTH_TEST) - if fct != None: - fct(display, time) - time+=0.01 - - pygame.display.flip() - -def show(scene, camera): - def draw(display, t): - print("DRAW "+str(time)+ " camera> " + camera.getPathName()+" pos " + str(camera.position.array()) ) - Sofa.Simulation.glewInit() - Sofa.Simulation.initVisual(scene) - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - gluPerspective(45, (display[0]/display[1]), 0.1, 50.0) - - #cameraPM = camera.getProjectionMatrix() - #lMultMatrixd(cameraPM); - - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); - - cameraMVM = camera.getOpenGLModelViewMatrix() - glMultMatrixd(cameraMVM) - - glPointSize(10.0) - glColor4d(1.0,1.0,1.0,1.0) - glBegin(GL_POINTS) - glVertex3d(0.0,0.0,0.0) - glVertex3d(1.0,0.0,0.0) - glEnd() - - Sofa.Simulation.draw(scene) - - p = threading.Thread(target=startUI, args=(draw,)) - p.start() - #def up(self): - # print("UPDATE") - # time.sleep(0.0000001) - - #setattr(p1,"update", up) - return p - diff --git a/examples/pygame_renderingloop/pygame_test.py b/examples/pygame_renderingloop/pygame_test.py deleted file mode 100644 index 8a7e9caf..00000000 --- a/examples/pygame_renderingloop/pygame_test.py +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/python3 - -import math -import time -import SofaRuntime -import Sofa.Simulation -import Sofa.Core - -class MyC(Sofa.Core.Controller): - def __init__(self, *args, **kwargs): - Sofa.Core.Controller.__init__(self, *args, **kwargs) - self.target = kwargs["target"] - self.it = 0.0 - - def onEvent(self, e): - if e["type"] == "AnimateEndEvent": - #print("SIMULATION STEP: " + str(self.target.position.getPathName())) - self.target.position.value += math.cos(self.it) - self.it += 0.1 - cameraMVM = self.target.getOpenGLModelViewMatrix() - #print("UPDATE POSITION " + str(self.target.getPathName())) - #print("SIMULATION: " + " "+ str(self.target) +" " + str(cameraMVM)) - -def createScene(root): - root.addObject("RequiredPlugin", name="SofaComponentAll") - root.addObject("RequiredPlugin", name="SofaOpenglVisual") - root.addObject("DefaultAnimationLoop") - root.addObject("DefaultVisualManagerLoop") - - root.addObject("LightManager") - root.addObject("SpotLight", position=[0,0,10], direction=[0,0,-1]) - root.addObject("InteractiveCamera", name="camera", position=[0,0,10], - lookAt=[0,0,0], distance=37, fieldOfView=45, zNear=0.63, zFar=55.69) - - root.addObject("MechanicalObject", name="dofs", template="Rigid3", - position=[[0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0]], - showObject=True, showObjectScale=1) - - root.addObject("MeshObjLoader", name="loader", filename="mesh/Armadillo_simplified.obj", scale3d="0.1 0.1 0.1") - root.addObject("OglModel", name="visual", src="@loader", color="1 0 0 0.2") - - root.addObject(MyC(target=root.camera)) - return root - -if __name__ == "__main__": - import threading - from backend_pygame import show - - SofaRuntime.importPlugin("SofaComponentAll") - - scene = createScene(Sofa.Core.Node("root")) - - Sofa.Simulation.init(scene) - - p1 = show(scene, scene.camera) - for i in range(1000000): - for i in range(33): - Sofa.Simulation.animate(scene, 0.01) - time.sleep(0.0000001) - - p1.join()