icon

diff --git a/assets/icon/icon1024.png b/assets/icon/icon1024.png
new file mode 100644 (file)
index 0000000..0f84b83
Binary files /dev/null and b/assets/icon/icon1024.png differ

diff --git a/assets/icon/icon128.png b/assets/icon/icon128.png
new file mode 100644 (file)
index 0000000..26d8f21
Binary files /dev/null and b/assets/icon/icon128.png differ

diff --git a/assets/icon/icon16.png b/assets/icon/icon16.png
new file mode 100644 (file)
index 0000000..cb9cf89
Binary files /dev/null and b/assets/icon/icon16.png differ

diff --git a/assets/icon/icon256.png b/assets/icon/icon256.png
new file mode 100644 (file)
index 0000000..be49182
Binary files /dev/null and b/assets/icon/icon256.png differ

diff --git a/assets/icon/icon32.png b/assets/icon/icon32.png
new file mode 100644 (file)
index 0000000..18c07c3
Binary files /dev/null and b/assets/icon/icon32.png differ

diff --git a/assets/icon/icon48.png b/assets/icon/icon48.png
new file mode 100644 (file)
index 0000000..b6833f3
Binary files /dev/null and b/assets/icon/icon48.png differ

diff --git a/assets/icon/icon512.png b/assets/icon/icon512.png
new file mode 100644 (file)
index 0000000..37b59cf
Binary files /dev/null and b/assets/icon/icon512.png differ

diff --git a/assets/icon/pmachines.ico b/assets/icon/pmachines.ico
new file mode 100644 (file)
index 0000000..972c346
Binary files /dev/null and b/assets/icon/pmachines.ico differ

diff --git a/pmachines/menu.py b/pmachines/menu.py
index 5ad3d4089cf07142a0a6064245df831ab815dc96..953c063edadb30d0b774ed0af8727903bc9ea559 100644 (file)
--- a/pmachines/menu.py
+++ b/pmachines/menu.py
@@ -1,4 +1,4 @@
-from logging import info
+from logging import info, debug
 from sys import platform, exit
 from os import environ, system
 from webbrowser import open_new_tab
@@ -202,13 +202,13 @@ class Menu:
 
     def on_aa(self, arg):
         self._pipeline.msaa_samples = 4 if arg else 1
-        info(f'msaa: {self._pipeline.msaa_samples}')
+        debug(f'msaa: {self._pipeline.msaa_samples}')
         self._opt_file['settings']['antialiasing'] = int(arg)
         self._opt_file.store()
 
     def on_shadows(self, arg):
         self._pipeline.enable_shadows = int(arg)
-        info(f'shadows: {self._pipeline.enable_shadows}')
+        debug(f'shadows: {self._pipeline.enable_shadows}')
         self._opt_file['settings']['shadows'] = int(arg)
         self._opt_file.store()
 

diff --git a/pmachines/pmachines.py b/pmachines/pmachines.py
index 552922232ddb36bde32ce9b86b6444cac77e24a5..6454d63d24560891348c97b66a3d6e94ab6ea17b 100755 (executable)
--- a/pmachines/pmachines.py
+++ b/pmachines/pmachines.py
@@ -2,7 +2,7 @@ import argparse
 import simplepbr
 import gltf
 from sys import platform, argv
-from logging import info
+from logging import info, debug
 from os.path import exists
 from os import makedirs
 from panda3d.core import Filename, load_prc_file_data, AntialiasAttrib, \
@@ -146,6 +146,7 @@ class Pmachines:
         props = WindowProperties()
         props.set_size(res)
         props.set_fullscreen(self._options['settings']['fullscreen'])
+        props.set_icon_filename('assets/icon/pmachines.ico')
         base.win.request_properties(props)
         gltf.patch_loader(base.loader)
         if self._options['development']['simplepbr']:
@@ -155,8 +156,8 @@ class Pmachines:
                 use_occlusion_maps=True,
                 msaa_samples=4 if self._options['settings']['antialiasing'] else 1,
                 enable_shadows=int(self._options['settings']['shadows']))
-            info(f'msaa: {self._pipeline.msaa_samples}')
-            info(f'shadows: {self._pipeline.enable_shadows}')
+            debug(f'msaa: {self._pipeline.msaa_samples}')
+            debug(f'shadows: {self._pipeline.enable_shadows}')
         render.setAntialias(AntialiasAttrib.MAuto)
         self.base.set_background_color(0, 0, 0, 1)
         self.base.disable_mouse()

diff --git a/prj.org b/prj.org
index 25fd7dfab648c866e2bbf0dff881f8b54f9ee883..9be78b10c05838ce26ec269e6cd65ca7f065dadf 100644 (file)
--- a/prj.org
+++ b/prj.org
@@ -1,6 +1,5 @@
 * issues
 * todo
-** window icon
 ** srgb textures
 ** glitch when dragging with shadows
 *** try excluding the highlight model

diff --git a/setup.py b/setup.py
index 7c2b8cfba1d574197dee13706fa9d47dfa3f9ae0..f04d8f14a0b7721abde225c3e4fe7c1dd1dc761e 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -181,6 +181,13 @@ if __name__ == '__main__':
                         'assets/images/icon/icon48_png.png',
                         'assets/images/icon/icon32_png.png',
                         'assets/images/icon/icon16_png.png']},
+                'icons': {
+                    appname: [
+                        'assets/icon/icon256.png',
+                        'assets/icon/icon128.png',
+                        'assets/icon/icon48.png',
+                        'assets/icon/icon32.png',
+                        'assets/icon/icon16.png']},
                 'include_patterns': [
                     '**/lib/licenses/*',
                     '**/licenses/*',