Added support for DAE models.

Author: agarny

CMakeLists.txt

@@ -10,7 +10,15 @@ endforeach()
 
 # Project details.
 
-project(libOpenCOR VERSION 0.20260302.0)
+project(libOpenCOR)
+
+# Retrieve the version of libOpenCOR.
+
+file(READ ${CMAKE_CURRENT_SOURCE_DIR}/src/renderer/package.json RENDERER_PACKAGE_JSON)
+
+string(REGEX MATCH "\"libopencorVersion\"[ \t]*:[ \t]*\"([^\"]+)\"" LIBOPENCOR_VERSION_MATCH ${RENDERER_PACKAGE_JSON})
+
+set(LIBOPENCOR_VERSION ${CMAKE_MATCH_1})
 
 # Enable C++20.
 
@@ -57,10 +65,10 @@ else()
     endif()
 endif()
 
-set(LIBOPENCOR_FILE_NAME_WE ${CMAKE_PROJECT_NAME}-${PROJECT_VERSION}${PLATFORM}${ARCHITECTURE}-Static${MODE})
+set(LIBOPENCOR_FILE_NAME_WE ${CMAKE_PROJECT_NAME}-${LIBOPENCOR_VERSION}${PLATFORM}${ARCHITECTURE}-Static${MODE})
 set(LIBOPENCOR_FILE_NAME ${LIBOPENCOR_FILE_NAME_WE}${EXTENSION})
 
-file(DOWNLOAD https://github.com/opencor/libopencor/releases/download/v${PROJECT_VERSION}/${LIBOPENCOR_FILE_NAME}
+file(DOWNLOAD https://github.com/opencor/libopencor/releases/download/v${LIBOPENCOR_VERSION}/${LIBOPENCOR_FILE_NAME}
               ${CMAKE_BINARY_DIR}/${LIBOPENCOR_FILE_NAME})
 
 execute_process(COMMAND ${CMAKE_COMMAND} -E tar xvf ${CMAKE_BINARY_DIR}/${LIBOPENCOR_FILE_NAME}

bun.lock

@@ -9,6 +9,8 @@ import path from 'node:path';
 import vitePlugin from 'unplugin-vue-components/vite';
 import { visualizer as visualizerPlugin } from 'rollup-plugin-visualizer';
 
+import { libopencorVersion } from './src/renderer/scripts/libopencor.version';
+
 export default electronVite.defineConfig({
   main: {
     build: {
@@ -27,6 +29,9 @@ export default electronVite.defineConfig({
     build: {
       target: 'esnext'
     },
+    define: {
+      __LIBOPENCOR_VERSION__: JSON.stringify(libopencorVersion)
+    },
     envDir: path.join(import.meta.dirname, 'src/renderer'),
     plugins: [
       // Note: this must be in sync with src/renderer/vite.config.ts.

electron.vite.config.ts

@@ -23,7 +23,7 @@
     "url": "git+https://github.com/opencor/webapp.git"
   },
   "type": "module",
-  "version": "0.20260528.0",
+  "version": "0.20260528.1",
   "engines": {
     "bun": ">=1.2.0"
   },

package.json

@@ -42,7 +42,8 @@
     },
     "./style.css": "./dist/opencor.css"
   },
-  "version": "0.20260528.0",
+  "version": "0.20260528.1",
+  "libopencorVersion": "0.20260528.0",
   "scripts": {
     "build": "vite build && bun scripts/generate.version.js",
     "build:lib": "vite build --config vite.lib.config.ts && bunx --bun vue-tsc --project tsconfig.lib.types.json",

src/renderer/package.json

@@ -0,0 +1,15 @@
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+
+type RendererPackageJson = {
+  libopencorVersion: string;
+};
+
+const rendererPackageJsonPath = [
+  path.resolve(process.cwd(), 'src/renderer/package.json'),
+  path.join(import.meta.dirname, '..', 'package.json')
+].find((candidatePath) => fs.existsSync(candidatePath));
+
+const rendererPackageJson = JSON.parse(fs.readFileSync(rendererPackageJsonPath, 'utf8')) as RendererPackageJson;
+
+export const libopencorVersion = rendererPackageJson.libopencorVersion;

src/renderer/scripts/libopencor.version.ts

@@ -69,7 +69,7 @@ export const initialiseLocApi = async (): Promise<void> => {
   } else {
     // We are running OpenCOR's Web app, so we must import libOpenCOR's WebAssembly module.
 
-    const libopencorVersion = '0.20260416.0';
+    const libopencorVersion = __LIBOPENCOR_VERSION__;
 
     try {
       const libOpenCOR = (

src/renderer/src/common/initialisation.ts

@@ -1,6 +1,8 @@
 // TypeScript shims for Vite-style imports.
 // Note: `vue-tsc` needs to know how to treat `.vue` files and Vite-style asset imports.
 
+declare const __LIBOPENCOR_VERSION__: string;
+
 declare module '*.vue' {
   const component: import('vue').DefineComponent<Record<string, unknown>, Record<string, unknown>, unknown>;
 

src/renderer/src/types/shims.d.ts

@@ -9,6 +9,8 @@ import vitePlugin from 'unplugin-vue-components/vite';
 import { visualizer as visualizerPlugin } from 'rollup-plugin-visualizer';
 import * as vite from 'vite';
 
+import { libopencorVersion } from './scripts/libopencor.version';
+
 export default vite.defineConfig({
   base: './',
   build: {
@@ -22,6 +24,9 @@ export default vite.defineConfig({
     },
     target: 'esnext'
   },
+  define: {
+    __LIBOPENCOR_VERSION__: JSON.stringify(libopencorVersion)
+  },
   plugins: [
     // Note: this must be in sync with electron.vite.config.ts.