Skip to content
Permalink
Browse files
using txo files in place of dds ones
  • Loading branch information
cflavio committed Oct 24, 2017
1 parent 38e57e6 commit 650658ffc2e4272b6f9b4313621cdb5a9c1c7df0
Showing with 16 additions and 18 deletions.
  1. +0 −1 .gitignore
  2. +1 −2 README.md
  3. +1 −1 yorg/fsm.py
  4. +5 −5 yorg/logic.py
  5. +8 −8 yorg/yorg.py
  6. +1 −1 yyagl
@@ -2,7 +2,6 @@
*.mo
*.bam
*.txo
*.dds
built/
build/
venv/
@@ -20,7 +20,6 @@ In order to create a build you should specify the target OS (`windows`, `osx`, `
Prerequisites for building:
* Panda3D;
* SConstruct;
* ImageMagick;
* nvidia texture tools (specifically, `nvcompress` is used for creating DDS files).
* ImageMagick.

[![Bountysource Raised](https://www.bountysource.com/badge/team?team_id=213581&style=raised)](https://salt.bountysource.com/teams/ya2)
@@ -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.dds',
'assets/images/gui/yorg_title.txo',
'http://feeds.feedburner.com/ya2tech?format=xml',
'http://www.ya2.it', 'save' in self.mdt.options.dct,
'http://www.ya2.it/support-us')
@@ -54,9 +54,9 @@ def __season_props(
cars = gameprops.cars_names[:int(cars_number)]
return SeasonProps(
gameprops, cars, car, player_car_names, drivers,
['assets/images/tuning/engine.dds',
'assets/images/tuning/tires.dds',
'assets/images/tuning/suspensions.dds'],
['assets/images/tuning/engine.txo',
'assets/images/tuning/tires.txo',
'assets/images/tuning/suspensions.txo'],
'assets/fonts/Hanken-Book.ttf',
'assets/sfx/countdown.ogg', single_race, wpn2img, tun_engine,
tun_tires, tun_suspensions, race_start_time, countdown_seconds)
@@ -246,8 +246,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.dds' % track_name,
'assets/images/minimaps/car_handle.dds', carname2color, camera_vec,
'assets/images/minimaps/%s.txo' % track_name,
'assets/images/minimaps/car_handle.txo', carname2color, camera_vec,
shadow_src, laps_num, 'assets/models/weapons/rocket/RocketAnim',
'assets/models/weapons/turbo/TurboAnim',
'assets/models/weapons/turn/TurnAnim',
@@ -73,7 +73,7 @@ def __init__(self):
pyprof_percall=opt_dev['pyprof_percall'])
lang_cfg = LangCfg(lang=self.options['settings']['lang'],
lang_domain='yorg', languages=['English', 'Italiano'])
cursor_cfg = CursorCfg(cursor_path='assets/images/gui/cursor.dds',
cursor_cfg = CursorCfg(cursor_path='assets/images/gui/cursor.txo',
cursor_scale=((256/352.0) * .08, 1, .08),
cursor_hotspot=(.1, .06))
dev_cfg = DevCfg(mt_render=opt_dev['multithreaded_render'],
@@ -88,9 +88,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.dds',
(0, 0, 0, .2), 'assets/images/gui/menu_background.txo',
'assets/sfx/menu_over.wav', 'assets/sfx/menu_clicked.ogg',
'assets/images/icons/%s.dds')
'assets/images/icons/%s.txo')
cars_names = ['themis', 'kronos', 'diones', 'iapeto', 'phoibe', 'rea',
'iperion', 'teia']
DriverPaths = namedtuple('DriverPaths', 'path path_sel')
@@ -109,12 +109,12 @@ def __init__(self):
['rome', 'sheffield', 'orlando', 'nagano', 'dubai'],
lambda: [_('Rome'), _('Sheffield'), _('Orlando'),
_('Nagano'), _('Dubai')],
'assets/images/tracks/%s.dds',
'assets/images/tracks/%s.txo',
self.options['settings']['player_name'],
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',
DriverPaths('assets/images/drivers/driver%s.txo',
'assets/images/drivers/driver%s_sel.txo'),
'assets/images/cars/%s_sel.txo',
'assets/images/cars/%s.txo',
self.eng.curr_path + 'assets/models/cars/%s/phys.yml',
'assets/models/cars/%s/car',
damage_info, wheel_gfx_names,)

0 comments on commit 650658f

Please sign in to comment.