using dds

.gitignore

@@ -2,6 +2,7 @@
 *.mo
 *.bam
 *.txo
+*.dds
 built/
 build/
 venv/

SConstruct

@@ -136,7 +136,7 @@ general_src = files(extensions, ['venv', 'thirdparty']) + img_files + \
     lang_src + tracks_tgt_fnames()
 no_int = args['nointernet']
 if args['images']:
-    env.images(img_files, files(['psd']))
+    env.images(img_files, files(['psd', 'jpg', 'png'], ['models'], ['_png.png']))
 if args['tracks']:
     env.tracks(tracks_tgt_fnames(), files(['egg']))
 if args['p3d']:

project.py

@@ -17,34 +17,24 @@
 # (Panda3D 1.10) preload weapons
 # (Panda3D 1.10) #shaders shadows
 #     https://www.panda3d.org/forums/viewtopic.php?f=8&t=18798
+# hardware instancing (gl_InstanceID requires 1.40)
 
 
 # MAYBE/SOMEDAY =====
 
-# use txo files in place of png and jpg
 # ai: only one (rotated) ray for obstacles and ground
 # contour detection
-# more power for the drifting; the length of the inertia+engine should not
-#  be bigger than max engine's force
-# apply drifting force during the drifting
-# preloading shaders by creating cards, applying shaders and call render_frame
-# 3D audio (from player's car)
-# refactor: notify done by evt (from mdt externally);
-#   Colleague.notify invokes that; GO's attach redirected to evt;
-#   only evt is a Subject
-# refactor: don't share eng with every colleague, instead share only the
-#   useful components e.g. PhysComponent has PhysComponent.phys_mgr and
-#   PhysComponent.log_mgr
-# remove mdt from colleague
 # change/improve linux installer
+# the length of the inertia+engine shouldn't be bigger than max engine's force
 # make scons for yyagl
 # embed into a wx / pyqt window
 # port to python 3
-# deferred shading, tone mapping
-# hardware instancing
-# multi-threading physics loading
-# make uml diagrams with pyreverse into devinfo
 # unit tests
 # django webapp for scores
-# particles: presize and use the Python buffer protocol
-# particles: use images in place of points
+# refactor: notify done by evt (from mdt externally);
+#   Colleague.notify invokes that; GO's attach redirected to evt;
+#   only evt is a Subject
+# refactor: don't share eng with every colleague, instead share only the
+#   useful components e.g. PhysComponent has PhysComponent.phys_mgr and
+#   PhysComponent.log_mgr
+# refactor: remove mdt from colleague

yorg/fsm.py

@@ -27,7 +27,7 @@ def enterMenu(self):
         menu_props = MenuProps(
             self.mdt.gameprops, self.mdt.options,
             self.mdt.options['development']['multiplayer'],
-            'assets/images/gui/yorg_title.png',
+            'assets/images/gui/yorg_title.dds',
             'http://feeds.feedburner.com/ya2tech?format=xml',
             'http://www.ya2.it', 'save' in self.mdt.options.dct,
             'http://www.ya2.it/support-us')

yorg/logic.py

@@ -54,9 +54,9 @@ def __season_props(
             cars = gameprops.cars_names[:int(cars_number)]
         return SeasonProps(
             gameprops, cars, car, drivers,
-            ['assets/images/tuning/engine.png',
-             'assets/images/tuning/tires.png',
-             'assets/images/tuning/suspensions.png'],
+            ['assets/images/tuning/engine.dds',
+             'assets/images/tuning/tires.dds',
+             'assets/images/tuning/suspensions.dds'],
             'assets/fonts/Hanken-Book.ttf',
             'assets/sfx/countdown.ogg', single_race, wpn2img, tun_engine,
             tun_tires, tun_suspensions, race_start_time, countdown_seconds)
@@ -224,8 +224,8 @@ def build_race_props(self, drivers, track_name, keys, joystick,
             WeaponInfo('Weaponboxs', 'EmptyWeaponboxAnim'), 'Start',
             track_name, 'tracks/' + track_name, 'track', 'Empty', 'Anim',
             'omni', self.sign_cb, 'EmptyNameBillboard4Anim',
-            'assets/images/minimaps/%s.png' % track_name,
-            'assets/images/minimaps/car_handle.png', carname2color, camera_vec,
+            'assets/images/minimaps/%s.dds' % track_name,
+            'assets/images/minimaps/car_handle.dds', carname2color, camera_vec,
             shadow_src, laps_num, 'assets/models/weapons/rocket/RocketAnim',
             'assets/models/weapons/turbo/TurboAnim',
             'assets/models/weapons/turn/TurnAnim',

yorg/yorg.py

@@ -73,7 +73,7 @@ def __init__(self):
             shaders_dev=opt_dev['shaders_dev'], gamma=opt_dev['gamma'],
             menu_joypad=opt_dev['menu_joypad'],
             lang=self.options['settings']['lang'], lang_domain='yorg',
-            cursor_path='assets/images/gui/cursor.png',
+            cursor_path='assets/images/gui/cursor.dds',
             cursor_scale=((256/352.0) * .08, 1, .08), cursor_hotspot=(.1, .06),
             volume=self.options['settings']['volume'],
             profiling=opt_dev['profiling'],
@@ -87,9 +87,9 @@ def __init__(self):
         menu_args = MenuArgs(
             'assets/fonts/Hanken-Book.ttf', (.75, .75, .25, 1),
             (.75, .75, .75, 1), (.75, .25, .25, 1), .1, (-4.6, 4.6, -.32, .88),
-            (0, 0, 0, .2), 'assets/images/gui/menu_background.jpg',
+            (0, 0, 0, .2), 'assets/images/gui/menu_background.dds',
             'assets/sfx/menu_over.wav', 'assets/sfx/menu_clicked.ogg',
-            'assets/images/icons/%s_png.png')
+            'assets/images/icons/%s.dds')
         cars_names = ['themis', 'kronos', 'diones', 'iapeto', 'phoibe', 'rea',
                       'iperion', 'teia']
         DriverPaths = namedtuple('DriverPaths', 'path path_sel')
@@ -108,12 +108,12 @@ def __init__(self):
             ['desert', 'mountain', 'amusement', 'countryside'],
             lambda: [_('desert'), _('mountain'), _('amusement park'),
                      _('countryside')],
-            'assets/images/tracks/%s.png',
+            'assets/images/tracks/%s.dds',
             self.options['settings']['player_name'],
-            DriverPaths('assets/images/drivers/driver%s.png',
-                        'assets/images/drivers/driver%s_sel.png'),
-            'assets/images/cars/%s_sel.png',
-            'assets/images/cars/%s.png',
+            DriverPaths('assets/images/drivers/driver%s.dds',
+                        'assets/images/drivers/driver%s_sel.dds'),
+            'assets/images/cars/%s_sel.dds',
+            'assets/images/cars/%s.dds',
             self.eng.curr_path + 'assets/models/cars/%s/phys.yml',
             'assets/models/cars/%s/car',
             damage_info, wheel_gfx_names,)