Update plantgl

fredboudon · Sep 17, 2021 · fdcfc89 · fdcfc89
1 parent cd906ad
commit fdcfc89
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ Arguments:
 - `size_display` tuple (int, int): width and height of the canvas (minimum 400)
 - `size_world` float: extend on the 3D scene in all directions
 
-Example: 
+Example:
 
 ```python
 from openalea.plantgl.all import Scene, Sphere
@@ -56,7 +56,7 @@ s = Scene([Sphere()])
 sw = SceneWidget(s)
 sw
 ```
-Tutorial: 
+Tutorial:
 -  Display of spheres [@nbviewer](https://nbviewer.jupyter.org/github/jvail/plantgl-jupyter/blob/master/examples/spheres.ipynb)
 
 **LsystemWidget**
@@ -112,7 +112,7 @@ import pgljupyter
 ```
 
 ```python
-%%lpy -u cm 
+%%lpy -u cm
 from openalea.plantgl.all import *
 Axiom: ;(1)+(10)_(2)F(10);(0)@g(Paraboloid(10,10,2,False))
 derivation length: 100

diff --git a/css/widget.css b/css/widget.css
@@ -49,7 +49,7 @@
     --mdc-typography-body2-font-size: 12px;
     --mdc-typography-body2-color: white;
     --mdc-theme-secondary: rgb(75, 75, 75);
-    --mdc-theme-primary: #f57c24;
+    --mdc-theme-primary: #F37726;
     --mdc-icon-size: 30px;
     --mdc-button-size: 35px;
 }
@@ -63,7 +63,7 @@
     --mdc-typography-body1-font-size: 12px;
     --mdc-typography-body2-font-size: 12px;
     --mdc-typography-body2-color: white;
-    --mdc-theme-secondary: #f57c24;
+    --mdc-theme-secondary: #F37726;
     --mdc-theme-primary: rgb(75, 75, 75);
     --mdc-icon-size: 30px;
     --mdc-button-size: 35px;
@@ -106,7 +106,7 @@
     --mdc-typography-body1-font-size: 12px;
     --mdc-typography-body2-font-size: 12px;
     --mdc-typography-body2-color: white;
-    --mdc-theme-primary: #f57c24;
+    --mdc-theme-primary: #F37726;
     --mdc-theme-secondary: rgb(75, 75, 75);
     --mdc-icon-size: 30px;
     --mdc-button-size: 35px;
@@ -121,12 +121,12 @@
     margin: 5px 12px;
     display: block;
     text-align: left;
-    --mdc-theme-primary: #f57c24;
+    --mdc-theme-primary: #F37726;
     --mdc-theme-secondary: rgb(75, 75, 75);
 }
 
 mwc-icon-button-toggle, mwc-icon-button {
-    color: #f57c24;
+    color: #F37726;
     --mdc-icon-button-ripple-opacity: 0
 }
 
@@ -156,13 +156,13 @@ mwc-icon-button-toggle, mwc-icon-button {
 }
 
 .pgl-curve-editor-svg .curve {
-    stroke: #f57c24;
+    stroke: #F37726;
     fill: none;
     stroke-width: 2;
 }
 
 .pgl-curve-editor-svg .point {
-    fill: #f57c24;
+    fill: #F37726;
     cursor: pointer;
 }
 

diff --git a/examples/examples.yml b/examples/examples.yml
@@ -3,7 +3,7 @@ channels:
   - fredboudon
   - conda-forge
 dependencies:
-  - openalea.lpy>=3.6.0
+  - openalea.lpy>=3.8.0
   - jupyterlab>=3.0.0
   - jupyterlab_widgets
   - ipython=7

diff --git a/setup.py b/setup.py
@@ -88,8 +88,8 @@
         'ipython>=7.0.0',
         'jupyterlab>=3.0.0',
         'ipywidgets>=7.5.0',
-        'openalea.lpy>=3.6.0,<4.0.0',
-        'openalea.plantgl>=3.8.0,<4.0.0'
+        'openalea.lpy>=3.8.0,<4.0.0',
+        'openalea.plantgl>=3.10.0,<4.0.0'
     ],
     python_requires='>=3.7',
     extras_require={

diff --git a/src/pgljs/plantgl b/src/pgljs/plantgl
+105 −0		.github/workflows/conda-package-build.yml
+1 −0		.gitignore
+7 −7		CMakeLists.txt
+2 −2		conda/meta.yaml
+1 −0		doc/environment.yml
+1 −0		githubaction.yml
+5 −2		src/cpp/plantgl/algo/codec/binaryprinter.cpp
+14 −0		src/cpp/plantgl/algo/codec/binaryprinter.h
+1 −0		src/cpp/plantgl/algo/codec/povprinter.cpp
+23 −23		src/cpp/plantgl/algo/codec/scne_binaryparser.cpp
+12 −17		src/cpp/plantgl/algo/projection/projectioncamera.cpp
+32 −25		src/cpp/plantgl/algo/projection/projectioncamera.h
+2 −2		src/cpp/plantgl/algo/projection/projectionengine.h
+42 −1		src/cpp/plantgl/algo/projection/zbufferengine.cpp
+3 −1		src/cpp/plantgl/algo/projection/zbufferengine.h
+1 −0		src/cpp/plantgl/gui/base/zbuffer.cpp
+9 −9		src/cpp/plantgl/scenegraph/geometry/nurbscurve.cpp
+3 −3		src/cpp/plantgl/scenegraph/geometry/nurbscurve.h
+25 −26		src/cpp/plantgl/scenegraph/geometry/nurbspatch.cpp
+3 −3		src/cpp/plantgl/scenegraph/geometry/nurbspatch.h
+1 −1		src/cpp/plantgl/version.h
+2 −2		src/openalea/plantgl/gui/curve2deditor.py
+1 −1		src/openalea/plantgl/gui/nurbspatcheditor.py
+27 −0		src/openalea/plantgl/scenegraph/__init__.py
+81 −0		src/openalea/plantgl/scenegraph/nurbsshape.py
+10 −4		src/wrapper/algo/export_projectionengine.cpp
+6 −0		src/wrapper/algo/export_zbufferengine.cpp
+2 −2		src/wrapper/math/export_vector2.cpp
+3 −4		src/wrapper/scenegraph/arrays_macro.h
+16 −0		src/wrapper/scenegraph/export_factory.cpp
+3 −2		test/compare_zbufferrendering.py
+42 −1		test/test_codec.py
+9 −7		test/test_pointgrid.py
+35 −0		test/test_vector.py
+1 −1		test/test_zbufferengine.py