Tyler/maya27

.github/workflows/main.yml

@@ -12,7 +12,7 @@ jobs:
   compile_plugin:
     strategy:
       matrix:
-        maya: [2022, 2023, 2024, 2025, 2026]
+        maya: [2022, 2023, 2024, 2025, 2026, 2027]
         os: [macos-13, macos-latest, ubuntu-latest, windows-latest]
         include: 
           # Add the maya update versions here
@@ -26,19 +26,27 @@ jobs:
             update: 3
           - maya: 2026
             update: 2
+          - maya: 2027
+            update: 2
 
         # cross-compiling is annoying so just fall back to macos-13
         exclude: 
           - os: macos-latest
             maya: 2022
           - os: macos-latest
             maya: 2023
+          - os: macos-13
+            maya: 2022
+          - os: macos-13
+            maya: 2023
           - os: macos-13
             maya: 2024
           - os: macos-13
             maya: 2025
           - os: macos-13
             maya: 2026
+          - os: macos-13
+            maya: 2027
 
       fail-fast: false
 

meson.build

@@ -17,22 +17,34 @@ project(
 
 maya_build = get_option('maya_build')
 python_build = get_option('python_build')
+imath_bridge_build = get_option('imath_bridge_build')
 
-if not maya_build and not python_build
+if not maya_build and not python_build and not imath_bridge_build
   error('No builds requested')
 endif
 
 conf_data = configuration_data()
 conf_data.set('VCS_TAG', meson.project_version())
 
-subdir('src/simplexlib')
-if maya_build
-  maya_dep = dependency('maya')
-  maya_name_suffix = maya_dep.get_variable('name_suffix')
-  maya_version = maya_dep.get_variable('maya_version')
-  subdir('src/maya')
+
+if maya_build or imath_bridge_build
+  subproject('maya')
+endif
+
+if imath_bridge_build
+  subdir('src/imathbridge')
 endif
 
-if python_build
-  subdir('src/python')
+if maya_build or python_build
+  subdir('src/simplexlib')
+  if maya_build
+    subdir('src/maya')
+  endif
+
+  if python_build
+    subdir('src/python')
+  endif
 endif
+
+
+

meson.options

@@ -1,4 +1,5 @@
 option('maya_build', type : 'boolean', value : true)
 option('python_build', type : 'boolean', value : true)
+option('imath_bridge_build', type : 'boolean', value : false)
 option('python_wheel_build', type : 'boolean', value : false)
 option('python_script_build', type : 'boolean', value : false)

quick_compile.bat

@@ -1,6 +1,6 @@
 setlocal
 
-SET MAYA_VERSION=2024
+SET MAYA_VERSION=2027
 REM "vs" "ninja"
 REM use VS for the debugger, otherwise use NINJA
 REM Until I figure out how to debug using nvim
@@ -13,8 +13,8 @@ if not exist %BUILDDIR%\ (
     meson setup %BUILDDIR% ^
     -Dmaya:maya_version=%MAYA_VERSION% ^
     -Dmaya_build=true ^
-    -Dpython_build=false  ^
-    -Dpython_script_build=false  ^
+    -Dpython_build=true  ^
+    -Dpython_script_build=true  ^
     --buildtype %BUILDTYPE% --vsenv --backend %BACKEND%
 )
 

src/maya/meson.build

@@ -1,6 +1,7 @@
-maya_dep = dependency('maya')
-maya_name_suffix = maya_dep.get_variable('name_suffix')
-maya_version = maya_dep.get_variable('maya_version')
+maya_plugin_dep = dependency('maya-plugin')
+maya_core_dep = dependency('maya-core')
+maya_name_suffix = maya_plugin_dep.get_variable('name_suffix')
+maya_version = maya_core_dep.get_variable('maya_version')
 
 simplex_maya_files = files([
     'src/basicBlendShape.cpp',
@@ -29,7 +30,7 @@ simplex_maya = shared_library(
   install: true,
   install_dir : meson.global_source_root() / 'output_Maya' + maya_version,
   include_directories : simplex_maya_inc,
-  dependencies : [maya_dep, simplexlib_dep],
+  dependencies : [maya_core_dep, maya_plugin_dep, simplexlib_dep],
   name_prefix : '',
   name_suffix : maya_name_suffix,
 )

src/python/pysimplex.cpp

@@ -1,30 +1,29 @@
 #include <Python.h>
 #include <structmember.h>
 
-#include "simplex.h"
-#include <string>
 #include <codecvt>
-#include <vector>
 #include <locale>
+#include <string>
+#include <vector>
+
+#include "simplex.h"
 
 typedef struct {
-    PyObject_HEAD // No Semicolon for this Macro;
-    PyObject *definition;
-    simplex::Simplex *sPointer;
+    PyObject_HEAD  // No Semicolon for this Macro;
+        PyObject* definition;
+    simplex::Simplex* sPointer;
 } PySimplex;
 
-static void
-PySimplex_dealloc(PySimplex* self) {
+static void PySimplex_dealloc(PySimplex* self) {
     Py_XDECREF(self->definition);
-    if (self->sPointer != NULL)
-		delete self->sPointer;
+    if (self->sPointer != NULL) {
+        delete self->sPointer;
+    }
     PyObject_Del(self);
 }
 
-static PyObject *
-PySimplex_new(PyTypeObject *type, PyObject *args, PyObject *kwds) {
-
-    PySimplex *self = PyObject_New(PySimplex, type);
+static PyObject* PySimplex_new(PyTypeObject* type, PyObject* args, PyObject* kwds) {
+    PySimplex* self = PyObject_New(PySimplex, type);
     if (self != NULL) {
         self->definition = PyUnicode_FromString("");
         if (self->definition == NULL) {
@@ -34,27 +33,25 @@ PySimplex_new(PyTypeObject *type, PyObject *args, PyObject *kwds) {
         self->sPointer = new simplex::Simplex();
     }
 
-    return (PyObject *)self;
+    return (PyObject*)self;
 }
 
-static PyObject *
-PySimplex_getdefinition(PySimplex* self, void* closure){
+static PyObject* PySimplex_getdefinition(PySimplex* self, void* closure) {
     Py_INCREF(self->definition);
     return self->definition;
 }
 
-static int
-PySimplex_setdefinition(PySimplex* self, PyObject* jsValue, void* closure){
-    if (jsValue == NULL || jsValue == Py_None){
+static int PySimplex_setdefinition(PySimplex* self, PyObject* jsValue, void* closure) {
+    if (jsValue == NULL || jsValue == Py_None) {
         jsValue = PyUnicode_FromString("");
     }
 
-    if (! PyUnicode_Check(jsValue)) {
+    if (!PyUnicode_Check(jsValue)) {
         PyErr_SetString(PyExc_TypeError, "The simplex definition must be a string");
         return -1;
     }
 
-    PyObject *tmp = self->definition;
+    PyObject* tmp = self->definition;
     Py_INCREF(jsValue);
     self->definition = jsValue;
     Py_DECREF(tmp);
@@ -72,18 +69,16 @@ PySimplex_setdefinition(PySimplex* self, PyObject* jsValue, void* closure){
     return 0;
 }
 
-static PyObject *
-PySimplex_getexactsolve(PySimplex* self, void* closure){
-    if (self->sPointer->getExactSolve()){
+static PyObject* PySimplex_getexactsolve(PySimplex* self, void* closure) {
+    if (self->sPointer->getExactSolve()) {
         Py_RETURN_TRUE;
     }
     Py_RETURN_FALSE;
 }
 
-static int
-PySimplex_setexactsolve(PySimplex* self, PyObject* exact, void* closure){
+static int PySimplex_setexactsolve(PySimplex* self, PyObject* exact, void* closure) {
     int truthy = PyObject_IsTrue(exact);
-    if (truthy == -1){
+    if (truthy == -1) {
         PyErr_SetString(PyExc_TypeError, "The value passed cannot be cast to boolean");
         return -1;
     }
@@ -92,77 +87,69 @@ PySimplex_setexactsolve(PySimplex* self, PyObject* exact, void* closure){
     return 0;
 }
 
-static int
-PySimplex_init(PySimplex *self, PyObject *args, PyObject *kwds) {
-    PyObject *jsValue=NULL, *tmp=NULL;
+static int PySimplex_init(PySimplex* self, PyObject* args, PyObject* kwds) {
+    PyObject *jsValue = NULL, *tmp = NULL;
 
     char jsValueLiteral[] = "jsValue";
-    static char *kwlist[] = {jsValueLiteral, NULL};
+    static char* kwlist[] = {jsValueLiteral, NULL};
 
-    if (! PyArg_ParseTupleAndKeywords(args, kwds, "|O", kwlist, &jsValue))
+    if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O", kwlist, &jsValue)) {
         return -1;
+    }
 
     return PySimplex_setdefinition(self, jsValue, NULL);
 }
 
-static PyObject *
-PySimplex_solve(PySimplex* self, PyObject* vec){
-    if (! PySequence_Check(vec)){
+static PyObject* PySimplex_solve(PySimplex* self, PyObject* vec) {
+    if (!PySequence_Check(vec)) {
         PyErr_SetString(PyExc_TypeError, "Input must be a list or tuple");
         return NULL;
     }
 
-    PyObject *item;
+    PyObject* item;
     std::vector<double> stdVec, outVec;
-    for (Py_ssize_t i=0; i<PySequence_Size(vec); ++i){
+    for (Py_ssize_t i = 0; i < PySequence_Size(vec); ++i) {
         item = PySequence_GetItem(vec, i);
-        if (! PyNumber_Check(item)) {
+        if (!PyNumber_Check(item)) {
             PyErr_SetString(PyExc_TypeError, "Input list can contain only numbers");
             return NULL;
         }
         stdVec.push_back(PyFloat_AsDouble(PyNumber_Float(item)));
         Py_DECREF(item);
     }
 
-	self->sPointer->clearValues();
+    self->sPointer->clearValues();
     outVec = self->sPointer->solve(stdVec);
 
-    PyObject *out = PyList_New(outVec.size());
-    for (size_t i=0; i<outVec.size(); ++i){
+    PyObject* out = PyList_New(outVec.size());
+    for (size_t i = 0; i < outVec.size(); ++i) {
         PyList_SetItem(out, i, PyFloat_FromDouble(outVec[i]));
     }
     return out;
 }
 
 static PyGetSetDef PySimplex_getseters[] = {
-    {(char*)"definition",
-     (getter)PySimplex_getdefinition, (setter)PySimplex_setdefinition,
-     (char*)"Simplex structure definition string",
-     NULL},
-
-    {(char*)"exactSolve",
-     (getter)PySimplex_getexactsolve, (setter)PySimplex_setexactsolve,
-     (char*)"Run the solve with the exact min() solver",
-     NULL},
+    {(char*)"definition", (getter)PySimplex_getdefinition, (setter)PySimplex_setdefinition,
+     (char*)"Simplex structure definition string", NULL},
+
+    {(char*)"exactSolve", (getter)PySimplex_getexactsolve, (setter)PySimplex_setexactsolve,
+     (char*)"Run the solve with the exact min() solver", NULL},
     {NULL}  // Sentinel
 };
 
 static PyMethodDef PySimplex_methods[] = {
     {(char*)"solve", (PyCFunction)PySimplex_solve, METH_O,
-     (char*)"Supply an input list to the solver, and recieve and output list"
-    },
+     (char*)"Supply an input list to the solver, and recieve and output list"},
     {NULL}  // Sentinel
 };
 
-
-
 static PyType_Slot PySimplexType_Slots[] = {
-    {Py_tp_methods, PySimplex_methods},
-    {Py_tp_getset, PySimplex_getseters},
-    {Py_tp_init, (void*)PySimplex_init},
-    {Py_tp_new, (void*)PySimplex_new},
+    {Py_tp_methods,        PySimplex_methods},
+    { Py_tp_getset,      PySimplex_getseters},
+    {   Py_tp_init,    (void*)PySimplex_init},
+    {    Py_tp_new,     (void*)PySimplex_new},
     {Py_tp_dealloc, (void*)PySimplex_dealloc},
-    {0, 0},  // Sentinel
+    {            0,                        0}, // Sentinel
 };
 
 static PyType_Spec PySimplexType_Spec = {
@@ -172,8 +159,6 @@ static PyType_Spec PySimplexType_Spec = {
     .slots = PySimplexType_Slots,
 };
 
-
-
 static int PySimplexModule_exec(PyObject* module) {
     PyObject* pysimplex_type;
 
@@ -193,13 +178,11 @@ static int PySimplexModule_exec(PyObject* module) {
     return 0;
 }
 
-
 static PyModuleDef_Slot PySimplexModule_Slots[] = {
     {Py_mod_exec, (void*)PySimplexModule_exec},
-    {0, NULL},
+    {          0,                        NULL},
 };
 
-
 static PyModuleDef PySimplexModuleDef = {
     .m_base = PyModuleDef_HEAD_INIT,
     .m_name = "pysimplex",
@@ -209,20 +192,4 @@ static PyModuleDef PySimplexModuleDef = {
     .m_slots = PySimplexModule_Slots,
 };
 
-
-PyMODINIT_FUNC PyInit_pysimplex(void) {
-
-    return PyModuleDef_Init(&PySimplexModuleDef);
-}
-
-
-
-
-
-
-
-
-
-
-
-
+PyMODINIT_FUNC PyInit_pysimplex(void) { return PyModuleDef_Init(&PySimplexModuleDef); }