prepare for release

Author: robertsulej

CHANGELOG.rst

@@ -1,19 +1,22 @@
 Release history
 ===============
 
-v0.7.1 - not released
----------------------
+`v0.7.1`_ - 2020-04-11
+----------------------
 
 Added
 ~~~~~
 
 - set/release gimbal lock in camera rotations
+- geometry scaling by vector and w.r.t. provided point
+- sub-launch loop breaking on UI events (e.g. camera rotation)
 
 Fixed
 ~~~~~
 
 - nan's in mesh normal calculatons
 - improved bvh memory allocations can handle more primitives in data sets
+- texture values prescale when gamma is 1.0
 
 `v0.7.0`_ - 2020-03-27
 ----------------------
@@ -294,6 +297,7 @@ v0.1.2.5 - 2019-04-16
 
 Two weeks and some steps from the initial release. Starting changelog relative to this point.
 
+.. _`v0.7.1`: https://github.com/rnd-team-dev/plotoptix/releases/tag/v0.7.1
 .. _`v0.7.0`: https://github.com/rnd-team-dev/plotoptix/releases/tag/v0.7.0
 .. _`v0.5.2`: https://github.com/rnd-team-dev/plotoptix/releases/tag/v0.5.2
 .. _`v0.5.1`: https://github.com/rnd-team-dev/plotoptix/releases/tag/v0.5.1

plotoptix/__init__.py

@@ -13,7 +13,7 @@
 __author__  = "Robert Sulej, R&D Team <dev@rnd.team>"
 __status__  = "beta"
 __version__ = "0.7.1"
-__date__    = "6 April 2020"
+__date__    = "11 April 2020"
 
 import logging
 

plotoptix/_load_lib.py

@@ -220,6 +220,24 @@ def _load_optix_win():
     optix.scale_primitive.argtypes = [c_wchar_p, c_long, c_float, c_bool]
     optix.scale_primitive.restype = c_bool
 
+    optix.scale_geometry_c.argtypes = [c_wchar_p, c_float, c_float, c_float, c_float, c_bool]
+    optix.scale_geometry_c.restype = c_bool
+
+    optix.scale_primitive_c.argtypes = [c_wchar_p, c_long, c_float, c_float, c_float, c_float, c_bool]
+    optix.scale_primitive_c.restype = c_bool
+
+    optix.scale_geometry_xyz.argtypes = [c_wchar_p, c_float, c_float, c_float, c_bool]
+    optix.scale_geometry_xyz.restype = c_bool
+
+    optix.scale_primitive_xyz.argtypes = [c_wchar_p, c_long, c_float, c_float, c_float, c_bool]
+    optix.scale_primitive_xyz.restype = c_bool
+
+    optix.scale_geometry_xyz_c.argtypes = [c_wchar_p, c_float, c_float, c_float, c_float, c_float, c_float, c_bool]
+    optix.scale_geometry_xyz_c.restype = c_bool
+
+    optix.scale_primitive_xyz_c.argtypes = [c_wchar_p, c_long, c_float, c_float, c_float, c_float, c_float, c_float, c_bool]
+    optix.scale_primitive_xyz_c.restype = c_bool
+
     optix.update_geom_buffers.argtypes = [c_wchar_p, c_uint]
     optix.update_geom_buffers.restype = c_bool
 
@@ -727,6 +745,18 @@ def scale_geometry(self, name, s, update): return self._optix.scale_geometry(nam
 
     def scale_primitive(self, name, idx, s, update): return self._optix.scale_primitive(name, idx, s, update)
 
+    def scale_geometry_c(self, name, s, cx, cy, cz, update): return self._optix.scale_geometry_c(name, s, cx, cy, cz, update)
+
+    def scale_primitive_c(self, name, idx, s, cx, cy, cz, update): return self._optix.scale_primitive_c(name, idx, s, cx, cy, cz, update)
+
+    def scale_geometry_xyz(self, name, x, y, z, update): return self._optix.scale_geometry_xyz(name, x, y, z, update)
+
+    def scale_primitive_xyz(self, name, idx, x, y, z, update): return self._optix.scale_primitive_xyz(name, idx, x, y, z, update)
+
+    def scale_geometry_xyz_c(self, name, x, y, z, cx, cy, cz, update): return self._optix.scale_geometry_xyz_c(name, x, y, z, cx, cy, cz, update)
+
+    def scale_primitive_xyz_c(self, name, idx, x, y, z, cx, cy, cz, update): return self._optix.scale_primitive_xyz_c(name, idx, x, y, z, cx, cy, cz, update)
+
     def update_geom_buffers(self, name, mask): return self._optix.update_geom_buffers(name, mask)
 
     def set_coordinates_geom(self, mode, thickness): return self._optix.set_coordinates_geom(mode, thickness)

plotoptix/bin/RnD.SharpOptiX.dll

@@ -4122,7 +4122,8 @@ def rotate_primitive(self, name: str, idx: int, rot: Tuple[float, float, float],
                 self._logger.error(msg)
                 if self._raise_on_error: raise RuntimeError(msg)
 
-    def scale_geometry(self, name: str, s: float,
+    def scale_geometry(self, name: str, s: Union[float, Tuple[float, float, float]],
+                       center: Optional[Tuple[float, float, float]] = None,
                        update: bool = True) -> None:
         """Scale all primitive's positions and sizes.
 
@@ -4136,19 +4137,44 @@ def scale_geometry(self, name: str, s: float,
         ----------
         name : string
             Name of the geometry.
-        s : float
-            Scaling factor.
+        s : float,  tuple (float, float, float)
+            Scaling factor, single value or (x, y, z) scales.
+        center : tuple (float, float, float), optional
+            Scaling center. If not provided, scaling is made w.r.t. the primitive center.
         update : bool, optional
             Update GPU buffer.
         """
         if name is None: raise ValueError()
 
-        if not self._optix.scale_geometry(name, s, update):
-            msg = "Geometry scale failed."
-            self._logger.error(msg)
-            if self._raise_on_error: raise RuntimeError(msg)
+        if isinstance(s, float) or isinstance(s, int):
+            s = float(s)
+            if center is None:
+                if not self._optix.scale_geometry(name, s, update):
+                    msg = "Geometry scale by scalar failed."
+                    self._logger.error(msg)
+                    if self._raise_on_error: raise RuntimeError(msg)
+            else:
+                if not isinstance(center, tuple): center = tuple(center)
+                if not self._optix.scale_geometry_c(name, s, center[0], center[1], center[2], update):
+                    msg = "Geometry scale by scalar w.r.t. the center failed."
+                    self._logger.error(msg)
+                    if self._raise_on_error: raise RuntimeError(msg)
+        else:
+            if not isinstance(s, tuple): s = tuple(s)
+            if center is None:
+                if not self._optix.scale_geometry_xyz(name, s[0], s[1], s[2], update):
+                    msg = "Geometry scale by vector failed."
+                    self._logger.error(msg)
+                    if self._raise_on_error: raise RuntimeError(msg)
+            else:
+                if not isinstance(center, tuple): center = tuple(center)
+                if not self._optix.scale_geometry_xyz_c(name, s[0], s[1], s[2], center[0], center[1], center[2], update):
+                    msg = "Geometry scale by vector w.r.t. the center failed."
+                    self._logger.error(msg)
+                    if self._raise_on_error: raise RuntimeError(msg)
 
-    def scale_primitive(self, name: str, idx: int, s: float,
+    def scale_primitive(self, name: str, idx: int, s: Union[float, Tuple[float, float, float]],
+                        center: Optional[Tuple[float, float, float]] = None,
                         update: bool = True) -> None:
         """Scale selected primitive.
 
@@ -4164,17 +4190,41 @@ def scale_primitive(self, name: str, idx: int, s: float,
             Name of the geometry.
         idx : int
             Primitive index.
-        s : float
-            Scaling factor.
+        s : float,  tuple (float, float, float)
+            Scaling factor, single value or (x, y, z) scales.
+        center : tuple (float, float, float), optional
+            Scaling center. If not provided, scaling is made w.r.t. the primitive center.
         update : bool, optional
             Update GPU buffer.
         """
         if name is None: raise ValueError()
 
-        if not self._optix.scale_primitive(name, idx, s, update):
-            msg = "Primitive scale failed."
-            self._logger.error(msg)
-            if self._raise_on_error: raise RuntimeError(msg)
+        if isinstance(s, float) or isinstance(s, int):
+            s = float(s)
+            if center is None:
+                if not self._optix.scale_primitive(name, idx, s, update):
+                    msg = "Primitive scale by scalar failed."
+                    self._logger.error(msg)
+                    if self._raise_on_error: raise RuntimeError(msg)
+            else:
+                if not isinstance(center, tuple): center = tuple(center)
+                if not self._optix.scale_primitive_c(name, idx, s, center[0], center[1], center[2], update):
+                    msg = "Primitive scale by scalar w.r.t. the center failed."
+                    self._logger.error(msg)
+                    if self._raise_on_error: raise RuntimeError(msg)
+        else:
+            if not isinstance(s, tuple): s = tuple(s)
+            if center is None:
+                if not self._optix.scale_primitive_xyz(name, idx, s[0], s[1], s[2], update):
+                    msg = "Primitive scale by vector failed."
+                    self._logger.error(msg)
+                    if self._raise_on_error: raise RuntimeError(msg)
+            else:
+                if not isinstance(center, tuple): center = tuple(center)
+                if not self._optix.scale_primitive_xyz_c(name, idx, s[0], s[1], s[2], center[0], center[1], center[2], update):
+                    msg = "Primitive scale by vector w.r.t. the center failed."
+                    self._logger.error(msg)
+                    if self._raise_on_error: raise RuntimeError(msg)
 
     def update_geom_buffers(self, name: str,
                             mask: Union[GeomBuffer, str] = GeomBuffer.All) -> None: