Skip to content

Commit

Permalink
improve effects on windows
Browse files Browse the repository at this point in the history
  • Loading branch information
xianfei committed Apr 11, 2024
1 parent 4b16aa4 commit ad99c3b
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 51 deletions.
31 changes: 3 additions & 28 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,25 +65,9 @@ if (

// Modules to control application life and create native browser window

var blurBrowserWindow;
const electronRemoteMain = require("@electron/remote/main");
electronRemoteMain.initialize();

var isWin11;

// Enable Acrylic Effect on Windows by default
if (platform === "win32")
try {
const mica_electron = require('mica-electron')
blurBrowserWindow = mica_electron.MicaBrowserWindow;
isWin11 = mica_electron.IS_WINDOWS_11
} catch (e) {
console.log(e)
blurBrowserWindow = BrowserWindow;
}
// if not on Windows, use electron window
else blurBrowserWindow = BrowserWindow;

global.storagePath = { jsonPath: storage.getStoragePath() };
global.appInfo = { appVersion: app.getVersion(), appName: app.getName() };

Expand Down Expand Up @@ -291,20 +275,16 @@ function createWindow() {

function createModelViewerWindow(args) {
// console.log(screen.getPrimaryDisplay().scaleFactor)
if (args.useGlass && platform === "win32" && isWin11!==null) {
if(!isWin11) args.useGlass = false;
}
// Create the browser window.
var myBrowserWindow = BrowserWindow;
var addtionalArgs = { backgroundColor: "#eee" };
if (args.useGlass) {
myBrowserWindow = blurBrowserWindow;
addtionalArgs = {
vibrancy: 'hud',
backgroundMaterial: 'acrylic',
backgroundColor: "#00000000",
};
}
var viewer = new myBrowserWindow({
var viewer = new BrowserWindow({
titleBarStyle: platform === "darwin" ? "hiddenInset" : "hidden",
autoHideMenuBar: true,
fullscreenable: false,
Expand All @@ -329,14 +309,9 @@ function createModelViewerWindow(args) {
viewer.loadURL('about:blank')
electronRemoteMain.enable(viewer.webContents);

if (args.useGlass && platform === "win32" && isWin11!==null) {
if(isWin11) viewer.setMicaAcrylicEffect(); // Acrylic for windows 11
}

viewer.webContents.once('dom-ready', () => {
viewer.show();
viewer.loadFile("modelview/modelview.html");
if (args.useGlass&&isWin11) viewer.setSize(820*screen.getPrimaryDisplay().scaleFactor,540*screen.getPrimaryDisplay().scaleFactor)
});

// Open the DevTools.
Expand Down Expand Up @@ -398,7 +373,7 @@ function createPdfViewerWindow(args) {

function createGpuInfoWindow() {
// Create the browser window.
var viewer = new blurBrowserWindow({
var viewer = new BrowserWindow({
width: 1000,
height: 600,
title: "GPU Info",
Expand Down
50 changes: 33 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "sysmocap",
"version": "0.6.7",
"version": "0.6.8",
"description": "Video-based motion capture system.",
"main": "main.js",
"scripts": {
"start": "electron .",
"package:mac64": "electron-packager ./ SysMocap --icon=icons/sysmocap.icns --platform=darwin --arch=x64 --out ./OutApp --overwrite --usage-description.Camera='该程序需要摄像头权限' --electronVersion 26.4.1 --asar",
"package:macarm": "electron-packager ./ SysMocap --icon=icons/sysmocap.icns --platform=darwin --arch=arm64 --out ./OutApp --overwrite --usage-description.Camera='该程序需要摄像头权限' --electronVersion 26.4.1 --asar",
"package:win64": "electron-packager ./ SysMocap --icon=icons/sysmocap.ico --platform=win32 --arch=x64 --out ./OutApp --overwrite --electronVersion 26.4.1 --asar",
"package:mac64": "electron-packager ./ SysMocap --icon=icons/sysmocap.icns --platform=darwin --arch=x64 --out ./OutApp --overwrite --usage-description.Camera='该程序需要摄像头权限' --electronVersion 29.3.0 --asar",
"package:macarm": "electron-packager ./ SysMocap --icon=icons/sysmocap.icns --platform=darwin --arch=arm64 --out ./OutApp --overwrite --usage-description.Camera='该程序需要摄像头权限' --electronVersion 29.3.0 --asar",
"package:win64": "electron-packager ./ SysMocap --icon=icons/sysmocap.ico --platform=win32 --arch=x64 --out ./OutApp --overwrite --electronVersion 29.3.0 --asar",
"zip:win64": "electron-installer-zip ./OutApp/SysMocap-win32-x64/ ./OutApp/packages/SysMocap-Windows-x64.zip --overwrite",
"zip:mac64": "electron-installer-zip ./OutApp/SysMocap-darwin-x64/ ./OutApp/packages/SysMocap-macOS-x64.zip --overwrite",
"dmg": "electron-installer-dmg ./OutApp/SysMocap-darwin-x64/SysMocap.app SysMocap-macOS-x64 --out ./OutApp/packages/ --overwrite",
Expand All @@ -30,15 +30,14 @@
"kalidokit": "^1.1.5",
"lil-gui": "^0.16.1",
"mdui": "^1.0.2",
"mica-electron": "^1.5.1",
"pdfjs-dist": "^2.13.216",
"socket.io": "^4.5.3",
"svelte-jsoneditor": "^0.3.60",
"three": "^0.137.4",
"vue": "^2.7.14"
},
"devDependencies": {
"electron": "^26.4.1",
"electron": "^29.3.0",
"electron-installer-dmg": "^4.0.0",
"electron-installer-zip": "^0.1.2",
"electron-packager": "^17.1.1"
Expand Down

0 comments on commit ad99c3b

Please sign in to comment.