You can subscribe to this list here.
2007 |
Jan
|
Feb
|
Mar
(10) |
Apr
(89) |
May
(48) |
Jun
(31) |
Jul
(75) |
Aug
(9) |
Sep
(6) |
Oct
(10) |
Nov
(1) |
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
(5) |
Feb
(1) |
Mar
|
Apr
|
May
(1) |
Jun
(1) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <cf...@us...> - 2008-07-04 15:00:56
|
Revision: 1173 http://automanic.svn.sourceforge.net/automanic/?rev=1173&view=rev Author: cfraz89 Date: 2008-07-04 08:01:04 -0700 (Fri, 04 Jul 2008) Log Message: ----------- a bit better Modified Paths: -------------- trunk/ioData/menus/ioVideoOptions.py trunk/outlaws.py Modified: trunk/ioData/menus/ioVideoOptions.py =================================================================== --- trunk/ioData/menus/ioVideoOptions.py 2008-07-04 14:05:03 UTC (rev 1172) +++ trunk/ioData/menus/ioVideoOptions.py 2008-07-04 15:01:04 UTC (rev 1173) @@ -90,7 +90,7 @@ foliage.text_font = '/outlaws/fonts/lcd2.ttf' foliage.text = 'Foliage:' - self.foliagescroller = ioScroller.ioScroller(self.entity, [self.x + 40000, self.y + 120000], [70000, 40000], '_foliagescroller') + self.foliagescroller = celScroller.celScroller(self.entity, [self.x + 40000, self.y + 120000], [70000, 40000], '_foliagescroller') self.foliagescroller.menu.clear() for level in ['High', 'Low', 'Off']: self.foliagescroller.additem(level, 'foliagescroller_select') Modified: trunk/outlaws.py =================================================================== --- trunk/outlaws.py 2008-07-04 14:05:03 UTC (rev 1172) +++ trunk/outlaws.py 2008-07-04 15:01:04 UTC (rev 1173) @@ -10,4 +10,4 @@ #Start the game! command = os.path.normpath(ioBaseInit.getCelstart()) path = 'celstart.cfg' -subprocess.call(['gdb', command, path] + sys.argv[1:]) +subprocess.call([command, path] + sys.argv[1:]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cf...@us...> - 2008-07-04 14:04:55
|
Revision: 1172 http://automanic.svn.sourceforge.net/automanic/?rev=1172&view=rev Author: cfraz89 Date: 2008-07-04 07:05:03 -0700 (Fri, 04 Jul 2008) Log Message: ----------- working in cs 1.4, mostly Modified Paths: -------------- trunk/celstart.cfg trunk/ioBaseInit.py trunk/ioData/client/ioNetGameClient.py trunk/ioData/gametypes/dm/ioDmStats.py trunk/ioData/gametypes/dm/ioGameDmCl.py trunk/ioData/gametypes/ioGameBaseCl.py trunk/ioData/gametypes/ioStatsBase.py trunk/ioData/hud/ioHUD.py trunk/ioData/menus/ioAutoUpdater.py trunk/ioData/menus/ioGameMenu.py trunk/ioData/menus/ioGameSelect.py trunk/ioData/menus/ioGarage.py trunk/ioData/menus/ioHostGame.py trunk/ioData/menus/ioJoinGame.py trunk/ioData/menus/ioLobbyChat.py trunk/ioData/menus/ioMainMenu.py trunk/ioData/menus/ioOptionsScreen.py trunk/ioData/menus/ioServerScreen.py trunk/ioData/menus/ioServerSelect.py trunk/ioData/menus/ioSplashScreen.py trunk/ioData/menus/ioVideoOptions.py trunk/ioData/scripts/ioInit.py trunk/ioData/scripts/ioLoader.py trunk/ioData/vehicles/ioVehicleBase.py trunk/ioData/weapons/browning/ioBullet.py trunk/ioData/weapons/ffar/ioRocket.py trunk/ioData/weapons/ioWeapon.py trunk/ioData/weapons/minelayer/ioMine.py trunk/outlaws.py Added Paths: ----------- trunk/ioData/menus/widgets/celButton.py trunk/ioData/menus/widgets/celDropDown.py trunk/ioData/menus/widgets/celMenu.py trunk/ioData/menus/widgets/celNumberInput.py trunk/ioData/menus/widgets/celScroller.py trunk/ioData/menus/widgets/celTextInput.py Removed Paths: ------------- trunk/ioData/menus/widgets/Menu.py trunk/ioData/menus/widgets/ioButton.py trunk/ioData/menus/widgets/ioDropDown.py trunk/ioData/menus/widgets/ioNumberInput.py trunk/ioData/menus/widgets/ioScroller.py trunk/ioData/menus/widgets/ioTextInput.py Modified: trunk/celstart.cfg =================================================================== --- trunk/celstart.cfg 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/celstart.cfg 2008-07-04 14:05:03 UTC (rev 1172) @@ -35,7 +35,7 @@ System.ApplicationID = CrystalSpace.Intersate Outlaws Video.ScreenWidth = 800 Video.ScreenHeight = 600 -Video.FullScreen = true +Video.FullScreen = false System.Plugins.iBugPlug = crystalspace.utilities.bugplug Modified: trunk/ioBaseInit.py =================================================================== --- trunk/ioBaseInit.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioBaseInit.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -37,15 +37,13 @@ path = os.path.abspath(path) os.chdir(path) os.environ['PYTHONPATH'] = path - #Add crystal dir to pythonpath - if os.environ.has_key('CRYSTAL'): - path = os.environ['CRYSTAL'] - path += '/out/linuxx86/optimize/bindings/python/' - os.environ['PYTHONPATH'] += os.path.pathsep + path - if os.environ.has_key('CEL'): - path = os.environ['CEL'] - path += '/out/linuxx86/optimize/bindings/python/' - os.environ['PYTHONPATH'] += os.path.pathsep + path + for key in ('CRYSTAL', 'CEL'): + #Add crystal dir to pythonpath + if os.environ.has_key(key): + for mode in ('optimize', 'debug'): + sep = os.path.pathsep + os.environ['PYTHONPATH'] += '%s%s/out/linuxx86/%s/bindings/python/%s' % (sep, os.environ[key], mode, sep) + print os.environ['PYTHONPATH'] for path in paths: addPath(path) Modified: trunk/ioData/client/ioNetGameClient.py =================================================================== --- trunk/ioData/client/ioNetGameClient.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioData/client/ioNetGameClient.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -1,10 +1,10 @@ from pycel import * import random -import Menu +import celMenu import ioLoader import ioNetworkEnt -import ioScroller +import celScroller #Handles miscellaneous network/gameplay stuff like chat and loading the map class ioNetGameClient: @@ -16,19 +16,19 @@ self.databin = Entities['ioDataBin'].Behaviour self.playername = Config.GetStr('Outlaws.Player.Name') self.playerinp = None - self.fconst = Menu.GetFontConstant() - self.fcolor = Menu.GetFontColor() + self.fconst = celMenu.GetFontConstant() + self.fcolor = celMenu.GetFontColor() self.client = Entities['ioCl'] self.mapname = '' self.frames = 0 self.net = Entities['ioNetHelper'].Behaviour - self.menu = Menu.ioMenu(self.entity) + self.menu = celMenu.celMenu(self.entity) timsg = 'textinput_clicked' tipos = (55000, 234000) tisize = (150000, 8000) - tifsize = Menu.GetFontConstant() - self.textinput = self.menu.addElement('ioChatLine', timsg, tipos, tisize, tifsize, 'unselection', 'ioTextInput') + tifsize = celMenu.GetFontConstant() + self.textinput = self.menu.addElement('ioChatLine', timsg, tipos, tisize, tifsize, 'unselection', 'celTextInput') self.msgbb = celBillboard(self.textinput) #Allow the player to hide the hud by pressing a key @@ -54,7 +54,7 @@ self.logsbb.y = 0 self.logsbb.width = 175000 self.logsbb.height = 40000 - self.logs = ioScroller.ioScroller(self.entity, [0, 0], [self.logsbb.width, self.logsbb.height], 'logs') + self.logs = celScroller.celScroller(self.entity, [0, 0], [self.logsbb.width, self.logsbb.height], 'logs') self.logs.allowdoubles = True for event in self.logitems: self.showEvent(event) @@ -128,8 +128,8 @@ self.timer.Clear() mapinfo = ioLoader.findSubfolderCfgString('maps', self.mapname) ioLoader.loadLibraryFolder('effects') + ioLoader.loadWorldFolder('weapons', True) ioLoader.loadWorldFolder('vehicles', True) - ioLoader.loadWorldFolder('weapons', True) ioLoader.loadWorldFolder('entities', True) gameworld = ioLoader.makeGameWorld(mapinfo['Path']) Engine.PrecacheDraw() @@ -142,7 +142,7 @@ self.serverscr.Behaviour.SendMessage('maploaded', None, pars) self.client.Behaviour.SendMessage('maploaded', None, pars) - self.buttons = Menu.ioMenu(self.entity) + self.buttons = celMenu.celMenu(self.entity) self.buttons.addElement('Play', 'Play_click', [135000, 242500], [20000, 10000], self.fconst, 'button-bg') #Not implemented yet #self.buttons.addElement('Spectate', 'Spectate_click', [155000, 242500], [30000, 10000], self.fconst, 'button-bg') Modified: trunk/ioData/gametypes/dm/ioDmStats.py =================================================================== --- trunk/ioData/gametypes/dm/ioDmStats.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioData/gametypes/dm/ioDmStats.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -2,7 +2,7 @@ from ioStatsBase import * import ioLoader -import Menu +import celMenu import ioScroller #DM gameover screen @@ -12,8 +12,8 @@ #The server interaction screen def __init__(self,celEntity): ioStatsBase.__init__(self, celEntity) - self.names = Menu.ioMenu(self.entity) - self.scores = Menu.ioMenu(self.entity) + self.names = celMenu.celMenu(self.entity) + self.scores = celMenu.celMenu(self.entity) def fillstats(self, pc, args): stats = cPickle.loads(args[parid('stats')]) Modified: trunk/ioData/gametypes/dm/ioGameDmCl.py =================================================================== --- trunk/ioData/gametypes/dm/ioGameDmCl.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioData/gametypes/dm/ioGameDmCl.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -1,6 +1,6 @@ from pycel import * from ioGameBaseCl import * -import Menu +import celMenu import cPickle class ioGameDmCl (ioGameBaseCl): @@ -11,7 +11,7 @@ print 'deathmatch client started' self.statsent = 'ioDmStats' self.pdisps = {} - self.fconst = Menu.GetFontConstant() + self.fconst = celMenu.GetFontConstant() self.basepos = (10000, 200000) self.bg = celAddBillboard(self.entity) self.bg.x = self.basepos[0] @@ -32,7 +32,7 @@ self.pdisps[player] = bb bb.text_font_size = self.fconst bb.text_font = '/outlaws/fonts/lcd2.ttf' - bb.text_fg_color = Menu.GetFontColor() + bb.text_fg_color = celMenu.GetFontColor() bb.text = '%s %s' % (player, stats[0]) bb.visible = self.visible self.sortDisps() Modified: trunk/ioData/gametypes/ioGameBaseCl.py =================================================================== --- trunk/ioData/gametypes/ioGameBaseCl.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioData/gametypes/ioGameBaseCl.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -2,7 +2,7 @@ import random import cPickle -import Menu +import celMenu import ioLoader class ioGameBaseCl: @@ -27,7 +27,7 @@ self.netgamecl = Entities['ioNetMgrCl'] self.kmessage = celAddBillboard(self.entity) - self.kmessage.text_font_size = Menu.GetFontConstant() * 2.5 + self.kmessage.text_font_size = celMenu.GetFontConstant() * 2.5 self.kmessage.text_font = '/outlaws/fonts/lcd2.ttf' #We got the full list of players from the server Modified: trunk/ioData/gametypes/ioStatsBase.py =================================================================== --- trunk/ioData/gametypes/ioStatsBase.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioData/gametypes/ioStatsBase.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -2,8 +2,7 @@ import cPickle import ioLoader -import Menu -import ioScroller +import celMenu #The base stats screen which is shown when a game is finished class ioStatsBase: @@ -13,8 +12,8 @@ def __init__(self,celEntity): self.entity = celEntity self.blpython = BehaviourLayers['blpython'] - self.fconst = Menu.GetFontConstant() - self.fcolor = Menu.GetFontColor() + self.fconst = celMenu.GetFontConstant() + self.fcolor = celMenu.GetFontColor() self.databin = Entities['ioDataBin'].Behaviour frame = celAddBillboard(self.entity).Billboard @@ -33,7 +32,7 @@ games.SetTextFgColor(self.fcolor) games.SetPosition(215000, 42000) - self.buttons = Menu.ioMenu(self.entity) + self.buttons = celMenu.celMenu(self.entity) #self.buttons.addElement('<<', 'Back_click', [42500, 42500], [6000, 6000], self.fconst * 0.7, 'back-bg') mpgame = self.databin.get('mpgame') if mpgame: @@ -59,7 +58,6 @@ CreateEntity('ioMainMenu', self.blpython, 'ioMainMenu') def destruct(self, pc, args): - self.entity.PropertyClassList.RemoveAll() self.buttons.clear() def fillstats(self, pc, args): @@ -70,4 +68,4 @@ netgame.Behaviour.SendMessage('leavegame', None, celGenericParameterBlock(0)) name, behaviour = self.databin.get('lastmenu', True) gamesel = CreateEntity(name, self.blpython, behaviour) - RemoveEntity(self.entity) + RemoveEntity(self.entity) \ No newline at end of file Modified: trunk/ioData/hud/ioHUD.py =================================================================== --- trunk/ioData/hud/ioHUD.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioData/hud/ioHUD.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -1,6 +1,6 @@ from pycel import * import cPickle -import Menu +import celMenu import socket class ioHUD: @@ -18,7 +18,7 @@ self.playerwheeled = None self.weapons = {} self.hardpoints = [] - self.fconst = Menu.GetFontConstant() + self.fconst = celMenu.GetFontConstant() Vfs.ChDir('/outlaws/hud') Loader.LoadMapFile('/outlaws/hud/world', False) @@ -67,7 +67,7 @@ self.wsyslabel.y = self.ypos + 15104 self.wsyslabel.text_font_size = self.fconst * 0.9 self.wsyslabel.text_font = '/outlaws/fonts/lcd2.ttf' - self.wsyslabel.text_fg_color = Menu.GetFontColor() + self.wsyslabel.text_fg_color = celMenu.GetFontColor() self.wsyslabel.text = 'o Weapons' self.vsyslabel = celAddBillboard(self.entity) @@ -75,7 +75,7 @@ self.vsyslabel.y = self.ypos + 58112 self.vsyslabel.text_font_size = self.fconst * 0.9 self.vsyslabel.text_font = '/outlaws/fonts/lcd2.ttf' - self.vsyslabel.text_fg_color = Menu.GetFontColor() + self.vsyslabel.text_fg_color = celMenu.GetFontColor() self.vsyslabel.text = 'o Systems' self.setupwheeldisplays() @@ -110,7 +110,7 @@ bb.height = 5000 bb.text_font_size = self.fconst * 0.9 bb.text_font = '/outlaws/fonts/lcd2.ttf' - bb.text_fg_color = Menu.GetFontColor() + bb.text_fg_color = celMenu.GetFontColor() bb.clickable = True bb.materialnamefast = 'unselection' self.weapons[name] = bb @@ -141,7 +141,7 @@ self.brlabel.y = self.ypos + 69112 self.brlabel.text_font_size = self.fconst * 0.9 self.brlabel.text_font = '/outlaws/fonts/lcd2.ttf' - self.brlabel.text_fg_color = Menu.GetFontColor() + self.brlabel.text_fg_color = celMenu.GetFontColor() self.brlabel.text = 'o BRAKES' def setuppowertraindisplay(self): @@ -158,7 +158,7 @@ self.ptlabel.y = self.ypos + 64112 self.ptlabel.text_font_size = self.fconst * 0.9 self.ptlabel.text_font = '/outlaws/fonts/lcd2.ttf' - self.ptlabel.text_fg_color = Menu.GetFontColor() + self.ptlabel.text_fg_color = celMenu.GetFontColor() self.ptlabel.text = 'o POWERTRAIN' def setupframedisplays(self): @@ -197,7 +197,7 @@ self.framelabel.y = self.ypos + 74112 self.framelabel.text_font_size = self.fconst * 0.9 self.framelabel.text_font = '/outlaws/fonts/lcd2.ttf' - self.framelabel.text_fg_color = Menu.GetFontColor() + self.framelabel.text_fg_color = celMenu.GetFontColor() self.framelabel.text = 'o SUS/FRAME' #Display armour status in the black part Modified: trunk/ioData/menus/ioAutoUpdater.py =================================================================== --- trunk/ioData/menus/ioAutoUpdater.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioData/menus/ioAutoUpdater.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -6,8 +6,8 @@ import ioInit import ioLoader import ioBaseInit -import Menu -import ioScroller +import celMenu +import celScroller import ioDownloader #Checks to see if there is a new version available @@ -31,7 +31,7 @@ splashscreen.x = 0 splashscreen.y = 30000 - self.fconst = Menu.GetFontConstant() + self.fconst = celMenu.GetFontConstant() #Our descriptive label self.label = celAddBillboard(self.entity) @@ -55,7 +55,7 @@ self.pbar.height = 10000 self.pbar.materialnamefast = 'button-bg' - self.menu = Menu.ioMenu(self.entity) + self.menu = celMenu.celMenu(self.entity) self.menu.addElement('Abort', 'Abort_clicked', (25000, 255000), (18000, 9000), self.fconst, 'button-bg') #Filename and address of the patch we are downloading @@ -137,7 +137,7 @@ self.descbg.width = sw self.descbg.height = sh self.descbg.materialnamefast = 'darkblack' - self.desc = ioScroller.ioScroller(self.entity, [sx, sy], [sw, sh]) + self.desc = celScroller.celScroller(self.entity, [sx, sy], [sw, sh]) self.desc.allowdoubles = True self.desc.spacing = 7000 @@ -241,7 +241,6 @@ #Now we really leave def pctimer_wakeup(self, pc, args): - timer = celTimer(self.entity) RemoveEntity(self.entity) def scroller_down(self, pc, args): Modified: trunk/ioData/menus/ioGameMenu.py =================================================================== --- trunk/ioData/menus/ioGameMenu.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioData/menus/ioGameMenu.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -1,5 +1,5 @@ from pycel import * -import Menu +import celMenu import os import ioInit @@ -12,8 +12,8 @@ def __init__(self,celEntity): self.entity = celEntity self.blpython = BehaviourLayers['blpython'] - self.fconst = Menu.GetFontConstant() - self.fcolor = Menu.GetFontColor() + self.fconst = celMenu.GetFontConstant() + self.fcolor = celMenu.GetFontColor() self.net = Entities['ioNetHelper'].Behaviour self.databin = Entities['ioDataBin'].Behaviour @@ -30,7 +30,7 @@ self.createdtime = Clock.GetCurrentTicks() def makeButtons(self): - self.menu = Menu.ioMenu(self.entity) + self.menu = celMenu.celMenu(self.entity) self.menu.addElement('Return to Game', 'Back_click', [0, 0], [60000,10000], self.fconst, 'button-bg') if self.databin.get('mpgame'): self.menu.addElement('Return to Lobby', 'Lobby_click', [0, 0], [60000,10000], self.fconst, 'button-bg') Modified: trunk/ioData/menus/ioGameSelect.py =================================================================== --- trunk/ioData/menus/ioGameSelect.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioData/menus/ioGameSelect.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -1,18 +1,19 @@ from pycel import * import cPickle -import Menu +import celMenu +import celScroller import ioInit -import ioScroller + class ioGameSelect: api_version = 2 #The server selection screen def __init__(self,celEntity): self.entity = celEntity self.blpython = BehaviourLayers['blpython'] - self.fconst = Menu.GetFontConstant() - self.fcolor = Menu.GetFontColor() + self.fconst = celMenu.GetFontConstant() + self.fcolor = celMenu.GetFontColor() self.playername = Config.GetStr('Outlaws.Player.Name') self.chatent = 'ioGameChat' self.databin = Entities['ioDataBin'].Behaviour @@ -55,7 +56,7 @@ details.SetTextFgColor(self.fcolor) details.SetPosition(184000, 52000) - self.menu = Menu.ioMenu(self.entity) + self.menu = celMenu.celMenu(self.entity) self.menu.addElement('<<', 'Back_click', [42500, 42500], [6000, 6000], self.fconst * 0.7, 'back-bg') self.hostbutton = self.menu.addElement('Host', 'Host_click', [44000, 187000], [16000, 8000], self.fconst, 'button-bg') self.hostbutton.Behaviour.SendMessage('setinactive', None, celGenericParameterBlock(0)) @@ -64,10 +65,10 @@ self.menu.addElement('Garage', 'Garage_click', [137000, 187000], [20000, 8000], self.fconst, 'button-bg') self.menu.addElement('Refresh', 'Refresh_click', [158000, 187000], [22000, 8000], self.fconst, 'button-bg') - self.scroller = ioScroller.ioScroller(self.entity, [42500, 61000], [132000, 125000]) + self.scroller = celScroller.celScroller(self.entity, [42500, 61000], [132000, 125000]) #This one gets filled in when the game info comes - self.labels = Menu.ioMenu(self.entity) + self.labels = celMenu.celMenu(self.entity) pcinput = celCommandInput(self.entity) pcinput.Bind('esc', 'exit') Modified: trunk/ioData/menus/ioGarage.py =================================================================== --- trunk/ioData/menus/ioGarage.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioData/menus/ioGarage.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -1,9 +1,9 @@ from pycel import * import cPickle -import Menu +import celMenu import ioLoader import ioNetworkEntCl -import ioScroller +import celScroller import os class ioGarage: @@ -24,14 +24,13 @@ self.frames += 1 if self.frames == 2: self.timer.Clear() - timer = celTimer(self.splash) - timer.WakeUp(50, False) self.startLoading() + RemoveEntity(self.splash) def startLoading(self): print 'making garage' self.ents = [] - self.fconst = Menu.GetFontConstant() + self.fconst = celMenu.GetFontConstant() #Info needed to exit the garage self.returnname = '' @@ -79,17 +78,19 @@ modellabel.SetTextFgColor(csColor(1, 1, 1)) modellabel.SetText('Model Preset') - self.vehiclescroller = ioScroller.ioScroller(self.entity, [00000, 65000], [80000, 50000], '_vehicles') - self.modelscroller = ioScroller.ioScroller(self.entity, [00000, 140000], [80000, 50000], 'models') + self.vehiclescroller = celScroller.celScroller(self.entity, [00000, 65000], [80000, 50000], '_vehicles') + self.modelscroller = celScroller.celScroller(self.entity, [00000, 140000], [80000, 50000], 'models') - self.buttons = Menu.ioMenu(self.entity) + self.buttons = celMenu.celMenu(self.entity) + self.buttons.font = '/outlaws/fonts/lcd2.ttf' self.buttons.addElement('Continue','Continue_click', [280000, 0], [30000,10000], self.fconst,'half-black') - self.inputs = Menu.ioMenu(self.entity) - self.inputs.addElement('playername', 'input_click', [5000, 40000], [35000, 10000], self.fconst, 'button-bg', 'ioTextInput') + self.inputs = celMenu.celMenu(self.entity) + self.inputs.font = '/outlaws/fonts/lcd2.ttf' + self.inputs.addElement('playername', 'input_click', [5000, 40000], [35000, 10000], self.fconst, 'button-bg', 'celTextInput') for i, mount in enumerate(['Front1', 'Front2', 'Roof1', 'Roof2', 'Side1', 'Side2', 'Rear1', 'Rear2']): - self.inputs.addElement(mount, 'input_click', [5000, 200000 + i * 10000], [70000, 7000], self.fconst, 'button-bg', 'ioDropDown') + self.inputs.addElement(mount, 'input_click', [5000, 200000 + i * 10000], [70000, 7000], self.fconst, 'button-bg', 'celDropDown') weaponsinfo = ioLoader.scanDir('weapons') #make a dictionary relating full names to codenames, and vice versa,so we can create entities @@ -275,7 +276,7 @@ #print mount, rcode if rcode is 0: dropdown.Behaviour.SendMessage('setunlocked', None, celGenericParameterBlock(0)) - bb.SetTextFgColor(Menu.GetFontColor()) + bb.SetTextFgColor(celMenu.GetFontColor()) self.weapons[mount] = weapon bb.SetText(self.fullnames[weapon]) elif rcode is 1: @@ -284,7 +285,7 @@ bb.SetTextFgColor(csColor(0.2, 0.2, 0.2)) elif rcode is 2: dropdown.Behaviour.SendMessage('setunlocked', None, celGenericParameterBlock(0)) - bb.SetTextFgColor(Menu.GetFontColor()) + bb.SetTextFgColor(celMenu.GetFontColor()) bb.SetText('Bad Weapon Save') @@ -327,10 +328,9 @@ if self.selectedvehicle: RemoveEntity(self.selectedvehicle) ioLoader.unloadGameWorld() - RemoveEntity(self.entity) + #RemoveEntity(self.entity) def destruct(self, pc, args): - self.entity.PropertyClassList.RemoveAll() self.buttons.clear() self.inputs.clear() self.vehiclescroller.destruct() Modified: trunk/ioData/menus/ioHostGame.py =================================================================== --- trunk/ioData/menus/ioHostGame.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioData/menus/ioHostGame.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -6,8 +6,8 @@ import ioInit import ioBaseInit import ioLoader -import Menu -import ioScroller +import celMenu +import celScroller #Screen with settings which launches a game server 'ioGameServer' process class ioHostGame: @@ -16,8 +16,8 @@ def __init__(self,celEntity): self.entity = celEntity self.blpython = BehaviourLayers['blpython'] - self.fconst = Menu.GetFontConstant() - self.fcolor = Menu.GetFontColor() + self.fconst = celMenu.GetFontConstant() + self.fcolor = celMenu.GetFontColor() self.mapinfo = ioLoader.scanDir('maps') self.gameinfo = ioLoader.scanDir('gametypes') @@ -70,15 +70,17 @@ bb.SetTextFgColor(self.fcolor) bb.SetPosition(pos[0], pos[1]) - self.buttons = Menu.ioMenu(self.entity) + self.buttons = celMenu.celMenu(self.entity) + self.buttons.font = '/outlaws/fonts/lcd2.ttf' self.buttons.addElement('<<', 'Back_click', [42500, 42500], [6000, 6000], self.fconst * 0.7, 'back-bg') self.buttons.addElement('Launch', 'Launch_click', [244000, 186000], [19000, 8000], self.fconst, 'button-bg') - self.inputs = Menu.ioMenu(self.entity) - self.inputs.addElement('name', 'Input_click', [68000, 52000], [65000, 6000], self.fconst * 0.8, 'unselection', 'ioTextInput') + self.inputs = celMenu.celMenu(self.entity) + self.inputs.font = '/outlaws/fonts/lcd2.ttf' + self.inputs.addElement('name', 'Input_click', [68000, 52000], [65000, 6000], self.fconst * 0.8, 'unselection', 'celTextInput') #Add a location dropdown, and fill it in with maps in the 'ioData/maps' folder. - location = self.inputs.addElement('location', 'Input_click', [68000, 60000], [65000, 6000], self.fconst * 0.8, 'unselection', 'ioDropDown') + location = self.inputs.addElement('location', 'Input_click', [68000, 60000], [65000, 6000], self.fconst * 0.8, 'unselection', 'celDropDown') for dict in self.mapinfo: #Don't add the garage! if dict['Name'] != 'Garage': @@ -88,7 +90,7 @@ location.Behaviour.SendMessage('selectindex', None, pars) #Same for gametypes - games = self.inputs.addElement('gametypes', 'Input_click', [68000, 68000], [65000, 6000], self.fconst * 0.8, 'unselection', 'ioDropDown') + games = self.inputs.addElement('gametypes', 'Input_click', [68000, 68000], [65000, 6000], self.fconst * 0.8, 'unselection', 'celDropDown') for dict in self.gameinfo: pars = parblock(dict) @@ -96,10 +98,10 @@ pars = parblock({'index' : 0}) games.Behaviour.SendMessage('selectindex', None, pars) - maxp = self.inputs.addElement('maxplayers', 'Input_click', [68000, 76000], [18000, 6000], self.fconst * 0.8, 'unselection', 'ioNumberInput') - self.inputs.addElement('maxscore', 'Input_click', [114000, 76000], [18000, 6000], self.fconst * 0.8, 'unselection', 'ioNumberInput') - self.inputs.addElement('password', 'Input_click', [68000, 84000], [65000, 6000], self.fconst * 0.8, 'unselection', 'ioTextInput') - self.inputs.addElement('notes', 'Input_click', [150000, 60000], [100000, 8000], self.fconst * 0.8, 'button-bg', 'ioTextInput') + maxp = self.inputs.addElement('maxplayers', 'Input_click', [68000, 76000], [18000, 6000], self.fconst * 0.8, 'unselection', 'celNumberInput') + self.inputs.addElement('maxscore', 'Input_click', [114000, 76000], [18000, 6000], self.fconst * 0.8, 'unselection', 'celNumberInput') + self.inputs.addElement('password', 'Input_click', [68000, 84000], [65000, 6000], self.fconst * 0.8, 'unselection', 'celTextInput') + self.inputs.addElement('notes', 'Input_click', [150000, 60000], [100000, 8000], self.fconst * 0.8, 'button-bg', 'celTextInput') self.inputs.activate('name') pars = parblock({'value' : 6}) Modified: trunk/ioData/menus/ioJoinGame.py =================================================================== --- trunk/ioData/menus/ioJoinGame.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioData/menus/ioJoinGame.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -4,8 +4,7 @@ import ioInit import ioLoader -import Menu -import ioScroller +import celMenu #The screen which lets you choose if you want to join a game before actually doing it. class ioJoinGame: @@ -14,8 +13,8 @@ def __init__(self,celEntity): self.entity = celEntity self.blpython = BehaviourLayers['blpython'] - self.fconst = Menu.GetFontConstant() - self.fcolor = Menu.GetFontColor() + self.fconst = celMenu.GetFontConstant() + self.fcolor = celMenu.GetFontColor() self.lobbyserver = None self.gameserver = [None, None] self.gamedata = None @@ -71,14 +70,14 @@ bb.SetTextFgColor(self.fcolor) bb.SetPosition(pos[0], pos[1]) - self.buttons = Menu.ioMenu(self.entity) + self.buttons = celMenu.celMenu(self.entity) self.buttons.addElement('<<', 'Back_click', [42500, 42500], [6000, 6000], self.fconst * 0.7, 'back-bg') self.buttons.addElement('Garage', 'Garage_click', [44000, 186000], [19000, 8000], self.fconst, 'button-bg') launch = self.buttons.addElement('Launch', 'Launch_click', [244000, 186000], [19000, 8000], self.fconst, 'button-bg') launch.Behaviour.SendMessage('setinactive', None, celGenericParameterBlock(0)) #These aren't really inputs, i'm just reusing code from the host game screen - self.inputs = Menu.ioMenu(self.entity) + self.inputs = celMenu.celMenu(self.entity) self.inputs.addElement('name', '', [68000, ypos[0]], [65000, 6000], self.fconst * 0.8, 'unselection') self.inputs.addElement('location', '', [68000, ypos[1]], [65000, 6000], self.fconst * 0.8, 'unselection') self.inputs.addElement('gametypes', '', [68000, ypos[2]], [65000, 6000], self.fconst * 0.8, 'unselection') Modified: trunk/ioData/menus/ioLobbyChat.py =================================================================== --- trunk/ioData/menus/ioLobbyChat.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioData/menus/ioLobbyChat.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -1,8 +1,8 @@ from pycel import * import cPickle -import ioScroller -import Menu +import celScroller +import celMenu #Handles the chatroom in the lobby class ioLobbyChat: @@ -14,16 +14,16 @@ self.databin = Entities['ioDataBin'].Behaviour lobbyname, self.lobbyserver = self.databin.get('lobbyserver') #The list of messages on the left - self.msgscroller = ioScroller.ioScroller(self.entity, (43000, 196000), (163900, 57500), '_msg') + self.msgscroller = celScroller.celScroller(self.entity, (43000, 196000), (163900, 57500), '_msg') #The list of clients on the right - self.namescroller = ioScroller.ioScroller(self.entity, (211000, 196000), (47500, 57500), '_names') + self.namescroller = celScroller.celScroller(self.entity, (211000, 196000), (47500, 57500), '_names') self.msgscroller.allowdoubles = True - self.menu = Menu.ioMenu(self.entity) + self.menu = celMenu.celMenu(self.entity) timsg = 'textinput_clicked' tipos = (43000, 254000) tisize = (207000, 8000) - tifsize = Menu.GetFontConstant() - self.textinput = self.menu.addElement('ioChatLine', timsg, tipos, tisize, tifsize, 'unselection', 'ioTextInput') + tifsize = celMenu.GetFontConstant() + self.textinput = self.menu.addElement('ioChatLine', timsg, tipos, tisize, tifsize, 'unselection', 'celTextInput') self.menu.activate('ioChatLine') def scroller_up_names(self, pc, args): Modified: trunk/ioData/menus/ioMainMenu.py =================================================================== --- trunk/ioData/menus/ioMainMenu.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioData/menus/ioMainMenu.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -1,7 +1,7 @@ from pycel import * import os -import Menu +import celMenu import ioInit import ioLoader @@ -22,8 +22,7 @@ pcinput = celCommandInput(self.entity) pcinput.Bind('esc', 'exit') - - self.menu = Menu.ioMenu(self.entity) + self.menu = celMenu.celMenu(self.entity) xs = 21000 ys = 16000 melee = celBillboard(self.menu.addElement('', 'Melee_click', [0, 0], [xs, ys], 18, 'melee')) @@ -43,6 +42,7 @@ multi.x = melee.x + 750 multi.y = melee.y - 3500 exitgame.x += 20000 + print 'make menu' def pccommandinput_exit1(self, pc, args): ioInit.exitgame() @@ -81,5 +81,4 @@ ioInit.exitgame() def destruct(self, pc, args): - self.menu.clear() - self.entity.PropertyClassList.RemoveAll() + self.menu.clear() \ No newline at end of file Modified: trunk/ioData/menus/ioOptionsScreen.py =================================================================== --- trunk/ioData/menus/ioOptionsScreen.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioData/menus/ioOptionsScreen.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -3,9 +3,9 @@ import urllib2 import socket -import Menu +import celMenu import ioInit -import ioScroller +import celScroller #The options screen which containers video options + others (later, anyway) class ioOptionsScreen: @@ -14,8 +14,8 @@ def __init__(self,celEntity): self.entity = celEntity self.blpython = BehaviourLayers['blpython'] - self.fconst = Menu.GetFontConstant() - self.fcolor = Menu.GetFontColor() + self.fconst = celMenu.GetFontConstant() + self.fcolor = celMenu.GetFontColor() bg = celAddBillboard(self.entity) bg.materialnamefast = 'game-bg' @@ -48,12 +48,12 @@ self.currentscreen = None - self.menu = Menu.ioMenu(self.entity) + self.menu = celMenu.celMenu(self.entity) back = self.menu.addElement('<<', 'Back_click', (42500, 42500), (6000, 6000), self.fconst * 0.7, 'back-bg') saved = self.menu.addElement('Save Page', 'Save_clicked', (228500, 247500), (30000, 8000), self.fconst, 'button-bg') self.saved = celBillboard(saved) - self.scroller = ioScroller.ioScroller(self.entity, (42500, 62500), (42000, 185000)) + self.scroller = celScroller.celScroller(self.entity, (42500, 62500), (42000, 185000)) self.scroller.additem('Video', 'Video_click') #This will kill the scroll buttons self.scroller.menu.clear() @@ -85,7 +85,6 @@ def destruct(self, pc, args): self.scroller.destruct() self.menu.clear() - self.entity.PropertyClassList.RemoveAll() if self.currentscreen: RemoveEntity(self.currentscreen) Modified: trunk/ioData/menus/ioServerScreen.py =================================================================== --- trunk/ioData/menus/ioServerScreen.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioData/menus/ioServerScreen.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -2,8 +2,7 @@ import cPickle import ioLoader -import Menu -import ioScroller +import celMenu class ioServerScreen: api_version = 2 @@ -12,8 +11,8 @@ def __init__(self,celEntity): self.entity = celEntity self.blpython = BehaviourLayers['blpython'] - self.fconst = Menu.GetFontConstant() - self.fcolor = Menu.GetFontColor() + self.fconst = celMenu.GetFontConstant() + self.fcolor = celMenu.GetFontColor() self.databin = Entities['ioDataBin'].Behaviour self.gamedata = None @@ -43,9 +42,11 @@ self.label.SetTextFgColor(self.fcolor) self.label.SetPosition(45000, 62000) - self.labels = Menu.ioMenu(self.entity) + self.labels = celMenu.celMenu(self.entity) + self.labels.font = '/outlaws/fonts/lcd2.ttf' - self.buttons = Menu.ioMenu(self.entity) + self.buttons = celMenu.celMenu(self.entity) + self.buttons.font = '/outlaws/fonts/lcd2.ttf' self.buttons.addElement('<<', 'Back_click', [42500, 42500], [6000, 6000], self.fconst * 0.7, 'back-bg') pcinput = celCommandInput(self.entity) @@ -93,4 +94,4 @@ def maploaded(self, pc, args): self.entity.PropertyClassList.Remove(0) - self.label.SetText('Map loaded') + self.label.SetText('Map loaded') \ No newline at end of file Modified: trunk/ioData/menus/ioServerSelect.py =================================================================== --- trunk/ioData/menus/ioServerSelect.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioData/menus/ioServerSelect.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -5,8 +5,8 @@ import ioInit import ioDownloader -import Menu -import ioScroller +import celMenu +import celScroller import ioNetHelper class ioServerSelect: @@ -17,8 +17,8 @@ def __init__(self,celEntity): self.entity = celEntity self.blpython = BehaviourLayers['blpython'] - self.fconst = Menu.GetFontConstant() - self.fcolor = Menu.GetFontColor() + self.fconst = celMenu.GetFontConstant() + self.fcolor = celMenu.GetFontColor() self.databin = Entities['ioDataBin'].Behaviour self.net = Entities['ioNetHelper'].Behaviour @@ -50,14 +50,14 @@ namebb.SetTextFgColor(self.fcolor) namebb.SetPosition(45000, 52000) - self.menu = Menu.ioMenu(self.entity) + self.menu = celMenu.celMenu(self.entity) self.menu.addElement('<<', 'Back_click', [42500, 42500], [6000, 6000], self.fconst * 0.7, 'back-bg') connect = self.menu.addElement('Connect', 'Connect_click', [45000, 252500], [22000, 8000], self.fconst, 'button-bg') connect.Behaviour.SendMessage('setinactive', None, celGenericParameterBlock(0)) self.menu.addElement('Refresh', 'Refresh_click', [240000, 252500], [22000, 8000], self.fconst, 'button-bg') self.menu.addElement('LAN Games', 'LAN_click', [200000, 252500], [26000, 8000], self.fconst, 'button-bg') - self.scroller = ioScroller.ioScroller(self.entity, [42500, 62500], [221200, 185000]) + self.scroller = celScroller.celScroller(self.entity, [42500, 62500], [221200, 185000]) self.masteraddress = Config.GetStr('Outlaws.MasterServer.Address') @@ -172,13 +172,11 @@ #Write out the selected settings self.databin.store('lobbyserver', (name, server)) gamesel = CreateEntity('ioGameSelect', self.blpython, 'ioGameSelect') - self.entity.PropertyClassList.RemoveAll() RemoveEntity(self.entity) def destruct(self, pc, args): self.scroller.destruct() self.menu.clear() - self.entity.PropertyClassList.RemoveAll() def Back_click(self, pc, args): CreateEntity('ioMainMenu', self.blpython, 'ioMainMenu') @@ -190,4 +188,4 @@ self.scroller.clear() self.scroller.additem('Searching for LAN lobbies', '') self.servernames = [] - self.servers = [] + self.servers = [] \ No newline at end of file Modified: trunk/ioData/menus/ioSplashScreen.py =================================================================== --- trunk/ioData/menus/ioSplashScreen.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioData/menus/ioSplashScreen.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -24,6 +24,6 @@ #Destroy on a timer event def pctimer_wakeup(self, pc, args): RemoveEntity(self.entity) - + def destruct(self, pc, args): - self.entity.PropertyClassList.RemoveAll() + self.entity.PropertyClassList.RemoveAll() \ No newline at end of file Modified: trunk/ioData/menus/ioVideoOptions.py =================================================================== --- trunk/ioData/menus/ioVideoOptions.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioData/menus/ioVideoOptions.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -3,8 +3,8 @@ import urllib2 import socket -import Menu -import ioScroller +import celMenu +import celScroller import ioDataBin #A widget inside the options screen @@ -14,11 +14,11 @@ def __init__(self,celEntity): self.entity = celEntity self.blpython = BehaviourLayers['blpython'] - self.fconst = Menu.GetFontConstant() - self.fcolor = Menu.GetFontColor() + self.fconst = celMenu.GetFontConstant() + self.fcolor = celMenu.GetFontColor() self.x = 82500 self.y = 62500 - self.menu = Menu.ioMenu(self.entity) + self.menu = celMenu.celMenu(self.entity) volabel = celCreateBillboard(pl, self.entity) volabel.text_font_size = self.fconst * 1.25 @@ -36,7 +36,7 @@ res.text_font = '/outlaws/fonts/lcd2.ttf' res.text = 'Resolution:' - self.resscroller = ioScroller.ioScroller(self.entity, [self.x + 40000, self.y + 10000], [70000, 50000], '_resscroller') + self.resscroller = celScroller.celScroller(self.entity, [self.x + 40000, self.y + 10000], [70000, 50000], '_resscroller') reslist = ['320x240', '640x480', '800x600', @@ -45,7 +45,7 @@ '1600x1200', '1920x1200', '1280x800', - '1680x1050', + '1680x1050', '1600x1024'] for res in reslist: self.resscroller.additem(res, 'resscroller_select') @@ -172,5 +172,4 @@ def destruct(self, pc, args): self.menu.clear() self.resscroller.destruct() - self.foliagescroller.destruct() - self.entity.PropertyClassList.RemoveAll() + self.foliagescroller.destruct() \ No newline at end of file Deleted: trunk/ioData/menus/widgets/Menu.py =================================================================== --- trunk/ioData/menus/widgets/Menu.py 2008-06-17 19:49:13 UTC (rev 1171) +++ trunk/ioData/menus/widgets/Menu.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -1,96 +0,0 @@ -from pycel import * -import os - -#The glue module which abstracts the widgets into a menu. Allows one widget to have focus - - -def GetFontConstant(): - return 1.0 + float(Graphics2D.GetHeight()) / 100.0 - -def GetFontColor(): - return csColor(0.9, 0.9, 0.9) - -class ioMenu: - def __init__(self, owner): - self.elements = [] - self.blpython = BehaviourLayers['blpython'] - self.owner = owner - self.active = None - self.font = '/outlaws/fonts/lcd2.ttf' - - #A generic menu element. sends message to menu when clicked if given one - def addElement(self, name, message, position, sizes, fsize, material, behaviour = 'ioButton'): - elementEntity = CreateEntity(name, self.blpython, None) - pcbillboard = celBillboard(elementEntity) - pcbillboard.materialnamefast = material - pcbillboard.width = sizes[0] - pcbillboard.height = sizes[1] - pcbillboard.x = position[0] - pcbillboard.y = position[1] - pcbillboard.text_offset = csVector2(1500, 1500) - pcbillboard.text_fg_color = GetFontColor() - pcbillboard.text_font_size = fsize - pcbillboard.text_font = self.font - pcbillboard.text = name - params=parblock({'message' : message, 'owner': self.owner}) - if message != '': - elementEntity.CreateBehaviour(self.blpython, behaviour) - pcbillboard.clickable = True - elementEntity.Behaviour.SendMessage('setparameters', None, params) - self.elements.append(elementEntity) - return elementEntity - - def align(self, position, spacing): - for i, element in enumerate(self.elements): - bb = celBillboard(element).Billboard - bb.SetPosition(position[0] + (spacing[0]*i),position[1]+(spacing[1]*i)) - - def clear(self): - for i in xrange(len(self.elements)): - element = self.elements.pop(0) - element.PropertyClassList.RemoveAll() - RemoveEntity(element) - - def updateSelect(self, selected): - index = 0 - for i, element in enumerate(self.elements): - if element.Name == selected: - index = i - bb = celBillboard(element).Billboard - bb.SetMaterialName('button-bg') - - bb = celBillboard(self.elements[index]).Billboard - bb.SetMaterialName('button-bg') - return index - - def menuFromList(self, items, message): - for item in items: - name = item['Name'] - if item.has_key('Preview') and item.has_key('Path'): - preview = item['Preview'] - path = item['Path'] - print path - Vfs.ChDir('/outlaws/ioData/' + path) - Loader.LoadTexture(name + preview, preview, CS_TEXTURE_2D) - self.addElement(name, message, [0, 0], [90000, 27000], 18, 'button-bg') - - def remove(self, index): - element = self.elements.pop(index) - RemoveEntity(element) - - def activate(self, name): - self.active = None - for element in self.elements: - if element.Name == name: - if element.Behaviour: - self.active = element - element.Behaviour.SendMessage('setactive', None, celGenericParameterBlock(0)) - else: - if element.Behaviour: - element.Behaviour.SendMessage('setinactive', None, celGenericParameterBlock(0)) - - def deactivateAll(self): - self.active = None - for element in self.elements: - if element.Behaviour: - element.Behaviour.SendMessage('setinactive', None, celGenericParameterBlock(0)) Added: trunk/ioData/menus/widgets/celButton.py =================================================================== --- trunk/ioData/menus/widgets/celButton.py (rev 0) +++ trunk/ioData/menus/widgets/celButton.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -0,0 +1,40 @@ +from pycel import * +import celMenu +class celButton: + api_version = 2 # use new version of message callbacks. + def __init__(self,celEntity): + self.message = '' + self.owner = None + self.entity = celEntity + self.active = True + + def pcbillboard_select(self,pc,args): + if self.active: + params = parblock({'sender':self.entity.Name}) + if self.owner: + self.owner.Behaviour.SendMessage(self.message, None, params) + + def pcbillboard_unselect(self,pc,args): + pass + + def pcbillboard_doubleclick(self, pc, args): + pass + + def setparameters(self,pc,args): + self.message = args[getid('cel.parameter.message')] + self.owner = args[getid('cel.parameter.owner')] + + def setactive(self, pc, args): + if not self.active: + self.active = True + bb = celBillboard(self.entity).Billboard + bb.SetTextFgColor(celMenu.GetFontColor()) + + def setinactive(self, pc, args): + if self.active: + self.active = False + bb = celBillboard(self.entity).Billboard + bb.SetTextFgColor(csColor(0, 0, 0)) + + def destruct(self, pc, args): + pass Added: trunk/ioData/menus/widgets/celDropDown.py =================================================================== --- trunk/ioData/menus/widgets/celDropDown.py (rev 0) +++ trunk/ioData/menus/widgets/celDropDown.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -0,0 +1,79 @@ +from pycel import * +import celMenu +class celDropDown: + api_version = 2 # use new version of message callbacks. + def __init__(self, celEntity): + self.message = '' + self.owner = None + self.entity = celEntity + self.items = [] + self.active = False + self.bb = celBillboard(self.entity).Billboard + self.bb.SetText('') + self.locked = False + self.fconst = celMenu.GetFontConstant() + self.menu = celMenu.celMenu(self.entity) + #Properties of the subitems. You may want to change these. + #Changes will be reflected next time submenu is shown. + self.menufont = self.bb.GetTextFont() + self.menufontsize = self.bb.GetTextFontSize() + + def pcbillboard_select(self,pc,args): + params = parblock({'sender':self.entity.Name}) + if self.owner: + self.owner.Behaviour.SendMessage(self.message, None, params) + + def pcbillboard_unselect(self,pc,args): + pass + + def pcbillboard_doubleclick(self, pc, args): + pass + + def setparameters(self,pc,args): + self.message = args[getid('cel.parameter.message')] + self.owner = args[getid('cel.parameter.owner')] + + def additem(self, pc, args): + name = args[getid('cel.parameter.Name')] + self.items.append(name) + + def setactive(self, pc, args): + if not self.locked: + if not self.active: + for item in self.items: + newitem = self.menu.addElement(item, 'item_clicked', [0, 0], [67000, 8000], self.fconst * 0.8, 'dropdown-bg') + bb = celBillboard(newitem) + bb.text_font = self.menufont + bb.text_font_size = self.menufontsize + x, y = self.bb.GetPosition() + self.menu.align([x, y], [0, 7000]) + self.active = True + + def setinactive(self, pc, args): + self.active = False + self.menu.clear() + + def item_clicked(self, pc, args): + name = args[getid('cel.parameter.sender')] + self.active = False + self.menu.clear() + self.bb.SetText(name) + params = parblock({'sender':self.entity.Name}) + if self.owner: + self.owner.Behaviour.SendMessage(self.message + '_item', None, params) + + def selectindex(self, pc, args): + if not self.locked: + index = int(args[getid('cel.parameter.index')]) + self.active = False + self.menu.clear() + self.bb.SetText(self.items[index]) + + def destruct(self, pc, args): + self.menu.clear() + + def setlocked(self, pc, args): + self.locked = True + + def setunlocked(self, pc, args): + self.locked = False Property changes on: trunk/ioData/menus/widgets/celDropDown.py ___________________________________________________________________ Name: svn:executable + * Added: trunk/ioData/menus/widgets/celMenu.py =================================================================== --- trunk/ioData/menus/widgets/celMenu.py (rev 0) +++ trunk/ioData/menus/widgets/celMenu.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -0,0 +1,88 @@ +from pycel import * + +#The glue module which abstracts the widgets into a menu. Allows one widget to have focus. +#You really want to use this module to use the widgets. + + +def GetFontConstant(): + return 1.0 + float(Graphics2D.GetHeight()) / 100.0 + +def GetFontColor(): + return csColor(0.9, 0.9, 0.9) + +class celMenu: + api_version = 2 # use new version of message callbacks. + def __init__(self, owner): + self.elements = [] + self.blpython = BehaviourLayers['blpython'] + self.owner = owner + self.active = None + self.font = '/fonts/unifont/unifont.csf' + + #Add a menu element. sends message to menu when clicked. the behaviour chooses the widget. + def addElement(self, name, message, position, sizes, fsize, material, behaviour = 'celButton'): + elementEntity = CreateEntity(name, self.blpython, None) + pcbillboard = celBillboard(elementEntity) + pcbillboard.materialnamefast = material + pcbillboard.width = sizes[0] + pcbillboard.height = sizes[1] + pcbillboard.x = position[0] + pcbillboard.y = position[1] + pcbillboard.text_offset = csVector2(1500, 1500) + pcbillboard.text_fg_color = GetFontColor() + pcbillboard.text_font_size = fsize + pcbillboard.text_font = self.font + pcbillboard.text = name + elementEntity.CreateBehaviour(self.blpython, behaviour) + #Time to send a message if neccesary + if message != '': + pcbillboard.clickable = True + params=parblock({'message' : message, 'owner': self.owner}) + elementEntity.Behaviour.SendMessage('setparameters', None, params) + self.elements.append(elementEntity) + + return elementEntity + + #Given an [x,y] list for position, and spacing, arrange elements + def align(self, position, spacing): + for i, element in enumerate(self.elements): + bb = celBillboard(element).Billboard + bb.SetPosition(position[0] + (spacing[0]*i),position[1]+(spacing[1]*i)) + + #Remove all elements from menu + def clear(self): + for i in xrange(len(self.elements)): + element = self.elements.pop(0) + RemoveEntity(element) + + #make one selected + def updateSelect(self, selected): + index = 0 + for i, element in enumerate(self.elements): + if element.Name == selected: + index = i + bb = celBillboard(element).Billboard + bb.SetMaterialName('button-bg') + + bb = celBillboard(self.elements[index]).Billboard + bb.SetMaterialName('button-bg') + return index + + #Activate an item in the menu + def activate(self, name): + self.active = None + for element in self.elements: + if element.Name == name: + if element.Behaviour: + self.active = element + element.Behaviour.SendMessage('setactive', None, celGenericParameterBlock(0)) + else: + if element.Behaviour: + element.Behaviour.SendMessage('setinactive', None, celGenericParameterBlock(0)) + + #Deactivate all elements + def deactivateAll(self): + self.active = None + for element in self.elements: + if element.Behaviour: + element.Behaviour.SendMessage('setinactive', None, celGenericParameterBlock(0)) Added: trunk/ioData/menus/widgets/celNumberInput.py =================================================================== --- trunk/ioData/menus/widgets/celNumberInput.py (rev 0) +++ trunk/ioData/menus/widgets/celNumberInput.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -0,0 +1,143 @@ +from pycel import * +import celMenu +class celNumberInput: + api_version = 2 # use new version of message callbacks. + def __init__(self,celEntity): + self.message = '' + self.owner = None + self.entity = celEntity + self.active = False + self.index = 0 + self.bb = celBillboard(self.entity).Billboard + self.bb.SetText('') + #Keep the text in a list so we can do insertion at cursor position + self.text = ['0'] + self.pcinput = celCommandInput(self.entity) + self.pcinput.Bind('key', 'keypress') + self.pcinput.SetCookedMode(True) + self.pcinput.SetSendTrigger(True) + + fconst = celMenu.GetFontConstant() + pos = self.bb.GetPosition() + size = self.bb.GetSize() + self.bb.SetTextOffset(size[0] / 2 - 2000, 1000) + self.bb.SetText('0') + #Add the directional arrows + self.arrows = celMenu.celMenu(self.entity) + self.arrows.font = self.bb.GetTextFont() + self.arrows.addElement('<', 'left_click', pos, [6000, 6000], fconst * 0.8, 'unselection') + self.arrows.addElement('>', 'right_click', [pos[0] + size[0] - 3000, pos[1]], [6000, 6000], fconst * 0.8, 'unselection') + + def pcbillboard_select(self,pc,args): + params = parblock({'sender':self.entity.Name}) + if self.owner: + self.owner.Behaviour.SendMessage(self.message, None, params) + + def pcbillboard_unselect(self,pc,args): + pass + + def pcbillboard_doubleclick(self, pc, args): + pass + + def setactive(self, pc, args): + if not self.active: + self.active = True + text = self.bb.GetText() + if text: + if len(text) > 0: + self.text = list(text) + self.index = len(text) + else: + self.text = [] + + #Insert the cursor + newtext = '' + for i, letter in enumerate(self.text): + #Insert the cursor at right position + if i is self.index: + newtext += '|' + newtext += letter + #Also allow cursor to be at the end + if self.index is len(newtext): + newtext += '|' + self.bb.SetText(newtext) + + def setinactive(self, pc, args): + if self.active: + self.active = False + #Remove the cursor + newtext = '' + for i, letter in enumerate(self.text): + newtext += letter + self.bb.SetText(newtext) + + def setparameters(self,pc,args): + self.message = args[getid('cel.parameter.message')] + self.owner = args[getid('cel.parameter.owner')] + + def pccommandinput_keypress1(self, pc, args): + trigger = args[getid('cel.parameter.trigger')] + if self.active: + self.handlekey(trigger) + + def handlekey(self, trigger): + #Move the cursor + if trigger == 'Left' and self.index > 0: + self.index -= 1 + if trigger == 'Right' and self.index < len(self.text): + self.index += 1 + + #Insert a character + elif trigger in '1234567890': + self.text.insert(self.index, trigger) + self.index += 1 + + #Delete a character + elif trigger == 'Back': + if len(self.text) > 0: + self.index -= 1 + self.text.pop(self.index) + newtext = '' + for i, letter in enumerate(self.text): + #Insert the cursor at right position + if i is self.index: + newtext += '|' + newtext += letter + #Also allow cursor to be at the end + if self.index is len(newtext): + newtext += '|' + self.bb.SetText(newtext) + + def pccommandinput_keypress0(self, pc, args): + pass + + def pccommandinput_keypress_(self, pc, args): + trigger = args[getid('cel.parameter.trigger')] + if self.active: + self.handlekey(trigger) + + def destruct(self, pc, args): + self.arrows.clear() + self.entity.PropertyClassList.RemoveAll() + + def left_click(self, pc, args): + newtext = '' + for i, letter in enumerate(self.text): + newtext += letter + newint = int(newtext) - 1 + self.text = list(str(newint)) + self.bb.SetText(str(newint)) + + def right_click(self, pc, args): + newtext = '' + for i, letter in enumerate(self.text): + newtext += letter + newint = int(newtext) + 1 + self.text = list(str(newint)) + self.bb.SetText(str(newint)) + + #This message allows to change our value that we store and display + def set_value(self, pc, args): + text = str(args[parid('value')]) + self.text = list(text) + self.bb.SetText(text) Property changes on: trunk/ioData/menus/widgets/celNumberInput.py ___________________________________________________________________ Name: svn:executable + * Added: trunk/ioData/menus/widgets/celScroller.py =================================================================== --- trunk/ioData/menus/widgets/celScroller.py (rev 0) +++ trunk/ioData/menus/widgets/celScroller.py 2008-07-04 14:05:03 UTC (rev 1172) @@ -0,0 +1,156 @@ +from pycel import * +import celMenu + +#The scroller is not meant to be used as part of a menu. +class celScroller: + api_version = 2 # use new version of message callbacks. + def __init__(self, owner, pos, dims, name = ''): + self.items = [] + self.names = [] + self.name = name + self.blpython = BehaviourLayers['blpython'] + ... [truncated message content] |
From: <Qua...@us...> - 2008-06-17 19:49:29
|
Revision: 1171 http://automanic.svn.sourceforge.net/automanic/?rev=1171&view=rev Author: Quadrofonic Date: 2008-06-17 12:49:13 -0700 (Tue, 17 Jun 2008) Log Message: ----------- Replaced tabs with spaces for consistency. Modified Paths: -------------- trunk/ioData/client/ioBotController.py trunk/ioData/client/ioClient.py trunk/ioData/client/ioEntityManagerClient.py trunk/ioData/client/ioNetClient.py trunk/ioData/client/ioNetGameClient.py trunk/ioData/gametypes/dm/ioGameDmCl.py trunk/ioData/gametypes/ioGameBaseCl.py trunk/ioData/gametypes/ioStatsBase.py trunk/ioData/menus/ioGameMenu.py trunk/ioData/menus/ioGameSelect.py trunk/ioData/menus/ioGarage.py trunk/ioData/menus/ioHostGame.py trunk/ioData/menus/ioJoinGame.py trunk/ioData/menus/ioLobbyChat.py trunk/ioData/menus/ioMainMenu.py trunk/ioData/menus/ioServerScreen.py trunk/ioData/menus/ioServerSelect.py trunk/ioData/menus/ioVideoOptions.py trunk/ioData/scripts/ioDataBin.py trunk/ioData/scripts/ioInit.py trunk/ioData/scripts/ioNetHelper.py trunk/ioData/server/game/ioEntityManager.py trunk/ioData/server/ioServerBase.py trunk/ioData/vehicles/ioVehicleBase.py trunk/ioData/weapons/browning/ioBullet.py trunk/ioData/weapons/ffar/ioRocket.py trunk/ioData/weapons/flamer/ioFlamer.py trunk/ioData/weapons/minelayer/ioMine.py Modified: trunk/ioData/client/ioBotController.py =================================================================== --- trunk/ioData/client/ioBotController.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/client/ioBotController.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -5,15 +5,15 @@ self.entity = celEntity timer = celTimer(self.entity) timer.WakeUp(200, True, 'steer') - timer.WakeUp(2000, True, 'checktargets') + timer.WakeUp(2000, True, 'checktargets') self.bot = None self.targetent = None - self.targetmesh = None + self.targetmesh = None self.targetname = '' self.accelerating = False self.shooting = False self.steering = 0 - self.entmgr = Entities['ioEntMgrCl'] + self.entmgr = Entities['ioEntMgrCl'] #Set the bot with which we are to control def setcontrol(self, pc, args): @@ -23,14 +23,14 @@ #The bot has changed targets def settarget(self, pc, args): targetname = args[parid('name')] - self.target(targetname) - + self.target(targetname) + def target(self, targetname): - self.targetname = targetname - if self.targetname != '': - self.targetent = Entities[self.targetname] - if self.targetent: - self.targetmesh = celMesh(self.targetent) + self.targetname = targetname + if self.targetname != '': + self.targetent = Entities[self.targetname] + if self.targetent: + self.targetmesh = celMesh(self.targetent) #Make sure we're heading towards our target def pctimer_steer(self, pc, args): @@ -39,39 +39,39 @@ if not self.accelerating: self.bot.Behaviour.SendMessage('pccommandinput_accelerate1', None, args) self.accelerating = True - if self.targetent: - if self.targetmesh.Mesh: - targetpos = self.targetmesh.Mesh.GetMovable().GetPosition() - reltargetpos = self.botmesh.Mesh.GetMovable().GetTransform().Other2This(targetpos) - if reltargetpos.x > 0: - if self.steering != -1: - self.bot.Behaviour.SendMessage('pccommandinput_steerleft1', None, args) - self.steering = -1 - else: - if self.steering != 1: - self.bot.Behaviour.SendMessage('pccommandinput_steerright1', None, args) - self.steering = 1 + if self.targetent: + if self.targetmesh.Mesh: + targetpos = self.targetmesh.Mesh.GetMovable().GetPosition() + reltargetpos = self.botmesh.Mesh.GetMovable().GetTransform().Other2This(targetpos) + if reltargetpos.x > 0: + if self.steering != -1: + self.bot.Behaviour.SendMessage('pccommandinput_steerleft1', None, args) + self.steering = -1 + else: + if self.steering != 1: + self.bot.Behaviour.SendMessage('pccommandinput_steerright1', None, args) + self.steering = 1 #Work out who's nearest to us, and go for them def pctimer_checktargets(self, pc, args): - mindist = 9999.0 - minent = '' - for entname in self.entmgr.Behaviour.getEntities(): - if entname != self.bot.Name: - ent = Entities[entname] - mesh = celMesh(ent).Mesh - pos = mesh.GetMovable().GetPosition() - diff = self.botmesh.Mesh.GetMovable().GetPosition() - pos - dist = diff.Norm() - if dist < mindist: - mindist = dist - minent = entname - self.target(minent) + mindist = 9999.0 + minent = '' + for entname in self.entmgr.Behaviour.getEntities(): + if entname != self.bot.Name: + ent = Entities[entname] + mesh = celMesh(ent).Mesh + pos = mesh.GetMovable().GetPosition() + diff = self.botmesh.Mesh.GetMovable().GetPosition() - pos + dist = diff.Norm() + if dist < mindist: + mindist = dist + minent = entname + self.target(minent) - #Fire in bursts: - if not self.shooting: - self.bot.Behaviour.SendMessage('pccommandinput_shoot1', None, args) - self.shooting = True - else: - self.bot.Behaviour.SendMessage('pccommandinput_shoot0', None, args) - self.shooting = False \ No newline at end of file + #Fire in bursts: + if not self.shooting: + self.bot.Behaviour.SendMessage('pccommandinput_shoot1', None, args) + self.shooting = True + else: + self.bot.Behaviour.SendMessage('pccommandinput_shoot0', None, args) + self.shooting = False Modified: trunk/ioData/client/ioClient.py =================================================================== --- trunk/ioData/client/ioClient.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/client/ioClient.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -67,7 +67,7 @@ #Get the servers sending info to us def serverInit(self): - databin = Entities['ioDataBin'] + databin = Entities['ioDataBin'] self.lobbyname, self.lobbyserver = databin.Behaviour.get('lobbyserver') self.gamename, self.gameserver = databin.Behaviour.get('gameserver') @@ -148,4 +148,4 @@ #Change login name and password def setpassword(self, pc, args): - self.password = args[parid('password')] \ No newline at end of file + self.password = args[parid('password')] Modified: trunk/ioData/client/ioEntityManagerClient.py =================================================================== --- trunk/ioData/client/ioEntityManagerClient.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/client/ioEntityManagerClient.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -74,7 +74,7 @@ pars = parblock({'player' : True}) vehicle.Behaviour.SendMessage('setplayer', None, pars) - #Add the weapons (depending on gametype) + #Add the weapons (depending on gametype) pars = parblock({'vehicle' : vehicle}) gmtp.Behaviour.SendMessage('equipplayer', None, pars) @@ -93,7 +93,7 @@ #Pick a random vehicle, and extract its template #vehicleinfo = random.choice(vehicles) - vname = random.choice(['Coyote']) + vname = random.choice(['Coyote']) vehicleinfo = filter(lambda v: v['Codename'] == vname, vehicles)[0] vehicle = ioNetworkEntCl.makeEntity(vehicleinfo['Codename'], 'Bot ' + str(self.bots)) mesh = celMesh(vehicle) @@ -104,7 +104,7 @@ pars = parblock({'entity' : vehicle}) gmtp.Behaviour.SendMessage('positionplayer', None, pars) - #Add the weapons (depending on gametype) + #Add the weapons (depending on gametype) pars = parblock({'vehicle' : vehicle, 'path': vehicleinfo['Path']}) gmtp.Behaviour.SendMessage('equipbot', None, pars) @@ -134,4 +134,4 @@ pass def getEntities(self): - return self.entities \ No newline at end of file + return self.entities Modified: trunk/ioData/client/ioNetClient.py =================================================================== --- trunk/ioData/client/ioNetClient.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/client/ioNetClient.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -15,7 +15,7 @@ self.dispatcher = ioDispatcher.ioDispatcher() self.entity = celEntity self.blpython = BehaviourLayers['blpython'] - self.databin = Entities['ioDataBin'].Behaviour + self.databin = Entities['ioDataBin'].Behaviour self.timer = celTimer(self.entity) self.timer.WakeUpFrame(0) self.timer.WakeUp(500, True) Modified: trunk/ioData/client/ioNetGameClient.py =================================================================== --- trunk/ioData/client/ioNetGameClient.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/client/ioNetGameClient.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -13,7 +13,7 @@ def __init__(self, celEntity): self.entity = celEntity self.blpython = BehaviourLayers['blpython'] - self.databin = Entities['ioDataBin'].Behaviour + self.databin = Entities['ioDataBin'].Behaviour self.playername = Config.GetStr('Outlaws.Player.Name') self.playerinp = None self.fconst = Menu.GetFontConstant() @@ -214,4 +214,4 @@ #Log a message. This function is a message to be used by other entities def logevent(self, pc, args): message = args[parid('message')] - self.logEvent(message) \ No newline at end of file + self.logEvent(message) Modified: trunk/ioData/gametypes/dm/ioGameDmCl.py =================================================================== --- trunk/ioData/gametypes/dm/ioGameDmCl.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/gametypes/dm/ioGameDmCl.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -54,8 +54,8 @@ self.killmessage('Killed by', killedby) self.players[killedby][0] = score self.pdisps[killedby].text = '%s %d' % (killedby, score) - if killedby == 'map' or killedby == '0': - killedby = 'himself' + if killedby == 'map' or killedby == '0': + killedby = 'himself' pars = parblock({'message' : '%s was killed by %s' % (killed, killedby)}) self.netgamecl.Behaviour.SendMessage('logevent', None, pars) self.sortDisps() @@ -71,4 +71,4 @@ bb.y = self.basepos[1] + (i + 1) * 10000 def r_gov(self, pc, args): - ioGameBaseCl.r_gov(self, pc, args) \ No newline at end of file + ioGameBaseCl.r_gov(self, pc, args) Modified: trunk/ioData/gametypes/ioGameBaseCl.py =================================================================== --- trunk/ioData/gametypes/ioGameBaseCl.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/gametypes/ioGameBaseCl.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -87,14 +87,14 @@ def positionplayer(self, pc, args): entity = args[getid('cel.parameter.entity')] lastplayer = len(self.players) - numstarts = Engine.GetCameraPositions().GetCount() + numstarts = Engine.GetCameraPositions().GetCount() if numstarts > 0: - startnum = lastplayer % numstarts - startpos = Engine.GetCameraPositions ().Get (startnum).GetPosition() - else: - print 'no starts on map!!!' - startpos = csVector3(0,0,0) - celMechanicsObject(entity).GetBody().SetPosition(startpos) + startnum = lastplayer % numstarts + startpos = Engine.GetCameraPositions ().Get (startnum).GetPosition() + else: + print 'no starts on map!!!' + startpos = csVector3(0,0,0) + celMechanicsObject(entity).GetBody().SetPosition(startpos) #Game is over due to conditions met in gametype def r_gov(self, pc, args): @@ -127,8 +127,8 @@ #If you want to make a gametype without weapons, just override this with pass #This one equips weapons as saved in config def equipplayer(self, pc, args): - player = args[parid('vehicle')] - for mount in ['Front1', 'Front2', 'Roof1', 'Roof2', 'Side1', 'Side2', 'Rear1', 'Rear2']: + player = args[parid('vehicle')] + for mount in ['Front1', 'Front2', 'Roof1', 'Roof2', 'Side1', 'Side2', 'Rear1', 'Rear2']: weapon = Config.GetStr('Outlaws.Player.' + mount, 'BRWNG') pars = parblock({'mount' : mount, 'weapon' : weapon}) player.Behaviour.SendMessage('addweapon', None, pars) @@ -136,8 +136,8 @@ #Equip weapons for the bots. #Takes random weapons and adds them. def equipbot(self, pc, args): - vehicle = args[parid('vehicle')] - path = args[parid('path')] + vehicle = args[parid('vehicle')] + path = args[parid('path')] #Equip random model for weapons models = ioLoader.scanModels(path) if len(models) > 0: @@ -145,4 +145,4 @@ weapons = model['Weapons'] for mount, weapon in weapons.items(): pars = parblock({'mount' : mount, 'weapon' : weapon}) - vehicle.Behaviour.SendMessage('addweapon', None, pars) \ No newline at end of file + vehicle.Behaviour.SendMessage('addweapon', None, pars) Modified: trunk/ioData/gametypes/ioStatsBase.py =================================================================== --- trunk/ioData/gametypes/ioStatsBase.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/gametypes/ioStatsBase.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -15,7 +15,7 @@ self.blpython = BehaviourLayers['blpython'] self.fconst = Menu.GetFontConstant() self.fcolor = Menu.GetFontColor() - self.databin = Entities['ioDataBin'].Behaviour + self.databin = Entities['ioDataBin'].Behaviour frame = celAddBillboard(self.entity).Billboard frame.SetMaterialName('window-frame') @@ -70,4 +70,4 @@ netgame.Behaviour.SendMessage('leavegame', None, celGenericParameterBlock(0)) name, behaviour = self.databin.get('lastmenu', True) gamesel = CreateEntity(name, self.blpython, behaviour) - RemoveEntity(self.entity) \ No newline at end of file + RemoveEntity(self.entity) Modified: trunk/ioData/menus/ioGameMenu.py =================================================================== --- trunk/ioData/menus/ioGameMenu.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/menus/ioGameMenu.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -15,7 +15,7 @@ self.fconst = Menu.GetFontConstant() self.fcolor = Menu.GetFontColor() self.net = Entities['ioNetHelper'].Behaviour - self.databin = Entities['ioDataBin'].Behaviour + self.databin = Entities['ioDataBin'].Behaviour self.bg = celCreateBillboard(pl, self.entity).Billboard self.bg.SetMaterialName('half-black') @@ -127,4 +127,4 @@ netgame = Entities['ioNetMgrCl'] netgame.Behaviour.SendMessage('leavegame', None, celGenericParameterBlock(0)) CreateEntity('ioGameSelect', self.blpython, 'ioGameSelect') - RemoveEntity(self.entity) \ No newline at end of file + RemoveEntity(self.entity) Modified: trunk/ioData/menus/ioGameSelect.py =================================================================== --- trunk/ioData/menus/ioGameSelect.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/menus/ioGameSelect.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -15,7 +15,7 @@ self.fcolor = Menu.GetFontColor() self.playername = Config.GetStr('Outlaws.Player.Name') self.chatent = 'ioGameChat' - self.databin = Entities['ioDataBin'].Behaviour + self.databin = Entities['ioDataBin'].Behaviour #Used for compatibility testing self.compatversion = Config.GetStr('Outlaws.Version.Compat') @@ -240,4 +240,4 @@ name = self.servernames[self.scroller.selectedindex] self.databin.store('gameserver', (name, server)) jg = CreateEntity('ioJoinGame', self.blpython, 'ioJoinGame') - RemoveEntity(self.entity) \ No newline at end of file + RemoveEntity(self.entity) Modified: trunk/ioData/menus/ioGarage.py =================================================================== --- trunk/ioData/menus/ioGarage.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/menus/ioGarage.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -17,7 +17,7 @@ self.timer = celTimer(self.entity) self.timer.WakeUpFrame(2) self.frames = 0 - self.databin = Entities['ioDataBin'].Behaviour + self.databin = Entities['ioDataBin'].Behaviour #Now we start loading, and delete the splash screen. it will clear when loading is finished def pctimer_wakeupframe(self, pc, args): Modified: trunk/ioData/menus/ioHostGame.py =================================================================== --- trunk/ioData/menus/ioHostGame.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/menus/ioHostGame.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -21,7 +21,7 @@ self.mapinfo = ioLoader.scanDir('maps') self.gameinfo = ioLoader.scanDir('gametypes') - self.databin = Entities['ioDataBin'].Behaviour + self.databin = Entities['ioDataBin'].Behaviour bg = celAddBillboard(self.entity).Billboard bg.SetMaterialName('hostjoin-bg') @@ -195,4 +195,4 @@ password = '' pars = parblock({'password' : password}) client.Behaviour.SendMessage('setpassword', None, pars) - RemoveEntity(self.entity) \ No newline at end of file + RemoveEntity(self.entity) Modified: trunk/ioData/menus/ioJoinGame.py =================================================================== --- trunk/ioData/menus/ioJoinGame.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/menus/ioJoinGame.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -19,7 +19,7 @@ self.lobbyserver = None self.gameserver = [None, None] self.gamedata = None - self.databin = Entities['ioDataBin'].Behaviour + self.databin = Entities['ioDataBin'].Behaviour bg = celAddBillboard(self.entity).Billboard bg.SetMaterialName('hostjoin-bg') @@ -171,4 +171,4 @@ pars = parblock({'password' : password}) client = CreateEntity('ioCl', self.blpython, 'ioClient') client.Behaviour.SendMessage('setpassword', None, pars) - RemoveEntity(self.entity) \ No newline at end of file + RemoveEntity(self.entity) Modified: trunk/ioData/menus/ioLobbyChat.py =================================================================== --- trunk/ioData/menus/ioLobbyChat.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/menus/ioLobbyChat.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -11,7 +11,7 @@ def __init__(self, celEntity): self.entity = celEntity self.net = Entities['ioNetHelper'].Behaviour - self.databin = Entities['ioDataBin'].Behaviour + self.databin = Entities['ioDataBin'].Behaviour lobbyname, self.lobbyserver = self.databin.get('lobbyserver') #The list of messages on the left self.msgscroller = ioScroller.ioScroller(self.entity, (43000, 196000), (163900, 57500), '_msg') @@ -66,4 +66,4 @@ def destruct(self, pc, args): self.msgscroller.destruct() self.namescroller.destruct() - self.menu.clear() \ No newline at end of file + self.menu.clear() Modified: trunk/ioData/menus/ioMainMenu.py =================================================================== --- trunk/ioData/menus/ioMainMenu.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/menus/ioMainMenu.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -11,7 +11,7 @@ def __init__(self,celEntity): self.entity = celEntity self.blpython = BehaviourLayers['blpython'] - self.databin = Entities['ioDataBin'].Behaviour + self.databin = Entities['ioDataBin'].Behaviour bg = celCreateBillboard(pl, self.entity) bg.materialnamefast = 'menu_bg' @@ -82,4 +82,4 @@ def destruct(self, pc, args): self.menu.clear() - self.entity.PropertyClassList.RemoveAll() \ No newline at end of file + self.entity.PropertyClassList.RemoveAll() Modified: trunk/ioData/menus/ioServerScreen.py =================================================================== --- trunk/ioData/menus/ioServerScreen.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/menus/ioServerScreen.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -14,7 +14,7 @@ self.blpython = BehaviourLayers['blpython'] self.fconst = Menu.GetFontConstant() self.fcolor = Menu.GetFontColor() - self.databin = Entities['ioDataBin'].Behaviour + self.databin = Entities['ioDataBin'].Behaviour self.gamedata = None bg = celAddBillboard(self.entity).Billboard @@ -93,4 +93,4 @@ def maploaded(self, pc, args): self.entity.PropertyClassList.Remove(0) - self.label.SetText('Map loaded') \ No newline at end of file + self.label.SetText('Map loaded') Modified: trunk/ioData/menus/ioServerSelect.py =================================================================== --- trunk/ioData/menus/ioServerSelect.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/menus/ioServerSelect.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -19,7 +19,7 @@ self.blpython = BehaviourLayers['blpython'] self.fconst = Menu.GetFontConstant() self.fcolor = Menu.GetFontColor() - self.databin = Entities['ioDataBin'].Behaviour + self.databin = Entities['ioDataBin'].Behaviour self.net = Entities['ioNetHelper'].Behaviour @@ -190,4 +190,4 @@ self.scroller.clear() self.scroller.additem('Searching for LAN lobbies', '') self.servernames = [] - self.servers = [] \ No newline at end of file + self.servers = [] Modified: trunk/ioData/menus/ioVideoOptions.py =================================================================== --- trunk/ioData/menus/ioVideoOptions.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/menus/ioVideoOptions.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -45,7 +45,7 @@ '1600x1200', '1920x1200', '1280x800', - '1680x1050', + '1680x1050', '1600x1024'] for res in reslist: self.resscroller.additem(res, 'resscroller_select') @@ -173,4 +173,4 @@ self.menu.clear() self.resscroller.destruct() self.foliagescroller.destruct() - self.entity.PropertyClassList.RemoveAll() \ No newline at end of file + self.entity.PropertyClassList.RemoveAll() Modified: trunk/ioData/scripts/ioDataBin.py =================================================================== --- trunk/ioData/scripts/ioDataBin.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/scripts/ioDataBin.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -10,10 +10,10 @@ self.data = {} def get(self, key): - if self.data.has_key(key): - return self.data[key] - else: - return None + if self.data.has_key(key): + return self.data[key] + else: + return None def store(self, key, value): - self.data[key] = value \ No newline at end of file + self.data[key] = value Modified: trunk/ioData/scripts/ioInit.py =================================================================== --- trunk/ioData/scripts/ioInit.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/scripts/ioInit.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -45,15 +45,15 @@ self.entity = celEntity registerclasses() - #Our data bin - self.databin = CreateEntity('ioDataBin', self.blpython, 'ioDataBin').Behaviour + #Our data bin + self.databin = CreateEntity('ioDataBin', self.blpython, 'ioDataBin').Behaviour #Make the net client which contains our socket CreateEntity('ioNetClient', self.blpython, 'ioNetClient') - - #The interface to the net client - CreateEntity('ioNetHelper', self.blpython, 'ioNetHelper') - + + #The interface to the net client + CreateEntity('ioNetHelper', self.blpython, 'ioNetHelper') + #Stop the app from hanging too long if the network is down socket.setdefaulttimeout(10) Modified: trunk/ioData/scripts/ioNetHelper.py =================================================================== --- trunk/ioData/scripts/ioNetHelper.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/scripts/ioNetHelper.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -8,8 +8,8 @@ class ioNetHelper: api_version = 2 def __init__(self, celEntity): - self.entity = celEntity - self.databin = Entities['ioDataBin'].Behaviour + self.entity = celEntity + self.databin = Entities['ioDataBin'].Behaviour #The transport entity is the entity which holds our dispatcher. #We require that it is stored in the data bin self.transportent = pl.FindEntity(self.databin.get('socketent')) @@ -30,4 +30,4 @@ def getNetData(self, pars): ip = cPickle.loads(pars[parid('addr')]) data = cPickle.loads(pars[parid('data')]) - return (ip, data) \ No newline at end of file + return (ip, data) Modified: trunk/ioData/server/game/ioEntityManager.py =================================================================== --- trunk/ioData/server/game/ioEntityManager.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/server/game/ioEntityManager.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -14,7 +14,7 @@ print 'initialised entity manager' #Entities can store info here self.ents = {} - self.gsrv = Entities['ioGSrv'] + self.gsrv = Entities['ioGSrv'] self.net = Entities['ioNetHelper'].Behaviour @@ -97,4 +97,4 @@ idx = 0 return entities[idx] else: - return '' \ No newline at end of file + return '' Modified: trunk/ioData/server/ioServerBase.py =================================================================== --- trunk/ioData/server/ioServerBase.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/server/ioServerBase.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -30,8 +30,8 @@ #The entity that we send chat messages to. This needs to be overridden in specific implementations. self.chatent = '' self.blpython = BehaviourLayers['blpython'] - self.databin = CreateEntity('ioDataBin', self.blpython, 'ioDataBin').Behaviour - self.net = CreateEntity('ioNetHelper', self.blpython, 'ioNetHelper').Behaviour + self.databin = CreateEntity('ioDataBin', self.blpython, 'ioDataBin').Behaviour + self.net = CreateEntity('ioNetHelper', self.blpython, 'ioNetHelper').Behaviour self.timer = celTimer(self.entity) self.timer.WakeUpFrame(0) Modified: trunk/ioData/vehicles/ioVehicleBase.py =================================================================== --- trunk/ioData/vehicles/ioVehicleBase.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/vehicles/ioVehicleBase.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -175,19 +175,19 @@ self.lastcollision = currenttime idx = self.getarmouratpos(pos) damage = depth * 1000.0 - #The front is strongest - if idx == 0: - damage = damage / 10.0 - #Don't bother dealing small amounts of damage - if damage > 0.5: - if self.frame[idx] > 0: - self.frame[idx] -= damage - if self.frame[idx] < 0: - self.frame[idx] = 0 - #The average is used by the label display and drag - self.avgframe = sum(self.frame) / 4.0 - self.postProcessDamage('fr', idx, self.frame[idx], collided) - self.damagehealth(damage, collided) + #The front is strongest + if idx == 0: + damage = damage / 10.0 + #Don't bother dealing small amounts of damage + if damage > 0.5: + if self.frame[idx] > 0: + self.frame[idx] -= damage + if self.frame[idx] < 0: + self.frame[idx] = 0 + #The average is used by the label display and drag + self.avgframe = sum(self.frame) / 4.0 + self.postProcessDamage('fr', idx, self.frame[idx], collided) + self.damagehealth(damage, collided) def doDeform(self, pos, depth, normal): @@ -533,25 +533,25 @@ def damagehealth(self, damage, source): - if self.health > 0: - self.health -= damage - if self.health <= 0: - self.die(source) - self.postProcessDamage('hl', 0, self.health, source) - #The powertrain and brakes have a random chance of taking damage - ptchance = random.random() - if ptchance >= 0.5: - if self.powertrain > 0: - self.powertrain -= damage - if self.powertrain < 0: - self.powertrain = 0 - self.postProcessDamage('pt', 0, self.powertrain, source) - brchance = random.random() - if brchance >= 0.5: - self.brakes -= damage - if self.brakes < 0: - self.brakes = 0 - self.postProcessDamage('br', 0, self.brakes, source) + if self.health > 0: + self.health -= damage + if self.health <= 0: + self.die(source) + self.postProcessDamage('hl', 0, self.health, source) + #The powertrain and brakes have a random chance of taking damage + ptchance = random.random() + if ptchance >= 0.5: + if self.powertrain > 0: + self.powertrain -= damage + if self.powertrain < 0: + self.powertrain = 0 + self.postProcessDamage('pt', 0, self.powertrain, source) + brchance = random.random() + if brchance >= 0.5: + self.brakes -= damage + if self.brakes < 0: + self.brakes = 0 + self.postProcessDamage('br', 0, self.brakes, source) #This is inherited by the server to send to clients. By the client to send messages to the hud def postProcessDamage(self, zone, idx, health, source): @@ -777,36 +777,36 @@ def changeBodyMesh(self, dmgfname, reparent): dmgfact = Engine.FindMeshFactory(dmgfname) if dmgfact: - if self.rmesh: + if self.rmesh: Engine.WantToDie(self.rmesh) - dmgmesh = Engine.CreateMeshWrapper(dmgfact, self.entity.Name + 'Body', self.scene, self.mesh.Mesh.GetMovable().GetPosition()) + dmgmesh = Engine.CreateMeshWrapper(dmgfact, self.entity.Name + 'Body', self.scene, self.mesh.Mesh.GetMovable().GetPosition()) self.body.AttachMesh(dmgmesh) - self.mesh.Mesh = dmgmesh - self.deform.Mesh = dmgmesh - self.deform.ResetDeform() + self.mesh.Mesh = dmgmesh + self.deform.Mesh = dmgmesh + self.deform.ResetDeform() self.rmesh = dmgmesh if reparent: for window in self.windows: if window: mesh = celMesh(window).Mesh - mesh.GetMovable().SetPosition(csVector3(0)) + mesh.GetMovable().SetPosition(csVector3(0)) mesh.GetMovable().GetSceneNode().SetParent(dmgmesh.GetMovable().GetSceneNode()) mesh.GetMovable().UpdateMove() for mount, weapon in self.weapons.iteritems(): if weapon: - mesh = celMesh(weapon).Mesh - mech = celGetMechanicsObject(weapon) - if mech: - weapon.PropertyClassList.Remove(mech) - #Find the mount for the weapon, and reparent it to the mount position and orientation - nodeob = self.scene.QueryObject().GetChildByName(self.codename + '-' + mount) - if nodeob: - mountNode = nodeob.QueryInterface(iMapNode) - mesh.GetMovable().SetPosition(mountNode.GetPosition()) - mesh.GetMovable().GetSceneNode().SetParent(dmgmesh.GetMovable().GetSceneNode()) - zvec = mountNode.GetZVector() - yvec = mountNode.GetYVector() - mesh.GetMovable().GetTransform().LookAt(yvec, zvec) + mesh = celMesh(weapon).Mesh + mech = celGetMechanicsObject(weapon) + if mech: + weapon.PropertyClassList.Remove(mech) + #Find the mount for the weapon, and reparent it to the mount position and orientation + nodeob = self.scene.QueryObject().GetChildByName(self.codename + '-' + mount) + if nodeob: + mountNode = nodeob.QueryInterface(iMapNode) + mesh.GetMovable().SetPosition(mountNode.GetPosition()) + mesh.GetMovable().GetSceneNode().SetParent(dmgmesh.GetMovable().GetSceneNode()) + zvec = mountNode.GetZVector() + yvec = mountNode.GetYVector() + mesh.GetMovable().GetTransform().LookAt(yvec, zvec) mesh.GetMovable().UpdateMove() for exhaust in self.exhausts: if exhaust: Modified: trunk/ioData/weapons/browning/ioBullet.py =================================================================== --- trunk/ioData/weapons/browning/ioBullet.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/weapons/browning/ioBullet.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -18,7 +18,7 @@ def pcprojectile_hit(self, pc, args): entity = args[getid('cel.parameter.entity')] - if entity: + if entity: self.damage.SingleDamage(entity.Name) if self.dirtfact: mypos = self.mesh.Mesh.GetMovable().GetPosition() Modified: trunk/ioData/weapons/ffar/ioRocket.py =================================================================== --- trunk/ioData/weapons/ffar/ioRocket.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/weapons/ffar/ioRocket.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -14,21 +14,21 @@ self.mesh = celMesh(self.entity) self.mesh.Mesh = bulletmesh self.dirtfact = Engine.FindMeshFactory('rocketDirtFly') - self.trailfact = Engine.FindMeshFactory('rocketTrail') + self.trailfact = Engine.FindMeshFactory('rocketTrail') self.firefact = Engine.FindMeshFactory('rocketFire') - self.armed = False + self.armed = False def pctimer_wakeup(self, pc, args): - self.armed = True + self.armed = True def pcprojectile_hit(self, pc, args): if self.armed: - self.explode() + self.explode() def arm(self, pc, args): timer = celTimer(self.entity) timer.WakeUp(50, False) - if self.firefact: + if self.firefact: self.firemesh = Engine.CreateMeshWrapper(self.firefact, 'rocketfire', self.scene, csVector3(0,0,-1.0)) self.firemesh.QuerySceneNode().SetParent(self.mesh.Mesh.QuerySceneNode()) if self.trailfact: @@ -41,29 +41,29 @@ self.explode() def explode(self): - if self.client: - sounds = ['explode1', 'explode2', 'explode3', 'explode4', 'explode5', 'explode6'] - sound = ioLoader.playSound(self.entity, random.choice(sounds)) - sound.volume = 2.0 - self.damage.AreaDamage(0.1) - mypos = self.mesh.Mesh.GetMovable().GetPosition() - if self.expfact: - expmesh = Engine.CreateMeshWrapper(self.expfact, 'rocketexplosion', self.scene, mypos) - Engine.DelayedRemoveObject(1500, expmesh) - if self.dirtfact: - dirtmesh = Engine.CreateMeshWrapper(self.dirtfact, 'dirtexplosion', self.scene, mypos) - Engine.DelayedRemoveObject(1500, dirtmesh) - pos = self.trailmesh.GetMovable().GetFullPosition() - self.trailmesh.GetMovable().GetSceneNode().SetParent(None) - self.trailmesh.GetMovable().SetPosition(self.scene, pos) - self.trailmesh.GetMovable().UpdateMove() - Engine.DelayedRemoveObject(1500, self.trailmesh) - self.firemesh.GetMovable().GetSceneNode().SetParent(None) - self.firemesh.GetMovable().SetPosition(self.scene, pos) - self.firemesh.GetMovable().UpdateMove() - Engine.DelayedRemoveObject(500, self.firemesh) - Engine.WantToDie(self.mesh.Mesh) - RemoveEntity(self.entity) + if self.client: + sounds = ['explode1', 'explode2', 'explode3', 'explode4', 'explode5', 'explode6'] + sound = ioLoader.playSound(self.entity, random.choice(sounds)) + sound.volume = 2.0 + self.damage.AreaDamage(0.1) + mypos = self.mesh.Mesh.GetMovable().GetPosition() + if self.expfact: + expmesh = Engine.CreateMeshWrapper(self.expfact, 'rocketexplosion', self.scene, mypos) + Engine.DelayedRemoveObject(1500, expmesh) + if self.dirtfact: + dirtmesh = Engine.CreateMeshWrapper(self.dirtfact, 'dirtexplosion', self.scene, mypos) + Engine.DelayedRemoveObject(1500, dirtmesh) + pos = self.trailmesh.GetMovable().GetFullPosition() + self.trailmesh.GetMovable().GetSceneNode().SetParent(None) + self.trailmesh.GetMovable().SetPosition(self.scene, pos) + self.trailmesh.GetMovable().UpdateMove() + Engine.DelayedRemoveObject(1500, self.trailmesh) + self.firemesh.GetMovable().GetSceneNode().SetParent(None) + self.firemesh.GetMovable().SetPosition(self.scene, pos) + self.firemesh.GetMovable().UpdateMove() + Engine.DelayedRemoveObject(500, self.firemesh) + Engine.WantToDie(self.mesh.Mesh) + RemoveEntity(self.entity) def pcdamage_hurt(self, pc, args): pass Modified: trunk/ioData/weapons/flamer/ioFlamer.py =================================================================== --- trunk/ioData/weapons/flamer/ioFlamer.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/weapons/flamer/ioFlamer.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -24,7 +24,7 @@ def setparent(self, pc, args): ioWeapon.setparent(self, pc, args) self.damage.SetDamageSource(self.parent.Name) - + def shoot(self): ioWeapon.shoot(self) if self.effectfact and not self.effect: Modified: trunk/ioData/weapons/minelayer/ioMine.py =================================================================== --- trunk/ioData/weapons/minelayer/ioMine.py 2008-05-18 23:25:50 UTC (rev 1170) +++ trunk/ioData/weapons/minelayer/ioMine.py 2008-06-17 19:49:13 UTC (rev 1171) @@ -39,9 +39,9 @@ def explode(self): if self.client: - sounds = ['mexplode1', 'mexplode2', 'mexplode3', 'mexplode4', 'mexplode5', 'mexplode6', 'mexplode7', 'mexplode8', 'mexplode9', 'mexplode10'] - sound = ioLoader.playSound(self.entity, random.choice(sounds)) - sound.volume = 2.0 + sounds = ['mexplode1', 'mexplode2', 'mexplode3', 'mexplode4', 'mexplode5', 'mexplode6', 'mexplode7', 'mexplode8', 'mexplode9', 'mexplode10'] + sound = ioLoader.playSound(self.entity, random.choice(sounds)) + sound.volume = 2.0 self.damage.AreaDamage(0.5) pos = self.mesh.Mesh.GetMovable().GetPosition() expmesh = Engine.CreateMeshWrapper(self.expfact, 'mineexplosion', self.scene, pos) @@ -71,4 +71,4 @@ self.entity.PropertyClassList.RemoveAll() def setclient(self, pc, args): - self.client = args[parid('client')] \ No newline at end of file + self.client = args[parid('client')] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Qua...@us...> - 2008-05-18 23:26:05
|
Revision: 1170 http://automanic.svn.sourceforge.net/automanic/?rev=1170&view=rev Author: Quadrofonic Date: 2008-05-18 16:25:50 -0700 (Sun, 18 May 2008) Log Message: ----------- Added flamer, browning and impact sounds. No code triggers yet. Added Paths: ----------- trunk/ioData/sounds/browning/ trunk/ioData/sounds/browning/browning1.ogg trunk/ioData/sounds/flamer/ trunk/ioData/sounds/flamer/flamer1.ogg trunk/ioData/sounds/flamer/flamer2.ogg trunk/ioData/sounds/impact/ trunk/ioData/sounds/impact/bulletmetal1.ogg trunk/ioData/sounds/impact/glassbreak.ogg Added: trunk/ioData/sounds/browning/browning1.ogg =================================================================== (Binary files differ) Property changes on: trunk/ioData/sounds/browning/browning1.ogg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ioData/sounds/flamer/flamer1.ogg =================================================================== (Binary files differ) Property changes on: trunk/ioData/sounds/flamer/flamer1.ogg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ioData/sounds/flamer/flamer2.ogg =================================================================== (Binary files differ) Property changes on: trunk/ioData/sounds/flamer/flamer2.ogg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ioData/sounds/impact/bulletmetal1.ogg =================================================================== (Binary files differ) Property changes on: trunk/ioData/sounds/impact/bulletmetal1.ogg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/ioData/sounds/impact/glassbreak.ogg =================================================================== (Binary files differ) Property changes on: trunk/ioData/sounds/impact/glassbreak.ogg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cf...@us...> - 2008-02-14 00:15:01
|
Revision: 1169 http://automanic.svn.sourceforge.net/automanic/?rev=1169&view=rev Author: cfraz89 Date: 2008-02-13 16:14:53 -0800 (Wed, 13 Feb 2008) Log Message: ----------- changes Modified Paths: -------------- trunk/ioData/gametypes/ioGameBaseCl.py trunk/ioData/vehicles/coyote/entities_world trunk/ioData/weapons/ffar/world trunk/ioData/weapons/flamer/world trunk/ioData/weapons/minelayer/world Modified: trunk/ioData/gametypes/ioGameBaseCl.py =================================================================== --- trunk/ioData/gametypes/ioGameBaseCl.py 2008-01-29 11:25:51 UTC (rev 1168) +++ trunk/ioData/gametypes/ioGameBaseCl.py 2008-02-14 00:14:53 UTC (rev 1169) @@ -87,9 +87,14 @@ def positionplayer(self, pc, args): entity = args[getid('cel.parameter.entity')] lastplayer = len(self.players) - startnum = lastplayer % Engine.GetCameraPositions().GetCount() - startpos = Engine.GetCameraPositions ().Get (startnum).GetPosition() - celMechanicsObject(entity).GetBody().SetPosition(startpos) + numstarts = Engine.GetCameraPositions().GetCount() + if numstarts > 0: + startnum = lastplayer % numstarts + startpos = Engine.GetCameraPositions ().Get (startnum).GetPosition() + else: + print 'no starts on map!!!' + startpos = csVector3(0,0,0) + celMechanicsObject(entity).GetBody().SetPosition(startpos) #Game is over due to conditions met in gametype def r_gov(self, pc, args): Modified: trunk/ioData/vehicles/coyote/entities_world =================================================================== --- trunk/ioData/vehicles/coyote/entities_world 2008-01-29 11:25:51 UTC (rev 1168) +++ trunk/ioData/vehicles/coyote/entities_world 2008-02-14 00:14:53 UTC (rev 1169) @@ -40,17 +40,17 @@ <property name="autoreverse" bool="true"/> <property name="brakeforce" float="5000.0"/> <property name="abs" bool="false"/> -<!-- <property name="antisway" bool="false" /> --> + <property name="antisway" bool="false" /> <property name="steeramount" float="0.8"/> <!--Front Left Wheel--> <action name="AddWheel"> <par vector="0.55, 0.1, -1.05" name="position"/> - <par float="4.0" name="turnspeed"/> - <par float="4.0" name="returnspeed"/> - <par float="0.00012" name="suspensionsoftness"/> + <par float="8.0" name="turnspeed"/> + <par float="8.0" name="returnspeed"/> + <par float="0.00015" name="suspensionsoftness"/> <par float="0.1" name="suspensiondamping"/> <par float="0.7" name="brakepower"/> - <par float="0.5" name="enginepower"/> + <par float="0.4" name="enginepower"/> <par float="1.0" name="leftsteersensitivity"/> <par float="0.8" name="rightsteersensitivity"/> <par float="1.2" name="friction"/> @@ -64,12 +64,12 @@ <!--Front Right Wheel--> <action name="AddWheel"> <par vector="-0.55, 0.1, -1.05" name="position"/> - <par float="4.0" name="turnspeed"/> - <par float="4.0" name="returnspeed"/> - <par float="0.00012" name="suspensionsoftness"/> + <par float="8.0" name="turnspeed"/> + <par float="8.0" name="returnspeed"/> + <par float="0.00015" name="suspensionsoftness"/> <par float="0.1" name="suspensiondamping"/> <par float="0.7" name="brakepower"/> - <par float="0.5" name="enginepower"/> + <par float="0.4" name="enginepower"/> <par float="0.8" name="leftsteersensitivity"/> <par float="1.0" name="rightsteersensitivity"/> <par float="1.2" name="friction"/> @@ -83,12 +83,12 @@ <!--Rear Left Wheel--> <action name="AddWheel"> <par vector="0.55, 0.1, 1.0" name="position"/> - <par float="4.0" name="turnspeed"/> - <par float="4.0" name="returnspeed"/> - <par float="0.00012" name="suspensionsoftness"/> + <par float="8.0" name="turnspeed"/> + <par float="8.0" name="returnspeed"/> + <par float="0.00015" name="suspensionsoftness"/> <par float="0.1" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> - <par float="0.5" name="enginepower"/> + <par float="0.6" name="enginepower"/> <par float="0.0" name="leftsteersensitivity"/> <par float="0.0" name="rightsteersensitivity"/> <par float="1.15" name="friction"/> @@ -102,12 +102,12 @@ <!--Rear Right Wheel--> <action name="AddWheel"> <par vector="-0.55, 0.1, 1.0" name="position"/> - <par float="4.0" name="turnspeed"/> - <par float="4.0" name="returnspeed"/> - <par float="0.00012" name="suspensionsoftness"/> + <par float="8.0" name="turnspeed"/> + <par float="8.0" name="returnspeed"/> + <par float="0.00015" name="suspensionsoftness"/> <par float="0.1" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> - <par float="0.5" name="enginepower"/> + <par float="0.6" name="enginepower"/> <par float="0.0" name="leftsteersensitivity"/> <par float="0.0" name="rightsteersensitivity"/> <par float="1.15" name="friction"/> Modified: trunk/ioData/weapons/ffar/world =================================================================== --- trunk/ioData/weapons/ffar/world 2008-01-29 11:25:51 UTC (rev 1168) +++ trunk/ioData/weapons/ffar/world 2008-02-14 00:14:53 UTC (rev 1169) @@ -20,6 +20,7 @@ <shader> <file>/shader/specular/light_spec_bumpmap.xml</file> </shader> + <shader><file>/shader/ambient.xml</file></shader> </shaders> <textures> <texture name="ffarmsl.jpg"> Modified: trunk/ioData/weapons/flamer/world =================================================================== --- trunk/ioData/weapons/flamer/world 2008-01-29 11:25:51 UTC (rev 1168) +++ trunk/ioData/weapons/flamer/world 2008-02-14 00:14:53 UTC (rev 1169) @@ -20,6 +20,7 @@ <shader> <file>/shader/specular/light_spec_bumpmap.xml</file> </shader> + <shader><file>/shader/ambient.xml</file></shader> </shaders> <textures> <texture name='flamer.png'> Modified: trunk/ioData/weapons/minelayer/world =================================================================== --- trunk/ioData/weapons/minelayer/world 2008-01-29 11:25:51 UTC (rev 1168) +++ trunk/ioData/weapons/minelayer/world 2008-02-14 00:14:53 UTC (rev 1169) @@ -12,6 +12,7 @@ <shader> <file>/shader/specular/light_spec_bumpmap.xml</file> </shader> + <shader><file>/shader/ambient.xml</file></shader> </shaders> <textures> <texture name="mine.jpg"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cf...@us...> - 2008-01-29 11:25:49
|
Revision: 1168 http://automanic.svn.sourceforge.net/automanic/?rev=1168&view=rev Author: cfraz89 Date: 2008-01-29 03:25:51 -0800 (Tue, 29 Jan 2008) Log Message: ----------- work Modified Paths: -------------- trunk/celstart.cfg trunk/ioData/menus/ioJoinGame.py trunk/ioData/vehicles/coyote/entities_world Modified: trunk/celstart.cfg =================================================================== --- trunk/celstart.cfg 2008-01-28 04:27:53 UTC (rev 1167) +++ trunk/celstart.cfg 2008-01-29 11:25:51 UTC (rev 1168) @@ -22,6 +22,8 @@ System.Plugins.iSndSysLoader = crystalspace.sndsys.element.loader System.Plugins.iSndSysRenderer = crystalspace.sndsys.renderer.software +System.Plugins.iMovieRecorder = crystalspace.utilities.movierecorder + System.Plugins.iCelConsole = cel.celconsole System.Plugins.iCelPlLayer = cel.physicallayer System.Plugins.iCelPersistence = cel.persistence.classic @@ -58,4 +60,4 @@ Outlaws.Keys.HUD.Hide = h Outlaws.MasterServer.Address = http://www.interstateoutlaws.com/masterserver -Outlaws.Updates.Address = http://www.interstateoutlaws.com/updates \ No newline at end of file +Outlaws.Updates.Address = http://www.interstateoutlaws.com/updates Modified: trunk/ioData/menus/ioJoinGame.py =================================================================== --- trunk/ioData/menus/ioJoinGame.py 2008-01-28 04:27:53 UTC (rev 1167) +++ trunk/ioData/menus/ioJoinGame.py 2008-01-29 11:25:51 UTC (rev 1168) @@ -101,7 +101,7 @@ gamename, self.gameserver = self.databin.get('gameserver') self.net = Entities['ioNetHelper'].Behaviour - netcl = Entities[ioDataBin.Get('socketent')] + netcl = Entities[self.databin.get('socketent')] pars = parblock({'server' : cPickle.dumps(self.gameserver, 0)}) netcl.Behaviour.SendMessage('setserver', None, pars) @@ -151,14 +151,14 @@ def Garage_click(self, pc, args): #Now the garage knows where to return to if we click here - ioDataBin.Store('lastmenu', (self.entity.Name, self.entity.Behaviour.Name), True) + self.databin.store('lastmenu', (self.entity.Name, self.entity.Behaviour.Name)) garage = CreateEntity('ioGarage', self.blpython, 'ioGarage') RemoveEntity(self.entity) #Join the game! def Launch_click(self, pc, args): #Now the server screen knows where to return to if we click here - ioDataBin.Store('lastmenu', (self.entity.Name, self.entity.Behaviour.Name), True) + self.databin.store('lastmenu', (self.entity.Name, self.entity.Behaviour.Name)) self.inputs.deactivateAll() name = celBillboard(self.nameinp).text if not name: Modified: trunk/ioData/vehicles/coyote/entities_world =================================================================== --- trunk/ioData/vehicles/coyote/entities_world 2008-01-28 04:27:53 UTC (rev 1167) +++ trunk/ioData/vehicles/coyote/entities_world 2008-01-29 11:25:51 UTC (rev 1168) @@ -15,7 +15,7 @@ <propclass name="pcobject.mesh.deform"> <property name="deformfactor" float="50.0" /> <property name="noise" float="0.1" /> - <property name="maxdeform" float="0.075" /> + <property name="maxdeform" float="0.15" /> <property name="radius" float="0.85" /> </propclass> <propclass name="pctools.properties"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cf...@us...> - 2008-01-28 04:27:49
|
Revision: 1167 http://automanic.svn.sourceforge.net/automanic/?rev=1167&view=rev Author: cfraz89 Date: 2008-01-27 20:27:53 -0800 (Sun, 27 Jan 2008) Log Message: ----------- added missing textures Modified Paths: -------------- trunk/ioData/client/ioBotController.py trunk/ioData/client/ioClient.py trunk/ioData/client/ioEntityManagerClient.py trunk/ioData/client/ioNetClient.py trunk/ioData/client/ioNetGameClient.py trunk/ioData/effects/enginesmoke.xml trunk/ioData/gametypes/dm/ioDmStats.py trunk/ioData/gametypes/dm/ioGameDm.py trunk/ioData/gametypes/dm/ioGameDmCl.py trunk/ioData/gametypes/ioGameBase.py trunk/ioData/gametypes/ioGameBaseCl.py trunk/ioData/gametypes/ioStatsBase.py trunk/ioData/menus/ioAutoUpdater.py trunk/ioData/menus/ioGameMenu.py trunk/ioData/menus/ioGameSelect.py trunk/ioData/menus/ioGarage.py trunk/ioData/menus/ioHostGame.py trunk/ioData/menus/ioJoinGame.py trunk/ioData/menus/ioLobbyChat.py trunk/ioData/menus/ioMainMenu.py trunk/ioData/menus/ioOptionsScreen.py trunk/ioData/menus/ioServerScreen.py trunk/ioData/menus/ioServerSelect.py trunk/ioData/scripts/ioDataBin.py trunk/ioData/scripts/ioInit.py trunk/ioData/scripts/ioNetHelper.py trunk/ioData/scripts/ioNetworkEnt.py trunk/ioData/scripts/ioNetworkEntBase.py trunk/ioData/scripts/ioNetworkEntCl.py trunk/ioData/server/game/ioEntityManager.py trunk/ioData/server/ioServerBase.py trunk/ioData/server/lobby/ioLobbyServer.py trunk/ioData/vehicles/coyote/world trunk/ioData/vehicles/ioVehicle.py trunk/ioData/vehicles/ioVehicleBase.py trunk/ioData/weapons/ffar/ioFFAR.py trunk/ioData/weapons/ffar/rocketdirtfly.xml Added Paths: ----------- trunk/ioData/maps/garage/textures/sand-n.png trunk/ioData/textures/blank-normalmap.png Modified: trunk/ioData/client/ioBotController.py =================================================================== --- trunk/ioData/client/ioBotController.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/client/ioBotController.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -4,7 +4,8 @@ def __init__(self, celEntity): self.entity = celEntity timer = celTimer(self.entity) - timer.WakeUp(200, True) + timer.WakeUp(200, True, 'steer') + timer.WakeUp(2000, True, 'checktargets') self.bot = None self.targetent = None self.targetmesh = None @@ -12,7 +13,8 @@ self.accelerating = False self.shooting = False self.steering = 0 - + self.entmgr = Entities['ioEntMgrCl'] + #Set the bot with which we are to control def setcontrol(self, pc, args): self.bot = args[parid('entity')] @@ -20,38 +22,56 @@ #The bot has changed targets def settarget(self, pc, args): - self.targetname = args[parid('name')] + targetname = args[parid('name')] + self.target(targetname) + + def target(self, targetname): + self.targetname = targetname if self.targetname != '': self.targetent = Entities[self.targetname] if self.targetent: self.targetmesh = celMesh(self.targetent) - def pctimer_wakeup(self, pc, args): + #Make sure we're heading towards our target + def pctimer_steer(self, pc, args): if self.bot: #Start accelerating if we arent already if not self.accelerating: self.bot.Behaviour.SendMessage('pccommandinput_accelerate1', None, args) self.accelerating = True - ##Try to pick a target - if not self.targetent: - self.bot.Behaviour.SendMessage('pccommandinput_target1', None, args) - else: - if self.targetent: - if self.targetmesh.Mesh: - targetpos = self.targetmesh.Mesh.GetMovable().GetPosition() - reltargetpos = self.botmesh.Mesh.GetMovable().GetTransform().Other2This(targetpos) - if reltargetpos.x > 0: - if self.steering != -1: - self.bot.Behaviour.SendMessage('pccommandinput_steerleft1', None, args) - self.steering = -1 - else: - if self.steering != 1: - self.bot.Behaviour.SendMessage('pccommandinput_steerright1', None, args) - self.steering = 1 - ##Fire in bursts: - if not self.shooting: - self.bot.Behaviour.SendMessage('pccommandinput_shoot1', None, args) - self.shooting = True - else: - self.bot.Behaviour.SendMessage('pccommandinput_shoot0', None, args) - self.shooting = False \ No newline at end of file + if self.targetent: + if self.targetmesh.Mesh: + targetpos = self.targetmesh.Mesh.GetMovable().GetPosition() + reltargetpos = self.botmesh.Mesh.GetMovable().GetTransform().Other2This(targetpos) + if reltargetpos.x > 0: + if self.steering != -1: + self.bot.Behaviour.SendMessage('pccommandinput_steerleft1', None, args) + self.steering = -1 + else: + if self.steering != 1: + self.bot.Behaviour.SendMessage('pccommandinput_steerright1', None, args) + self.steering = 1 + + #Work out who's nearest to us, and go for them + def pctimer_checktargets(self, pc, args): + mindist = 9999.0 + minent = '' + for entname in self.entmgr.Behaviour.getEntities(): + if entname != self.bot.Name: + ent = Entities[entname] + mesh = celMesh(ent).Mesh + pos = mesh.GetMovable().GetPosition() + diff = self.botmesh.Mesh.GetMovable().GetPosition() - pos + dist = diff.Norm() + if dist < mindist: + mindist = dist + minent = entname + self.target(minent) + + #Fire in bursts: + if not self.shooting: + self.bot.Behaviour.SendMessage('pccommandinput_shoot1', None, args) + self.shooting = True + else: + self.bot.Behaviour.SendMessage('pccommandinput_shoot0', None, args) + self.shooting = False \ No newline at end of file Modified: trunk/ioData/client/ioClient.py =================================================================== --- trunk/ioData/client/ioClient.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/client/ioClient.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -1,9 +1,7 @@ from pycel import * -import ioDataBin import cPickle import ioLoader -import ioNetHelper #client loads the map, and runs its own physics world. class ioClient: @@ -15,7 +13,7 @@ self.idData = getid('cel.parameter.data') self.netclient = Entities['ioNetClient'] - self.net = ioNetHelper.ioNetHelper() + self.net = Entities['ioNetHelper'].Behaviour self.playername = Config.GetStr('Outlaws.Player.Name') #The password will actually be set properly through setpassword message @@ -69,8 +67,9 @@ #Get the servers sending info to us def serverInit(self): - self.lobbyname, self.lobbyserver = ioDataBin.Get('lobbyserver', True) - self.gamename, self.gameserver = ioDataBin.Get('gameserver', True) + databin = Entities['ioDataBin'] + self.lobbyname, self.lobbyserver = databin.Behaviour.get('lobbyserver') + self.gamename, self.gameserver = databin.Behaviour.get('gameserver') #Make the connecting screen self.serverscr = CreateEntity('ioServerScreen', self.blpython, 'ioServerScreen') Modified: trunk/ioData/client/ioEntityManagerClient.py =================================================================== --- trunk/ioData/client/ioEntityManagerClient.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/client/ioEntityManagerClient.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -4,7 +4,6 @@ import ioNetworkEntCl import ioLoader -import ioNetHelper #an entity which keeps track of the positions of managed entities, #plus anything extra they need. this is the client version. @@ -16,7 +15,7 @@ self.entities = [] self.maxbots = 2 self.bots = 0 - self.net = ioNetHelper.ioNetHelper() + self.net = Entities['ioNetHelper'].Behaviour def authok(self, pc, args): pass @@ -94,8 +93,9 @@ #Pick a random vehicle, and extract its template #vehicleinfo = random.choice(vehicles) - vehicleinfo = filter(lambda v: v['Codename'] == 'Coyote', vehicles)[0] - vehicle = ioNetworkEntCl.makeEntity(vehicleinfo['Codename'], 'ioBot' + str(self.bots)) + vname = random.choice(['Coyote']) + vehicleinfo = filter(lambda v: v['Codename'] == vname, vehicles)[0] + vehicle = ioNetworkEntCl.makeEntity(vehicleinfo['Codename'], 'Bot ' + str(self.bots)) mesh = celMesh(vehicle) mesh.MoveMesh(Engine.GetSectors().Get(0), mesh.Mesh.GetMovable().GetPosition()) @@ -131,4 +131,7 @@ RemoveEntity(ent) def makespectator(self, pc, args): - pass \ No newline at end of file + pass + + def getEntities(self): + return self.entities \ No newline at end of file Modified: trunk/ioData/client/ioNetClient.py =================================================================== --- trunk/ioData/client/ioNetClient.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/client/ioNetClient.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -7,7 +7,6 @@ import ioDispatcher import ioNetPacket import ioNetHelper -import ioDataBin #Is the transport entity to the server for clients. class ioNetClient: @@ -16,11 +15,12 @@ self.dispatcher = ioDispatcher.ioDispatcher() self.entity = celEntity self.blpython = BehaviourLayers['blpython'] + self.databin = Entities['ioDataBin'].Behaviour self.timer = celTimer(self.entity) self.timer.WakeUpFrame(0) self.timer.WakeUp(500, True) self.server = None - ioDataBin.Store('socketent', self.entity.Name) + self.databin.store('socketent', self.entity.Name) self.dispatcher.exceptions = ['gameinfo', 'discover', 'dldata', 'dldone'] #We test lag this way, by waiting for a timer event @@ -32,12 +32,7 @@ self.dispatcher.setsockopt(socket.SOL_IP, socket.IP_MULTICAST_LOOP, 1) #An entity requested to send something - def senddata(self, pc, args): - entity = args[parid('entity')] - message = args[parid('message')] - data = cPickle.loads(args[parid('data')]) - destination = cPickle.loads(args[parid('destination')]) - important = args[parid('important')] + def sendData(self, entity, message, data, destination, important): if destination is None: destination = self.server packet = ioNetPacket.ioNetPacket() Modified: trunk/ioData/client/ioNetGameClient.py =================================================================== --- trunk/ioData/client/ioNetGameClient.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/client/ioNetGameClient.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -2,10 +2,8 @@ import random import Menu -import ioDataBin import ioLoader import ioNetworkEnt -import ioNetHelper import ioScroller #Handles miscellaneous network/gameplay stuff like chat and loading the map @@ -15,6 +13,7 @@ def __init__(self, celEntity): self.entity = celEntity self.blpython = BehaviourLayers['blpython'] + self.databin = Entities['ioDataBin'].Behaviour self.playername = Config.GetStr('Outlaws.Player.Name') self.playerinp = None self.fconst = Menu.GetFontConstant() @@ -22,7 +21,7 @@ self.client = Entities['ioCl'] self.mapname = '' self.frames = 0 - self.net = ioNetHelper.ioNetHelper() + self.net = Entities['ioNetHelper'].Behaviour self.menu = Menu.ioMenu(self.entity) timsg = 'textinput_clicked' @@ -150,7 +149,7 @@ self.net.sendData('ioEntMgr', 'fillents', [], None) - if not ioDataBin.Get('mpgame'): + if not self.databin.get('mpgame'): #Used for debugging damage system entmgr = Entities['ioEntMgrCl'] entmgr.Behaviour.SendMessage('fillbots', None, args) Modified: trunk/ioData/effects/enginesmoke.xml =================================================================== --- trunk/ioData/effects/enginesmoke.xml 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/effects/enginesmoke.xml 2008-01-28 04:27:53 UTC (rev 1167) @@ -8,9 +8,10 @@ </texture> </textures> <materials> - <material name='smoke-normed-dark.png'> + <material name='esmoke'> <texture>smoke-normed.png</texture> - <shader type="standard">particle_basic_dark</shader> + <shader type="diffuse">particle_basic_dark</shader> + <shader type="ambient">*null</shader> </material> </materials> <meshfact name="engineSmoke"> @@ -21,14 +22,14 @@ <mixmode> <alpha/> </mixmode> - <material>smoke-normed-dark.png</material> + <material>esmoke</material> <particlesize x="0.25" y="0.25" /> <sortmode>dot</sortmode> <transformmode>localemitter</transformmode> <emitter type="sphere"> <emissionrate>60</emissionrate> <mass min="1" max="5" /> - <radius>0.2</radius> + <radius>0.4</radius> <uniformvelocity /> <initialvelocity x="0" y="0.65" z="0.4" /> <initialttl min="0.8" max="1.0" /> Modified: trunk/ioData/gametypes/dm/ioDmStats.py =================================================================== --- trunk/ioData/gametypes/dm/ioDmStats.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/gametypes/dm/ioDmStats.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -1,11 +1,9 @@ from pycel import * -import cPickle from ioStatsBase import * import ioLoader import Menu import ioScroller -import ioDataBin #DM gameover screen class ioDmStats (ioStatsBase): Modified: trunk/ioData/gametypes/dm/ioGameDm.py =================================================================== --- trunk/ioData/gametypes/dm/ioGameDm.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/gametypes/dm/ioGameDm.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -1,6 +1,5 @@ from pycel import * from ioGameBase import * -import ioNetHelper class ioGameDm (ioGameBase): api_version = 2 Modified: trunk/ioData/gametypes/dm/ioGameDmCl.py =================================================================== --- trunk/ioData/gametypes/dm/ioGameDmCl.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/gametypes/dm/ioGameDmCl.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -1,7 +1,6 @@ from pycel import * from ioGameBaseCl import * import Menu -import ioNetHelper import cPickle class ioGameDmCl (ioGameBaseCl): @@ -55,6 +54,8 @@ self.killmessage('Killed by', killedby) self.players[killedby][0] = score self.pdisps[killedby].text = '%s %d' % (killedby, score) + if killedby == 'map' or killedby == '0': + killedby = 'himself' pars = parblock({'message' : '%s was killed by %s' % (killed, killedby)}) self.netgamecl.Behaviour.SendMessage('logevent', None, pars) self.sortDisps() Modified: trunk/ioData/gametypes/ioGameBase.py =================================================================== --- trunk/ioData/gametypes/ioGameBase.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/gametypes/ioGameBase.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -1,6 +1,5 @@ from pycel import * import cPickle -import ioNetHelper class ioGameBase: api_version = 2 @@ -20,7 +19,7 @@ self.ticks = Clock.GetCurrentTicks() self.spawnwatches = {} - self.net = ioNetHelper.ioNetHelper() + self.net = Entities['ioNetHelper'].Behaviour #Run through all watched dead players, and see if they are able to respawn def pctimer_wakeup(self, pc, args): Modified: trunk/ioData/gametypes/ioGameBaseCl.py =================================================================== --- trunk/ioData/gametypes/ioGameBaseCl.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/gametypes/ioGameBaseCl.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -4,7 +4,6 @@ import Menu import ioLoader -import ioNetHelper class ioGameBaseCl: api_version = 2 @@ -20,7 +19,7 @@ #We don't want to show until asked self.visible = False - self.net = ioNetHelper.ioNetHelper() + self.net = Entities['ioNetHelper'].Behaviour self.net.sendData('ioGmTp', 'getplayers', []) Modified: trunk/ioData/gametypes/ioStatsBase.py =================================================================== --- trunk/ioData/gametypes/ioStatsBase.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/gametypes/ioStatsBase.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -4,7 +4,6 @@ import ioLoader import Menu import ioScroller -import ioDataBin #The base stats screen which is shown when a game is finished class ioStatsBase: @@ -16,6 +15,7 @@ self.blpython = BehaviourLayers['blpython'] self.fconst = Menu.GetFontConstant() self.fcolor = Menu.GetFontColor() + self.databin = Entities['ioDataBin'].Behaviour frame = celAddBillboard(self.entity).Billboard frame.SetMaterialName('window-frame') @@ -35,7 +35,7 @@ self.buttons = Menu.ioMenu(self.entity) #self.buttons.addElement('<<', 'Back_click', [42500, 42500], [6000, 6000], self.fconst * 0.7, 'back-bg') - mpgame = ioDataBin.Get('mpgame') + mpgame = self.databin.get('mpgame') if mpgame: txt = 'Return to Lobby' msg = 'Lobby_Click' @@ -47,7 +47,7 @@ def leave(self): netgameclient = Entities['ioNetMgrCl'] if netgameclient: - netgameclient.Behaviour.SendMessage('leavegame', None, args) + netgameclient.Behaviour.SendMessage('leavegame', None, celGenericParameterBlock(0)) RemoveEntity(self.entity) def Lobby_Click(self, pc, args): @@ -68,6 +68,6 @@ def Back_click(self, pc, args): netgame = Entities['ioNetMgrCl'] netgame.Behaviour.SendMessage('leavegame', None, celGenericParameterBlock(0)) - name, behaviour = ioDataBin.Get('lastmenu', True) + name, behaviour = self.databin.get('lastmenu', True) gamesel = CreateEntity(name, self.blpython, behaviour) RemoveEntity(self.entity) \ No newline at end of file Added: trunk/ioData/maps/garage/textures/sand-n.png =================================================================== (Binary files differ) Property changes on: trunk/ioData/maps/garage/textures/sand-n.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/ioData/menus/ioAutoUpdater.py =================================================================== --- trunk/ioData/menus/ioAutoUpdater.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/menus/ioAutoUpdater.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -4,7 +4,6 @@ import sys import ioInit -import ioDataBin import ioLoader import ioBaseInit import Menu @@ -254,7 +253,7 @@ self.desc.scrollup() def destruct(self, pc, args): - ioDataBin.Store('updateskipped', self.updateskipped) + Entities['ioDataBin'].Behaviour.store('updateskipped', self.updateskipped) self.killdescwindow() self.menu.clear() ioinit = Entities['ioInit'] Modified: trunk/ioData/menus/ioGameMenu.py =================================================================== --- trunk/ioData/menus/ioGameMenu.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/menus/ioGameMenu.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -4,8 +4,6 @@ import ioInit import ioLoader -import ioDataBin -import ioNetHelper #The menu that is opened when the user presses esc ingame class ioGameMenu: @@ -16,7 +14,8 @@ self.blpython = BehaviourLayers['blpython'] self.fconst = Menu.GetFontConstant() self.fcolor = Menu.GetFontColor() - self.net = ioNetHelper.ioNetHelper() + self.net = Entities['ioNetHelper'].Behaviour + self.databin = Entities['ioDataBin'].Behaviour self.bg = celCreateBillboard(pl, self.entity).Billboard self.bg.SetMaterialName('half-black') @@ -33,7 +32,7 @@ def makeButtons(self): self.menu = Menu.ioMenu(self.entity) self.menu.addElement('Return to Game', 'Back_click', [0, 0], [60000,10000], self.fconst, 'button-bg') - if ioDataBin.Get('mpgame'): + if self.databin.get('mpgame'): self.menu.addElement('Return to Lobby', 'Lobby_click', [0, 0], [60000,10000], self.fconst, 'button-bg') self.menu.addElement('Exit to Menu', 'Menu_click', [0, 0], [60000,10000], self.fconst, 'button-bg') self.menu.addElement('Exit Interstate Outlaws', 'Exit_click', [0, 0], [60000,10000], self.fconst, 'button-bg') @@ -80,7 +79,7 @@ def pctimer_poll_wait(self, pc, args): self.timer.Clear() if self.serverfound: - if ioDataBin.Get('mpgame'): + if self.databin.get('mpgame'): self.menu.clear() label1 = 'You are currently hosting a game' label2 = 'Would you like to stop it?' Modified: trunk/ioData/menus/ioGameSelect.py =================================================================== --- trunk/ioData/menus/ioGameSelect.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/menus/ioGameSelect.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -4,8 +4,6 @@ import ioInit import ioScroller -import ioDataBin -import ioNetHelper class ioGameSelect: api_version = 2 @@ -17,6 +15,7 @@ self.fcolor = Menu.GetFontColor() self.playername = Config.GetStr('Outlaws.Player.Name') self.chatent = 'ioGameChat' + self.databin = Entities['ioDataBin'].Behaviour #Used for compatibility testing self.compatversion = Config.GetStr('Outlaws.Version.Compat') @@ -73,13 +72,13 @@ pcinput = celCommandInput(self.entity) pcinput.Bind('esc', 'exit') - lobbyname, self.lobbyserver = ioDataBin.Get('lobbyserver', True) + lobbyname, self.lobbyserver = self.databin.get('lobbyserver') self.servers = [] self.servernames = [] - self.net = ioNetHelper.ioNetHelper() + self.net = Entities['ioNetHelper'].Behaviour - netcl = Entities[ioDataBin.Get('socketent')] + netcl = Entities[self.databin.get('socketent')] pars = parblock({'server' : cPickle.dumps(self.lobbyserver, 0)}) netcl.Behaviour.SendMessage('setserver', None, pars) @@ -226,19 +225,19 @@ def Garage_click(self, pc, args): #Now the garage knows where to return to if we click here - ioDataBin.Store('lastmenu', (self.entity.Name, self.entity.Behaviour.Name), True) + self.databin.store('lastmenu', (self.entity.Name, self.entity.Behaviour.Name)) garage = CreateEntity('ioGarage', self.blpython, 'ioGarage') RemoveEntity(self.entity) def Host_click(self, pc, args): #Now the hostgame knows where to return to if we click here - ioDataBin.Store('lastmenu', (self.entity.Name, self.entity.Behaviour.Name), True) + self.databin.store('lastmenu', (self.entity.Name, self.entity.Behaviour.Name)) hg = CreateEntity('ioHostGame', self.blpython, 'ioHostGame') RemoveEntity(self.entity) def Join_click(self, pc, args): server = self.servers[self.scroller.selectedindex] name = self.servernames[self.scroller.selectedindex] - ioDataBin.Store('gameserver', (name, server), True) + self.databin.store('gameserver', (name, server)) jg = CreateEntity('ioJoinGame', self.blpython, 'ioJoinGame') RemoveEntity(self.entity) \ No newline at end of file Modified: trunk/ioData/menus/ioGarage.py =================================================================== --- trunk/ioData/menus/ioGarage.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/menus/ioGarage.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -4,7 +4,6 @@ import ioLoader import ioNetworkEntCl import ioScroller -import ioDataBin import os class ioGarage: @@ -18,6 +17,7 @@ self.timer = celTimer(self.entity) self.timer.WakeUpFrame(2) self.frames = 0 + self.databin = Entities['ioDataBin'].Behaviour #Now we start loading, and delete the splash screen. it will clear when loading is finished def pctimer_wakeupframe(self, pc, args): @@ -321,7 +321,7 @@ Config.SetStr('Outlaws.Player.' + mount, weapon) Config.Save() - returnname, returnbehaviour = ioDataBin.Get('lastmenu', True) + returnname, returnbehaviour = self.databin.get('lastmenu') #Recreate the entity which called the garage returnent = CreateEntity(returnname, self.blpython, returnbehaviour) if self.selectedvehicle: Modified: trunk/ioData/menus/ioHostGame.py =================================================================== --- trunk/ioData/menus/ioHostGame.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/menus/ioHostGame.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -5,7 +5,6 @@ import ioInit import ioBaseInit -import ioDataBin import ioLoader import Menu import ioScroller @@ -22,6 +21,8 @@ self.mapinfo = ioLoader.scanDir('maps') self.gameinfo = ioLoader.scanDir('gametypes') + self.databin = Entities['ioDataBin'].Behaviour + bg = celAddBillboard(self.entity).Billboard bg.SetMaterialName('hostjoin-bg') bg.SetPosition(0,0) @@ -108,13 +109,13 @@ pcinput.Bind('esc', 'exit') #Check if we are going single-player or multiplayer - self.mp = ioDataBin.Get('mpgame') + self.mp = self.databin.get('mpgame') if not self.mp: self.lobbyserver = (None, None) self.lobbyname = None - ioDataBin.Store('lobbyserver', (self.lobbyname, self.lobbyserver), True) + self.databin.store('lobbyserver', (self.lobbyname, self.lobbyserver)) else: - self.lobbyname, self.lobbyserver = ioDataBin.Get('lobbyserver', True) + self.lobbyname, self.lobbyserver = self.databin.get('lobbyserver') def pccommandinput_exit1(self, pc, args): ioInit.exitgame() @@ -181,9 +182,9 @@ #else: #Jump straight into the game data = (name, ('127.0.0.1', 1828)) - ioDataBin.Store('gameserver', data, True) + self.databin.store('gameserver', data) #Now the server screen knows where to return to if we click here - ioDataBin.Store('lastmenu', (self.entity.Name, self.entity.Behaviour.Name), True) + self.databin.store('lastmenu', (self.entity.Name, self.entity.Behaviour.Name)) #check we don't have an old client still hanging around, first client = pl.FindEntity('ioCl') if client: Modified: trunk/ioData/menus/ioJoinGame.py =================================================================== --- trunk/ioData/menus/ioJoinGame.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/menus/ioJoinGame.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -6,8 +6,6 @@ import ioLoader import Menu import ioScroller -import ioDataBin -import ioNetHelper #The screen which lets you choose if you want to join a game before actually doing it. class ioJoinGame: @@ -21,6 +19,7 @@ self.lobbyserver = None self.gameserver = [None, None] self.gamedata = None + self.databin = Entities['ioDataBin'].Behaviour bg = celAddBillboard(self.entity).Billboard bg.SetMaterialName('hostjoin-bg') @@ -98,10 +97,10 @@ pcinput = celCommandInput(self.entity) pcinput.Bind('esc', 'exit') - lobbyname, self.lobbyserver = ioDataBin.Get('lobbyserver', True) - gamename, self.gameserver = ioDataBin.Get('gameserver', True) + lobbyname, self.lobbyserver = self.databin.get('lobbyserver') + gamename, self.gameserver = self.databin.get('gameserver') - self.net = ioNetHelper.ioNetHelper() + self.net = Entities['ioNetHelper'].Behaviour netcl = Entities[ioDataBin.Get('socketent')] pars = parblock({'server' : cPickle.dumps(self.gameserver, 0)}) netcl.Behaviour.SendMessage('setserver', None, pars) Modified: trunk/ioData/menus/ioLobbyChat.py =================================================================== --- trunk/ioData/menus/ioLobbyChat.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/menus/ioLobbyChat.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -1,8 +1,6 @@ from pycel import * import cPickle -import ioNetHelper -import ioDataBin import ioScroller import Menu @@ -12,8 +10,9 @@ def __init__(self, celEntity): self.entity = celEntity - self.net = ioNetHelper.ioNetHelper() - lobbyname, self.lobbyserver = ioDataBin.Get('lobbyserver', True) + self.net = Entities['ioNetHelper'].Behaviour + self.databin = Entities['ioDataBin'].Behaviour + lobbyname, self.lobbyserver = self.databin.get('lobbyserver') #The list of messages on the left self.msgscroller = ioScroller.ioScroller(self.entity, (43000, 196000), (163900, 57500), '_msg') #The list of clients on the right Modified: trunk/ioData/menus/ioMainMenu.py =================================================================== --- trunk/ioData/menus/ioMainMenu.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/menus/ioMainMenu.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -4,7 +4,6 @@ import Menu import ioInit import ioLoader -import ioDataBin class ioMainMenu: api_version = 2 @@ -12,6 +11,7 @@ def __init__(self,celEntity): self.entity = celEntity self.blpython = BehaviourLayers['blpython'] + self.databin = Entities['ioDataBin'].Behaviour bg = celCreateBillboard(pl, self.entity) bg.materialnamefast = 'menu_bg' @@ -28,7 +28,7 @@ ys = 16000 melee = celBillboard(self.menu.addElement('', 'Melee_click', [0, 0], [xs, ys], 18, 'melee')) #Don't let them play multi melee if they haven't updated - if ioDataBin.Get('updateskipped'): + if self.databin.get('updateskipped'): mmat = '' else: mmat = 'multimelee' @@ -55,21 +55,21 @@ def Melee_click(self, pc, args): #Set the properties on the databin so the hostgame screen knows - ioDataBin.Store('lastmenu', (self.entity.Name, self.entity.Behaviour.Name), True) + self.databin.store('lastmenu', (self.entity.Name, self.entity.Behaviour.Name)) #Set the properties on the databin so the hostgame screen knows - ioDataBin.Store('mpgame', False) + self.databin.store('mpgame', False) hg = CreateEntity('ioHostGame', self.blpython, 'ioHostGame') RemoveEntity(self.entity) def MultiMelee_click(self, pc, args): #Set the properties on the databin so the hostgame screen knows - ioDataBin.Store('mpgame', True) + self.databin.store('mpgame', True) CreateEntity('ioServerSelect', self.blpython, 'ioServerSelect') RemoveEntity(self.entity) def Garage_click(self, pc, args): #Now the garage knows where to return to if we click here - ioDataBin.Store('lastmenu', (self.entity.Name, self.entity.Behaviour.Name), True) + self.databin.store('lastmenu', (self.entity.Name, self.entity.Behaviour.Name)) garage = CreateEntity('ioGarage', self.blpython, 'ioGarage') RemoveEntity(self.entity) Modified: trunk/ioData/menus/ioOptionsScreen.py =================================================================== --- trunk/ioData/menus/ioOptionsScreen.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/menus/ioOptionsScreen.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -6,7 +6,6 @@ import Menu import ioInit import ioScroller -import ioDataBin #The options screen which containers video options + others (later, anyway) class ioOptionsScreen: Modified: trunk/ioData/menus/ioServerScreen.py =================================================================== --- trunk/ioData/menus/ioServerScreen.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/menus/ioServerScreen.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -4,7 +4,6 @@ import ioLoader import Menu import ioScroller -import ioDataBin class ioServerScreen: api_version = 2 @@ -15,6 +14,7 @@ self.blpython = BehaviourLayers['blpython'] self.fconst = Menu.GetFontConstant() self.fcolor = Menu.GetFontColor() + self.databin = Entities['ioDataBin'].Behaviour self.gamedata = None bg = celAddBillboard(self.entity).Billboard @@ -68,7 +68,7 @@ def Back_click(self, pc, args): netgame = Entities['ioNetMgrCl'] netgame.Behaviour.SendMessage('leavegame', None, celGenericParameterBlock(0)) - name, behaviour = ioDataBin.Get('lastmenu', True) + name, behaviour = self.databin.get('lastmenu') gamesel = CreateEntity(name, self.blpython, behaviour) RemoveEntity(self.entity) Modified: trunk/ioData/menus/ioServerSelect.py =================================================================== --- trunk/ioData/menus/ioServerSelect.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/menus/ioServerSelect.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -4,11 +4,10 @@ import socket import ioInit -import ioNetHelper import ioDownloader import Menu import ioScroller -import ioDataBin +import ioNetHelper class ioServerSelect: api_version = 2 @@ -20,8 +19,9 @@ self.blpython = BehaviourLayers['blpython'] self.fconst = Menu.GetFontConstant() self.fcolor = Menu.GetFontColor() + self.databin = Entities['ioDataBin'].Behaviour - self.net = ioNetHelper.ioNetHelper() + self.net = Entities['ioNetHelper'].Behaviour bg = celAddBillboard(self.entity).Billboard bg.SetMaterialName('server-bg') @@ -170,8 +170,7 @@ name = self.servernames[self.scroller.selectedindex] #Write out the selected settings - ioDataBin.Store('lobbyserver', (name, server), True) - print name, server + self.databin.store('lobbyserver', (name, server)) gamesel = CreateEntity('ioGameSelect', self.blpython, 'ioGameSelect') self.entity.PropertyClassList.RemoveAll() RemoveEntity(self.entity) Modified: trunk/ioData/scripts/ioDataBin.py =================================================================== --- trunk/ioData/scripts/ioDataBin.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/scripts/ioDataBin.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -3,36 +3,17 @@ #This behaviour holds to store data between entities. It is used especially by the menus. # It optionally stores its values pickled. It is only to be used with the helper functions -def Store (key, data, pickle = False): - databin = pl.FindEntity('ioDataBin') - if not databin: - databin = CreateEntity('ioDataBin', BehaviourLayers['blpython'], 'ioDataBin') - if pickle: - data = cPickle.dumps(data, 0) - pars = parblock({'key' : key, 'value' : data}) - databin.Behaviour.SendMessage('setdata', None, pars) - -def Get(key, unpickle = False): - databin = pl.FindEntity('ioDataBin') - if not databin: - databin = CreateEntity('ioDataBin', BehaviourLayers['blpython'], 'ioDataBin') - pars = parblock({'key' : key}) - data = databin.Behaviour.SendMessage('getdata', None, pars) - if unpickle: - data = cPickle.loads(data) - return data - class ioDataBin: api_version = 2 def __init__(self, celEntity): self.entity = celEntity self.data = {} - def getdata(self, pc, args): - key = args[parid('key')] - return self.data[key] + def get(self, key): + if self.data.has_key(key): + return self.data[key] + else: + return None - def setdata(self, pc, args): - key = args[parid('key')] - value = args[parid('value')] + def store(self, key, value): self.data[key] = value \ No newline at end of file Modified: trunk/ioData/scripts/ioInit.py =================================================================== --- trunk/ioData/scripts/ioInit.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/scripts/ioInit.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -3,7 +3,6 @@ import os import socket -import ioDataBin #Any celstart app importing ioInit will now quit on control + C def exitapp(signal, frame): @@ -46,9 +45,15 @@ self.entity = celEntity registerclasses() + #Our data bin + self.databin = CreateEntity('ioDataBin', self.blpython, 'ioDataBin').Behaviour + #Make the net client which contains our socket CreateEntity('ioNetClient', self.blpython, 'ioNetClient') + #The interface to the net client + CreateEntity('ioNetHelper', self.blpython, 'ioNetHelper') + #Stop the app from hanging too long if the network is down socket.setdefaulttimeout(10) @@ -76,7 +81,7 @@ #If we haven't visited the garage before, do it now. visitedgarage = Config.GetBool('Outlaws.Garage.Visited', False) if not visitedgarage: - ioDataBin.Store('lastmenu', ('ioMainMenu', 'ioMainMenu'), True) + self.databin.store('lastmenu', ('ioMainMenu', 'ioMainMenu')) CreateEntity('ioGarage', self.blpython, 'ioGarage') else: CreateEntity('ioMainMenu', self.blpython, 'ioMainMenu') Modified: trunk/ioData/scripts/ioNetHelper.py =================================================================== --- trunk/ioData/scripts/ioNetHelper.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/scripts/ioNetHelper.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -1,43 +1,28 @@ from pycel import * import cPickle -import simplejson -import ioDataBin multicastip = '225.100.100.100' #A helper class which makes it easy to send data over the network through #an entity holding an ioDispatcher. class ioNetHelper: - def __init__(self): + api_version = 2 + def __init__(self, celEntity): + self.entity = celEntity + self.databin = Entities['ioDataBin'].Behaviour #The transport entity is the entity which holds our dispatcher. #We require that it is stored in the data bin - self.transportent = pl.FindEntity(ioDataBin.Get('socketent')) - self.clientaddrs = None + self.transportent = pl.FindEntity(self.databin.get('socketent')) #Sends a message to our transport to send data def sendData(self, entity, message, data, dest = None, important = True): - msgblock = {} - msgblock['entity'] = entity - msgblock['message'] = message - msgblock['data'] = cPickle.dumps(data, 0) - msgblock['destination'] = cPickle.dumps(dest, 0) - msgblock['important'] = important - pars = parblock(msgblock) if not self.transportent: - self.transportent = Entities[ioDataBin.Get('socketent')] - self.transportent.Behaviour.SendMessage('senddata', None, pars) - - #Fetch and store the list of client addresses from the transport entity - def updateClientAddrs(self): - pars = celGenericParameterBlock(0) - clients = self.transportent.Behaviour.SendMessage('getclientaddrs', None, pars) - self.clientaddrs = cPickle.loads(clients) + self.transportent = Entities[self.databin.get('socketent')] + self.transportent.Behaviour.sendData(entity, message,data, dest, important) #for use by server entities, send a message to all clients, except for one optional one def sendToClients(self, entity, message, data, source = None, important = True): - #if not self.clientaddrs: - self.updateClientAddrs() - for client in self.clientaddrs: + for client in self.transportent.Behaviour.getClientAddrs(): if source != client: self.sendData(entity, message, data, client, important) Modified: trunk/ioData/scripts/ioNetworkEnt.py =================================================================== --- trunk/ioData/scripts/ioNetworkEnt.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/scripts/ioNetworkEnt.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -1,7 +1,6 @@ from pycel import * import cPickle -import ioNetHelper from ioNetworkEntBase import * #Make the server version of an entity Modified: trunk/ioData/scripts/ioNetworkEntBase.py =================================================================== --- trunk/ioData/scripts/ioNetworkEntBase.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/scripts/ioNetworkEntBase.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -1,8 +1,5 @@ from pycel import * import cPickle - -import ioNetHelper - #Behaviour for a networked object class ioNetworkEntBase: @@ -19,7 +16,7 @@ self.ticks = 0 self.front = csVector3(0, 0, -1) self.codename = '' - self.net = ioNetHelper.ioNetHelper() + self.net = Entities['ioNetHelper'].Behaviour self.timer = celTimer(self.entity) ##Interpolate our rotation for 150ms Modified: trunk/ioData/scripts/ioNetworkEntCl.py =================================================================== --- trunk/ioData/scripts/ioNetworkEntCl.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/scripts/ioNetworkEntCl.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -1,7 +1,6 @@ from pycel import * import cPickle -import ioNetHelper from ioNetworkEntBase import * def makeEntity(codename, name): Modified: trunk/ioData/server/game/ioEntityManager.py =================================================================== --- trunk/ioData/server/game/ioEntityManager.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/server/game/ioEntityManager.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -2,7 +2,6 @@ import ioLoader import random import cPickle -import ioNetHelper import ioNetworkEnt #an entity which keeps track of the positions of managed entities, @@ -17,7 +16,7 @@ self.ents = {} self.gsrv = Entities['ioGSrv'] - self.net = ioNetHelper.ioNetHelper() + self.net = Entities['ioNetHelper'].Behaviour #A client is registering an entity def r_newent(self, pc, args): @@ -82,9 +81,7 @@ return cPickle.dumps(self.ents[ent][0]) #Get the next entity from a current one in our entity dict, for a given entity. Used for targetting systems - def getnextentity(self, pc, args): - source = args[getid('cel.parameter.source')] - current = args[getid('cel.parameter.current')] + def getNextEntity(self, source, current): entities = self.ents.keys() if len(entities) > 1: try: @@ -98,7 +95,6 @@ idx += 1 if idx > len(entities) - 1: idx = 0 - print entities[idx] return entities[idx] else: return '' \ No newline at end of file Modified: trunk/ioData/server/ioServerBase.py =================================================================== --- trunk/ioData/server/ioServerBase.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/server/ioServerBase.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -7,8 +7,6 @@ import ioDispatcher import ioInit import ioNetPacket -import ioNetHelper -import ioDataBin class ioReportingClient: def __init__(self, addr, name, ent): @@ -32,6 +30,8 @@ #The entity that we send chat messages to. This needs to be overridden in specific implementations. self.chatent = '' self.blpython = BehaviourLayers['blpython'] + self.databin = CreateEntity('ioDataBin', self.blpython, 'ioDataBin').Behaviour + self.net = CreateEntity('ioNetHelper', self.blpython, 'ioNetHelper').Behaviour self.timer = celTimer(self.entity) self.timer.WakeUpFrame(0) @@ -53,12 +53,11 @@ timer.WakeUp(500, True, 'packethandle') timer.WakeUp(3000, True, 'ping') - ioDataBin.Store('socketent', self.entity.Name) + self.databin.store('socketent', self.entity.Name) #We test lag this way, by waiting for a timer event self.fakelag = False self.lagsend = [] - self.net = ioNetHelper.ioNetHelper() #Handle the network que. also sleep to reduce cpu usage def pctimer_wakeupframe(self, pc, args): @@ -124,7 +123,6 @@ print 'New ' + typename + ' -', addr, name client = ioReportingClient(addr, name, entity) connectedlist.append(client) - self.net.updateClientAddrs() self.dispatcher.clients.append(addr) pars = parblock({typename : cPickle.dumps(addr), 'name' : name}) self.entity.Behaviour.SendMessage(typename + 'add', None, pars) @@ -155,7 +153,6 @@ for client in self.clients[:]: if client.addr == addr: self.clients.remove(client) - self.net.updateClientAddrs() self.dispatcher.clients.remove(addr) pars = parblock({'client' : cPickle.dumps(client.addr), 'name' : client.name}) self.entity.Behaviour.SendMessage('clientpop', None, pars) @@ -168,12 +165,7 @@ self.entity.Behaviour.SendMessage('serverpop', None, pars) #An entity requested to send something to somewhere. - def senddata(self, pc, args): - entity = args[parid('entity')] - message = args[parid('message')] - data = cPickle.loads(args[parid('data')]) - destination = cPickle.loads(args[parid('destination')]) - important = args[parid('important')] + def sendData(self, entity, message, data, destination, important): if not destination: print 'warning - no destination for packet', entity, message, data packet = ioNetPacket.ioNetPacket() @@ -247,8 +239,8 @@ self.net.sendToClients(self.chatent, 'msg', [name, msg]) #Return the list of our clients - def getclientaddrs(self, pc, args): - return cPickle.dumps([client.addr for client in self.clients], 0) + def getClientAddrs(self): + return [client.addr for client in self.clients] #Quit if sent by the local client def r_quit(self, pc, args): Modified: trunk/ioData/server/lobby/ioLobbyServer.py =================================================================== --- trunk/ioData/server/lobby/ioLobbyServer.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/server/lobby/ioLobbyServer.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -5,6 +5,7 @@ from ioServerBase import * import ioNetHelper import ioDownloader +import ioNetHelper class ioLobbyServer(ioServerBase): Added: trunk/ioData/textures/blank-normalmap.png =================================================================== (Binary files differ) Property changes on: trunk/ioData/textures/blank-normalmap.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/ioData/vehicles/coyote/world =================================================================== --- trunk/ioData/vehicles/coyote/world 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/vehicles/coyote/world 2008-01-28 04:27:53 UTC (rev 1167) @@ -72,6 +72,12 @@ <triggers/> <sector name="Scene"> <cullerp plugin="crystalspace.culling.frustvis"/> + <node name="Coyote-Engine"> + <position y="0.35084" x="0.0" z="-1.0198837"/> + <xvector y="-1.10467e-06" x="-1" z="1.25567e-06"/> + <yvector y="1.1909e-05" x="1.25565e-06" z="1"/> + <zvector y="1" x="1.25566e-06" z="-1.15196e-05"/> + </node> <node name="Coyote-Roof1"> <position y="1.15084" x="0.290155" z="-0.0198837"/> <xvector y="-1.10467e-06" x="-1" z="1.25567e-06"/> Modified: trunk/ioData/vehicles/ioVehicle.py =================================================================== --- trunk/ioData/vehicles/ioVehicle.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/vehicles/ioVehicle.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -101,9 +101,8 @@ def r_nxtgt(self, pc, args): addr = self.net.getNetData(args)[0] if addr == self.owneraddr: - pars = parblock({'source' : self.entity.Name, 'current' : self.targetname}) entmgr = Entities['ioEntMgr'] - targetname = entmgr.Behaviour.SendMessage('getnextentity', None, pars) + targetname = entmgr.Behaviour.getNextEntity(self.entity.Name, self.targetname) if targetname != '': self.targetname = targetname self.targetUpdate() Modified: trunk/ioData/vehicles/ioVehicleBase.py =================================================================== --- trunk/ioData/vehicles/ioVehicleBase.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/vehicles/ioVehicleBase.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -174,15 +174,21 @@ if (currenttime - self.lastcollision) >= 1000: self.lastcollision = currenttime idx = self.getarmouratpos(pos) - damage = depth * 250 - if self.frame[idx] > 0 and damage >= 1.0: - self.frame[idx] -= damage - if self.frame[idx] < 0: - self.frame[idx] = 0 - #The average is used by the label display and drag - self.avgframe = sum(self.frame) / 4.0 - self.postProcessDamage('fr', idx, self.frame[idx], collided) - return idx + damage = depth * 1000.0 + #The front is strongest + if idx == 0: + damage = damage / 10.0 + #Don't bother dealing small amounts of damage + if damage > 0.5: + if self.frame[idx] > 0: + self.frame[idx] -= damage + if self.frame[idx] < 0: + self.frame[idx] = 0 + #The average is used by the label display and drag + self.avgframe = sum(self.frame) / 4.0 + self.postProcessDamage('fr', idx, self.frame[idx], collided) + self.damagehealth(damage, collided) + def doDeform(self, pos, depth, normal): if depth > 0.01: @@ -515,7 +521,6 @@ if (source != self.entity.Name): self.damageDeform(pos, damage) idx = self.getarmouratpos(pos) - oldarmour = self.armour[idx] #The armour from that side is able to soak up the damage if self.armour[idx] > 0: self.armour[idx] -= damage @@ -524,27 +529,30 @@ self.postProcessDamage('am', idx, self.armour[idx], source) #No armour in this direction, the car recieves damage else: - if self.health > 0: - oldhealth = self.health - self.health -= damage - if self.health <= 0: - self.die(source) - self.postProcessDamage('hl', 0, self.health, source) - #The powertrain and brakes have a random chance of taking damage - ptchance = random.random() - if ptchance >= 0.5: - if self.powertrain > 0: - self.powertrain -= damage - if self.powertrain < 0: - self.powertrain = 0 - self.postProcessDamage('pt', 0, self.powertrain, source) - brchance = random.random() - if brchance >= 0.5: - self.brakes -= damage - if self.brakes < 0: - self.brakes = 0 - self.postProcessDamage('br', 0, self.brakes, source) + self.damagehealth(damage, source) + + def damagehealth(self, damage, source): + if self.health > 0: + self.health -= damage + if self.health <= 0: + self.die(source) + self.postProcessDamage('hl', 0, self.health, source) + #The powertrain and brakes have a random chance of taking damage + ptchance = random.random() + if ptchance >= 0.5: + if self.powertrain > 0: + self.powertrain -= damage + if self.powertrain < 0: + self.powertrain = 0 + self.postProcessDamage('pt', 0, self.powertrain, source) + brchance = random.random() + if brchance >= 0.5: + self.brakes -= damage + if self.brakes < 0: + self.brakes = 0 + self.postProcessDamage('br', 0, self.brakes, source) + #This is inherited by the server to send to clients. By the client to send messages to the hud def postProcessDamage(self, zone, idx, health, source): if zone is 'hl': Modified: trunk/ioData/weapons/ffar/ioFFAR.py =================================================================== --- trunk/ioData/weapons/ffar/ioFFAR.py 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/weapons/ffar/ioFFAR.py 2008-01-28 04:27:53 UTC (rev 1167) @@ -77,7 +77,7 @@ #Tell the rocket to start flaming rocket.Behaviour.SendMessage('arm', None, celGenericParameterBlock(0)) #Fire! - pcprojectile.Start(enddir, 20 + pspeed, 100, 10) + pcprojectile.Start(enddir, 30 + pspeed, 100, 10) def pctimer_refill(self, pc, args): if self.ammo - len(self.rockets) <= 0: Modified: trunk/ioData/weapons/ffar/rocketdirtfly.xml =================================================================== --- trunk/ioData/weapons/ffar/rocketdirtfly.xml 2008-01-24 12:50:43 UTC (rev 1166) +++ trunk/ioData/weapons/ffar/rocketdirtfly.xml 2008-01-28 04:27:53 UTC (rev 1167) @@ -28,7 +28,7 @@ <transformmode>local</transformmode> <emitter type="sphere"> <duration>0.1</duration> - <emissionrate>500</emissionrate> + <emissionrate>250</emissionrate> <mass min="1" max="5" /> <radius>0.1</radius> <uniformvelocity>no</uniformvelocity> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cf...@us...> - 2008-01-24 12:53:08
|
Revision: 1166 http://automanic.svn.sourceforge.net/automanic/?rev=1166&view=rev Author: cfraz89 Date: 2008-01-24 04:50:43 -0800 (Thu, 24 Jan 2008) Log Message: ----------- made all work with bumpmapping Modified Paths: -------------- trunk/ioData/client/ioEntityManagerClient.py trunk/ioData/effects/dusttrail.xml trunk/ioData/gametypes/ioGameBaseCl.py trunk/ioData/maps/cod2/foliage-high trunk/ioData/maps/cod2/world trunk/ioData/maps/garage/world trunk/ioData/vehicles/Van/world trunk/ioData/vehicles/falcon/world trunk/ioData/vehicles/fedex/world trunk/ioData/vehicles/ioVehicleBase.py trunk/ioData/vehicles/strider/world trunk/ioData/weapons/browning/barrelspark.xml trunk/ioData/weapons/browning/bulletdirtfly.xml trunk/ioData/weapons/browning/bulletexplosion.xml trunk/ioData/weapons/browning/world trunk/ioData/weapons/ffar/ioFFAR.py trunk/ioData/weapons/ffar/rocketdirtfly.xml trunk/ioData/weapons/ffar/rocketexplosion.xml trunk/ioData/weapons/ffar/rockettrail.xml trunk/ioData/weapons/ffar/world Added Paths: ----------- trunk/ioData/scripts/std_rloop_terrain.xml Removed Paths: ------------- trunk/ioData/vehicles/trekker/ trunk/ioData/vehicles/voyager/ Modified: trunk/ioData/client/ioEntityManagerClient.py =================================================================== --- trunk/ioData/client/ioEntityManagerClient.py 2008-01-24 09:24:37 UTC (rev 1165) +++ trunk/ioData/client/ioEntityManagerClient.py 2008-01-24 12:50:43 UTC (rev 1166) @@ -105,7 +105,7 @@ gmtp.Behaviour.SendMessage('positionplayer', None, pars) #Add the weapons (depending on gametype) - pars = parblock({'vehicle' : vehicle}) + pars = parblock({'vehicle' : vehicle, 'path': vehicleinfo['Path']}) gmtp.Behaviour.SendMessage('equipbot', None, pars) pars = parblock({'player' : False}) Modified: trunk/ioData/effects/dusttrail.xml =================================================================== --- trunk/ioData/effects/dusttrail.xml 2008-01-24 09:24:37 UTC (rev 1165) +++ trunk/ioData/effects/dusttrail.xml 2008-01-24 12:50:43 UTC (rev 1166) @@ -20,7 +20,7 @@ <ztest/> <params> <mixmode> - <add/> + <alpha/> </mixmode> <material>dust.png</material> <particlesize x="0.5" y="0.5" /> Modified: trunk/ioData/gametypes/ioGameBaseCl.py =================================================================== --- trunk/ioData/gametypes/ioGameBaseCl.py 2008-01-24 09:24:37 UTC (rev 1165) +++ trunk/ioData/gametypes/ioGameBaseCl.py 2008-01-24 12:50:43 UTC (rev 1166) @@ -133,8 +133,9 @@ #Takes random weapons and adds them. def equipbot(self, pc, args): vehicle = args[parid('vehicle')] + path = args[parid('path')] #Equip random model for weapons - models = ioLoader.scanModels(vehicleinfo['Path']) + models = ioLoader.scanModels(path) if len(models) > 0: model = random.choice(models) weapons = model['Weapons'] Modified: trunk/ioData/maps/cod2/foliage-high =================================================================== --- trunk/ioData/maps/cod2/foliage-high 2008-01-24 09:24:37 UTC (rev 1165) +++ trunk/ioData/maps/cod2/foliage-high 2008-01-24 12:50:43 UTC (rev 1166) @@ -20,24 +20,16 @@ <binary /> </alpha> </texture> - <texture name="blank-normalmap"> - <file>/outlaws/textures/blank-normalmap.png</file> - <class>normalmap</class> - </texture> </textures> <materials> <!--foliage mats--> <material name="sage2.png"> <texture>sage2.png</texture> - <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> + <shader type="standard">std_lighting</shader> </material> <material name="grass.dds"> <texture>grass.dds</texture> - <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> + <shader type="standard">std_lighting</shader> </material> </materials> <library>factories/grass.lib</library> Modified: trunk/ioData/maps/cod2/world =================================================================== --- trunk/ioData/maps/cod2/world 2008-01-24 09:24:37 UTC (rev 1165) +++ trunk/ioData/maps/cod2/world 2008-01-24 12:50:43 UTC (rev 1166) @@ -133,12 +133,12 @@ </materials> <addon> <plugin>crystalspace.renderloop.loop.loader</plugin> - <paramsfile>/shader/std_rloop_terrain.xml</paramsfile> + <paramsfile>/outlaws/ioData/scripts/std_rloop_terrain.xml</paramsfile> </addon> <settings> <clearzbuf>yes</clearzbuf> <lightmapcellsize>16</lightmapcellsize> - <renderloop>std_rloop_terrain</renderloop> + <renderloop>std_rloop_terrain2</renderloop> </settings> <library>factories/genRamp</library> <library>factories/genBridge</library> Modified: trunk/ioData/maps/garage/world =================================================================== --- trunk/ioData/maps/garage/world 2008-01-24 09:24:37 UTC (rev 1165) +++ trunk/ioData/maps/garage/world 2008-01-24 12:50:43 UTC (rev 1166) @@ -1,175 +1,191 @@ -<?xml version="1.0" encoding="utf-8" ?> -<world> - <variables> - <variable name="LodM" value="-0.00666667" /> - <variable name="LodA" value="1.33333" /> - </variables> - - <plugins> - <plugin name="thingfact">crystalspace.mesh.loader.factory.thing</plugin> - <plugin name="thing">crystalspace.mesh.loader.thing</plugin> - <plugin name="genmeshFactory">crystalspace.mesh.loader.factory.genmesh</plugin> - <plugin name="genmesh">crystalspace.mesh.loader.genmesh</plugin> - <plugin name="genmeshfact">crystalspace.mesh.loader.factory.genmesh</plugin> - <plugin name="terrainFact">crystalspace.mesh.loader.factory.terrain</plugin> - <plugin name="terrain">crystalspace.mesh.loader.terrain</plugin> -<!-- - <plugin name="foliageFact">crystalspace.mesh.loader.factory.foliage</plugin> - <plugin name="foliage">crystalspace.mesh.loader.foliage</plugin> ---> - </plugins> - - <textures> -<!-- terrain textures --> - <texture name="Sand00"> - <file>Sand00.png</file> - </texture> - <texture name="cracked"> - <file>cracked.png</file> - </texture> - <texture name="Sand01.png"> - <file>Sand01.png</file> - </texture> - <texture name="matbase.png"> - <file>matbase.png</file> - </texture> - </textures> - - <shaders> - <shader><file>/shader/terrain_fixed_base.xml</file></shader> - <shader><file>/shader/terrain_fixed_splatting.xml</file></shader> - </shaders> - - <materials> -<!-- terrain mats --> - <material name="ScatterSky"> - <color red="1" green="1" blue="1" /> - <texture>sky.jpg</texture> - </material> - <material name="Base"> - <!-- <texture>materialmap_base.png</texture>--> - <texture>matbase.png</texture> - <shader type="ambient">terrain_fixed_base</shader> - </material> - <material name="Sand00"> - <texture>Sand00</texture> - <shadervar name="texture scale" type="vector2">128,128</shadervar> - <shader type="terrain splat">terrain_fixed_splatting</shader> - </material> - <material name="cracked"> - <texture>cracked</texture> - <shadervar name="texture scale" type="vector2">128,128</shadervar> - <shader type="terrain splat">terrain_fixed_splatting</shader> - </material> - <material name="Sand01"> - <texture>Sand01.png</texture> - <shadervar name="texture scale" type="vector2">128,128</shadervar> - <shader type="terrain splat">terrain_fixed_splatting</shader> - </material> - <material name="White"> - <color red="1" green="1" blue="1" /> - <shader type="terrain splat">terrain_fixed_splatting</shader> - </material> - </materials> - - - <addon> - <plugin>crystalspace.renderloop.loop.loader</plugin> - <paramsfile>/shader/std_rloop_terrainfixed.xml</paramsfile> - <!--old one <paramsfile>/shader/std_rloop_terrainfixed.xml</paramsfile> --> - </addon> - - <settings> - <clearzbuf>yes</clearzbuf> - <lightmapcellsize>16</lightmapcellsize> - <renderloop>std_rloop_terrainfixed</renderloop> - <!--old one <renderloop>std_rloop_terrainfixed</renderloop> --> - </settings> - <start name="Camera"> - <sector>Scene</sector> - <position x="0" y="0" z="0" /> - <forward x="0" y="0" z="1" /> - <up x="0" y="1" z="0" /> - </start> - - <meshfact name="skydome"> - <plugin>genmeshFactory</plugin> - <params> - <sphere rimvertices="8" reversed="true"> - <radius x="500000" y="500000" z="500000" /> - </sphere> - </params> - </meshfact> - - <addon plugin="crystalspace.terraformer.simple.loader"> - <name>garage</name> - <heightmap>gheight.png</heightmap> - <scale x="256" y="32" z="256" /> - <materialmap image="matmap.png" /> - </addon> - - <meshfact name="TerrainFact"> - <plugin>terrainFact</plugin> - <params> - <plugin>crystalspace.mesh.object.terrain.bruteblock</plugin> - <terraformer>garage</terraformer> - <sampleregion> - <min x="-256" y="-256" /> - <max x="256" y="256" /> - </sampleregion> - </params> - </meshfact> - - <sector name="Scene"> - - <ambient red="0.15" green="0.15" blue="0.15" /> - - <light name="sun"> - <center x="-50000" y="86030" z="-30000" /> - <color red="0.95903" green="0.80995" blue="0.70420" /> - <radius>1000000</radius> - </light> - - <meshobj name="sky"> - <plugin>genmesh</plugin> - <params> - <factory>skydome</factory> - <material>ScatterSky</material> - <color red="1" green="1" blue="1" /> - </params> - <zfill /> - <priority>sky</priority> - <camera /> - <noshadows/> - </meshobj> - - <meshobj name="Terrain"> - <plugin>terrain</plugin> - <params> - <factory>TerrainFact</factory> - <material>Base</material> - <materialpalette> - <material>Sand00</material> - <material>Sand01</material> - <material>cracked</material> - <material>Sand00</material> - <material>White</material> - </materialpalette> - <lodvalue name="splatting distance">200</lodvalue> - <lodvalue name="block resolution">16</lodvalue> - <lodvalue name="block split distance">8</lodvalue> - <lodvalue name="minimum block size">32</lodvalue> - <lodvalue name="cd resolution">256</lodvalue> - <staticlighting>yes</staticlighting> - <castshadows>yes</castshadows> - </params> - <move> - <v x="0" y="-15.5" z="0" /> - </move> - </meshobj> - - <!--Stops the terrain from fading to black --> - <fog red="0.8" green="0.8" blue="0.8" density="0.0001"/> - - </sector> -</world> +<?xml version="1.0" encoding="utf-8" ?> +<world> + <plugins> + <plugin name="thingfact">crystalspace.mesh.loader.factory.thing</plugin> + <plugin name="thing">crystalspace.mesh.loader.thing</plugin> + <plugin name="genmeshFactory">crystalspace.mesh.loader.factory.genmesh</plugin> + <plugin name="genmesh">crystalspace.mesh.loader.genmesh</plugin> + <plugin name="genmeshfact">crystalspace.mesh.loader.factory.genmesh</plugin> + <plugin name="terrainFact">crystalspace.mesh.loader.factory.terrain</plugin> + <plugin name="terrain">crystalspace.mesh.loader.terrain</plugin> + <!-- + <plugin name="foliageFact">crystalspace.mesh.loader.factory.foliage</plugin> + <plugin name="foliage">crystalspace.mesh.loader.foliage</plugin> + --> + </plugins> + <textures> + <!-- terrain textures --> + <texture name="Sand00"> + <file>Sand00.png</file> + </texture> + <texture name="cracked"> + <file>cracked.png</file> + </texture> + <texture name="Sand01.png"> + <file>Sand01.png</file> + </texture> + <texture name="matbase.png"> + <file>matbase.png</file> + </texture> + <texture name="base_normalmap"> + <file>textures/normalmap.png</file> + <class>normalmap</class> + </texture> + <texture name="stone-n"> + <file>textures/stone-n.png</file> + <class>normalmap</class> + </texture> + <texture name="sand-n"> + <file>textures/sand-n.png</file> + <class>normalmap</class> + </texture> + </textures> + <shaders> + <shader><file>/shader/sky_scattering.xml</file></shader> + <shader><file>/shader/splatting_base.xml</file></shader> + <shader><file>/shader/splatting_scattering_base.xml</file></shader> + <shader><file>/shader/splatting_bump.xml</file></shader> + <shader><file>/shader/splatting_scattering.xml</file></shader> + </shaders> + <materials> + <!-- terrain mats --> + <material name="ScatterSky"> + <color red="0" green="0" blue="0" /> + + <shadervar type='vector3' name="sky base color">0.2,0.3,0.4</shadervar> + <shadervar type='vector3' name="sky sun-glow color">0.9,0.5,0.03</shadervar> + <shadervar type='float' name="sky sun size">0.0004</shadervar> + <shader type="ambient">sky_scattering</shader> + </material> + <material name="Base"> + <texture>matbase.png</texture> + <shadervar name="tex normal" type="texture">base_normalmap</shadervar> + <shadervar name="normal scale" type="vector2">128,128</shadervar> + <shadervar type='vector4' name="scatter sun color">0.15,0.10,0.10,0.01</shadervar> + <shadervar type='vector3' name="scatter color">0.045,0.04,0.035</shadervar> + <shadervar type='vector3' name="scatter ground glow">0.035,0.03,0.025</shadervar> + <shadervar type='vector3' name="scatter world color">0.35,0.3,0.25</shadervar> + +<!-- <shadervar type='vector4' name="scatter sun color">0.90,0.10,0.10,0.01</shadervar> + <shadervar type='vector3' name="scatter color">0.06,0.05,0.04</shadervar> + <shadervar type='vector3' name="scatter ground glow">0.04,0.03,0.01</shadervar> + <shadervar type='vector3' name="scatter world color">0.7,0.3,0.30</shadervar>--> + + <shader type="ambient">splatting_scattering_base</shader> + </material> + <material name="Sand00"> + <texture>Sand00</texture> + <shadervar name="texture scale" type="vector2">128,128</shadervar> + <shadervar name="normal scale" type="vector2">128,128</shadervar> + <shadervar name="tex normal" type="texture">sand-n</shadervar> + <shader type="terrain splat">splatting_scattering</shader> + </material> + <material name="cracked"> + <texture>cracked</texture> + <shadervar name="texture scale" type="vector2">128,128</shadervar> + <shadervar name="normal scale" type="vector2">128,128</shadervar> + <shadervar name="tex normal" type="texture">sand-n</shadervar> + <shader type="terrain splat">splatting_scattering</shader> + </material> + <material name="Sand01"> + <texture>Sand01.png</texture> + <shadervar name="texture scale" type="vector2">128,128</shadervar> + <shadervar name="normal scale" type="vector2">128,128</shadervar> + <shadervar name="tex normal" type="texture">sand-n</shadervar> + <shader type="terrain splat">splatting_scattering</shader> + </material> + <material name="White"> + <color red="1" green="1" blue="1" /> + </material> + </materials> + <addon> + <plugin>crystalspace.renderloop.loop.loader</plugin> + <paramsfile>/outlaws/ioData/scripts/std_rloop_terrain.xml</paramsfile> + </addon> + <settings> + <clearzbuf>yes</clearzbuf> + <lightmapcellsize>16</lightmapcellsize> + <renderloop>std_rloop_terrain2</renderloop> + </settings> + + <start name="Camera"> + <sector>Scene</sector> + <position x="0" y="0" z="0" /> + <forward x="0" y="0" z="1" /> + <up x="0" y="1" z="0" /> + </start> + + <meshfact name="skydome"> + <plugin>genmeshFactory</plugin> + <params> + <sphere rimvertices="64" reversed="true"> + <radius x="500000" y="500000" z="500000" /> + </sphere> + </params> + </meshfact> + <addon plugin="crystalspace.terraformer.simple.loader"> + <name>garage</name> + <heightmap>gheight.png</heightmap> + <scale x="256" y="32" z="256" /> + <materialmap image="matmap.png" /> + </addon> + <meshfact name="TerrainFact"> + <plugin>terrainFact</plugin> + <params> + <plugin>crystalspace.mesh.object.terrain.bruteblock</plugin> + <terraformer>garage</terraformer> + <sampleregion> + <min x="-256" y="-256" /> + <max x="256" y="256" /> + </sampleregion> + </params> + </meshfact> + <sector name="Scene"> + <cullerp plugin="crystalspace.culling.frustvis" /> + <ambient red="0.2" green="0.2" blue="0.2" /> + <light name="sun"> + <center x="4000000" y="5000000" z="-4000000" /> + <radius>0</radius> + <color red="0.85903" green="0.80995" blue="0.80420" /> + <influenceradius>10000000</influenceradius> + <attenuation>realistic</attenuation> + </light> + + + <meshobj name="sky"> + <plugin>genmesh</plugin> + <params> + <factory>skydome</factory> + <material>ScatterSky</material> + <color red="0" green="0" blue="0" /> + </params> + <zfill /> + <priority>sky</priority> + <camera /> + <trimesh> <id>colldet</id> </trimesh> + </meshobj> + + <meshobj name="Terrain"> + <plugin>terrain</plugin> + <params> + <factory>TerrainFact</factory> + <material>Base</material> + <materialpalette> + <material>Sand00</material> + <material>Sand01</material> + <material>cracked</material> + <material>Sand00</material> + <material>White</material> + </materialpalette> + <lodvalue name="splatting distance">400</lodvalue> + <lodvalue name="block resolution">16</lodvalue> + <lodvalue name="block split distance">8</lodvalue> + <lodvalue name="minimum block size">32</lodvalue> + <lodvalue name="cd resolution">256</lodvalue> + </params> + <move> + <v x="0" y="-15.5" z="0" /> + </move> + </meshobj> + </sector> + </world> Added: trunk/ioData/scripts/std_rloop_terrain.xml =================================================================== --- trunk/ioData/scripts/std_rloop_terrain.xml (rev 0) +++ trunk/ioData/scripts/std_rloop_terrain.xml 2008-01-24 12:50:43 UTC (rev 1166) @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8" ?> +<params> + <name>std_rloop_terrain2</name> + <steps> + <!-- ambient lighting --> + <step plugin="crystalspace.renderloop.step.generic"> + <shadertype>ambient</shadertype> + <zoffset>yes</zoffset> + <portaltraversal/> + <zmesh /> + </step> + <!-- dynamic lighting --> + <step plugin="crystalspace.renderloop.step.lightiter"> + <steps> + <step plugin="crystalspace.renderloop.step.generic"> + <shadertype>dynamic</shadertype> + <zoffset>no</zoffset> + <zuse /> + </step> + </steps> + </step> + <!-- terrain splatting ambient --> + <step plugin="crystalspace.renderloop.step.generic"> + <shadertype>splatting ambient</shadertype> + <zoffset>no</zoffset> + <portaltraversal/> + <zuse /> + </step> + <!-- terrain splatting dynamic --> + <step plugin="crystalspace.renderloop.step.lightiter"> + <steps> + <step plugin="crystalspace.renderloop.step.generic"> + <shadertype>terrain splat</shadertype> + <zoffset>no</zoffset> + <zuse /> + </step> + </steps> + </step> + <!-- diffuse lighting --> + <step plugin="crystalspace.renderloop.step.lightiter"> + <steps> + <step plugin="crystalspace.renderloop.step.generic"> + <shadertype>diffuse</shadertype> + <zoffset>no</zoffset> + <ztest /> + </step> + </steps> + </step> + <step plugin="crystalspace.renderloop.step.generic"> + <shadertype>standard</shadertype> + <zoffset>no</zoffset> + <portaltraversal /> + <zmesh /> + </step> + </steps> +</params> Modified: trunk/ioData/vehicles/Van/world =================================================================== --- trunk/ioData/vehicles/Van/world 2008-01-24 09:24:37 UTC (rev 1165) +++ trunk/ioData/vehicles/Van/world 2008-01-24 12:50:43 UTC (rev 1166) @@ -6,7 +6,6 @@ <plugin name="genmeshfact">crystalspace.mesh.loader.factory.genmesh</plugin> </plugins> <shaders> - <shader><file>/shader/stat_dyn_reflect.xml</file></shader> <shader> <file>/shader/parallaxAtt/parallaxAtt.xml</file> </shader> @@ -16,14 +15,11 @@ <shader> <file>/shader/std_lighting.xml</file> </shader> + <shader> + <file>/shader/specular/light_spec_bumpmap.xml</file> + </shader> </shaders> <textures> - <texture name='blank-reflect-mask.png'> - <file>/outlaws/textures/blank-reflect-mask.png</file> - </texture> - <texture name='desert-reflect.jpg'> - <file>/outlaws/textures/desert-reflect.jpg</file> - </texture> <texture name="vanbody-damage.jpg"> <file>textures/vanbody-damage.jpg</file> </texture> @@ -54,37 +50,46 @@ <texture name="vanwheels.jpg"> <file>textures/wheels.jpg</file> </texture> + <texture name="blank-normalmap"> + <file>/outlaws/textures/blank-normalmap.png</file> + <class>normalmap</class> + </texture> </textures> <materials> <material name="bumpersbumpers.jpg"> <texture>bumpers.jpg</texture> - <shader type="standard">stat_dyn_reflect</shader> - <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> - <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> <material name="bodyvanbody.jpg"> <texture>vanbody.jpg</texture> - <shader type="standard">stat_dyn_reflect</shader> - <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> - <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> <material name="detailsdetails1.jpg"> <texture>details1.jpg</texture> - <shader type="standard">stat_dyn_reflect</shader> - <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> - <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> <material name="windowswindows.jpg"> <texture>windows.jpg</texture> - <shader type="standard">stat_dyn_reflect</shader> - <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> - <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> <material name="15 - Defaultshocks.jpg"> <texture>shocks.jpg</texture> - <shader type="standard">stat_dyn_reflect</shader> - <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> - <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> <material name="6 - Defaultspeakers.jpg"> <texture>speakers.jpg</texture> @@ -94,6 +99,10 @@ </material> <material name="vanwheels.jpg"> <texture>vanwheels.jpg</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> </materials> <sounds/> Modified: trunk/ioData/vehicles/falcon/world =================================================================== --- trunk/ioData/vehicles/falcon/world 2008-01-24 09:24:37 UTC (rev 1165) +++ trunk/ioData/vehicles/falcon/world 2008-01-24 12:50:43 UTC (rev 1166) @@ -16,7 +16,9 @@ <shader> <file>/shader/std_lighting.xml</file> </shader> - + <shader> + <file>/shader/specular/light_spec_bumpmap.xml</file> + </shader> </shaders> <textures> <texture name='blank-reflect-mask-shiny.png'> @@ -40,22 +42,32 @@ <texture name="falcon-tex.png"> <file>textures/falcon-tex.png</file> </texture> + <texture name="blank-normalmap"> + <file>/outlaws/textures/blank-normalmap.png</file> + <class>normalmap</class> + </texture> </textures> <materials> <material name="chrome.png"> <texture>chrome.png</texture> - <shader type="standard">stat_dyn_reflect</shader> - <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> - <shadervar name="tex mask" type="texture">blank-reflect-mask-shiny.png</shadervar> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> <material name="otherparts.png"> <texture>otherparts.png</texture> + <shader type="diffuse">light_spec_bumpmap</shader> + <shader type="ambient">ambient</shader> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> <material name="falcon-tex.png"> <texture>falcon-tex.png</texture> - <shader type="standard">stat_dyn_reflect</shader> - <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> - <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> </materials> <sounds/> Modified: trunk/ioData/vehicles/fedex/world =================================================================== --- trunk/ioData/vehicles/fedex/world 2008-01-24 09:24:37 UTC (rev 1165) +++ trunk/ioData/vehicles/fedex/world 2008-01-24 12:50:43 UTC (rev 1166) @@ -14,6 +14,9 @@ <shader> <file>/shader/std_lighting.xml</file> </shader> + <shader> + <file>/shader/specular/light_spec_bumpmap.xml</file> + </shader> </shaders> <textures> <texture name="fedexwheel.jpg"> @@ -31,28 +34,60 @@ <texture name="fedexbody.jpg"> <file>textures/fedexbody.jpg</file> </texture> + <texture name="blank-normalmap"> + <file>/outlaws/textures/blank-normalmap.png</file> + <class>normalmap</class> + </texture> </textures> <materials> <material name="Color_F16fedexwheel.jpg"> <texture>fedexwheel.jpg</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> <material name="Translucent_Glass_Blufedexglass.jpg"> <texture>fedexglass.jpg</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> <material name="Color_006fedexbumpers.jpg"> <texture>fedexbumpers.jpg</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> <material name="Color_A01fedexbumpers.jpg"> <texture>fedexbumpers.jpg</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> <material name="Color_B02fedexbumpers.jpg"> <texture>fedexbumpers.jpg</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> <material name="fedexmirrors.jpg"> <texture>fedexmirrors.jpg</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> <material name="fedexbody.jpg"> <texture>fedexbody.jpg</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> </materials> <sounds/> Modified: trunk/ioData/vehicles/ioVehicleBase.py =================================================================== --- trunk/ioData/vehicles/ioVehicleBase.py 2008-01-24 09:24:37 UTC (rev 1165) +++ trunk/ioData/vehicles/ioVehicleBase.py 2008-01-24 12:50:43 UTC (rev 1166) @@ -296,60 +296,59 @@ #Add a weapon to the vehicle. if we can, return 0. 1 means we don't have the mount point, 2 means that weapon doesnt exist def addweapon(self, pc, args): - pass - #mount = args[getid('cel.parameter.mount')] - #weapon = args[getid('cel.parameter.weapon')] - #if weapon.strip() != '': - #bodyMesh = celMesh(self.entity) - #nodeob = self.scene.QueryObject().GetChild('') - #if self.weapons[mount]: - #oldweapon = self.weapons[mount] - #self.hardpoints.remove(oldweapon) - #RemoveEntity(oldweapon) - ##Make sure vehicle has this mount point - #if nodeob: - #mountNode = nodeob.QueryInterface(iMapNode) - #template = EntityTemplates[weapon + '-tpl'] - #if template: - #name = self.entity.Name + mount - #weaponent = CreateEntity(template, name, celEntityTemplateParams()) - #self.weapons[mount] = weaponent - #self.hardpoints.append(weaponent) - #mesh = celMesh(weaponent) - #mesh.MoveMesh(self.scene, mountNode.GetPosition()) - #mesh.Mesh.GetMovable().GetSceneNode().SetParent(bodyMesh.Mesh.GetMovable().GetSceneNode()) - #mesh.Mesh.GetMovable().UpdateMove() - #yvec = mountNode.GetYVector() - #zvec = mountNode.GetZVector() - ##Tell the weapon its initial orienation - #pars = parblock({'y' : yvec, 'z' : zvec}) - #weaponent.Behaviour.SendMessage('setorientation', None, pars) - ##Tell the weapon its codename, so it can use them for the HUD - #pars = parblock({'codename' : weapon}) - #weaponent.Behaviour.SendMessage('setcodename', None, pars) + mount = args[getid('cel.parameter.mount')] + weapon = args[getid('cel.parameter.weapon')] + if weapon.strip() != '': + bodyMesh = celMesh(self.entity) + nodeob = self.scene.QueryObject().GetChildByName(self.codename + '-' + mount) + if self.weapons[mount]: + oldweapon = self.weapons[mount] + self.hardpoints.remove(oldweapon) + RemoveEntity(oldweapon) + #Make sure vehicle has this mount point + if nodeob: + mountNode = nodeob.QueryInterface(iMapNode) + template = EntityTemplates[weapon + '-tpl'] + if template: + name = self.entity.Name + mount + weaponent = CreateEntity(template, name, celEntityTemplateParams()) + self.weapons[mount] = weaponent + self.hardpoints.append(weaponent) + mesh = celMesh(weaponent) + mesh.MoveMesh(self.scene, mountNode.GetPosition()) + mesh.Mesh.GetMovable().GetSceneNode().SetParent(bodyMesh.Mesh.GetMovable().GetSceneNode()) + mesh.Mesh.GetMovable().UpdateMove() + yvec = mountNode.GetYVector() + zvec = mountNode.GetZVector() + #Tell the weapon its initial orienation + pars = parblock({'y' : yvec, 'z' : zvec}) + weaponent.Behaviour.SendMessage('setorientation', None, pars) + #Tell the weapon its codename, so it can use them for the HUD + pars = parblock({'codename' : weapon}) + weaponent.Behaviour.SendMessage('setcodename', None, pars) - #index = len(self.hardpoints) - #pars = parblock({'index' : index - 1}) - #weaponent.Behaviour.SendMessage('setindex', None, pars) + index = len(self.hardpoints) + pars = parblock({'index' : index - 1}) + weaponent.Behaviour.SendMessage('setindex', None, pars) - ##Tell the weapon its player so it knows how to act - #pars = parblock({'name' : self.entity.Name, 'player' : self.player}) - #weaponent.Behaviour.SendMessage('setparent', None, pars) + #Tell the weapon its player so it knows how to act + pars = parblock({'name' : self.entity.Name, 'player' : self.player}) + weaponent.Behaviour.SendMessage('setparent', None, pars) - ##Add it to the weapon group for this weapon. - #if self.weapongroups.has_key(weapon): - #if index not in self.weapongroups[weapon]: - #self.weapongroups[weapon].append(index) - #else: - #self.weapongroups[weapon] = [index] + #Add it to the weapon group for this weapon. + if self.weapongroups.has_key(weapon): + if index not in self.weapongroups[weapon]: + self.weapongroups[weapon].append(index) + else: + self.weapongroups[weapon] = [index] - #return 0 - #else: - #return 2 - #else: - #return 1 - #else: - #return 1 + return 0 + else: + return 2 + else: + return 1 + else: + return 1 def pccommandinput_firehardpoint11(self, pc, args): self.firehardpoint(1) @@ -746,7 +745,7 @@ exhaustfact = Engine.FindMeshFactory('exhaustSmoke') mesh = celMesh(self.entity).Mesh for point in ['Exhaust1', 'Exhaust2']: - nodeob = self.scene.QueryObject().GetChild('%s-%s'% (self.codename, point)) + nodeob = self.scene.QueryObject().GetChildByName('%s-%s'% (self.codename, point)) if nodeob: node = nodeob.QueryInterface(iMapNode) if node: @@ -758,7 +757,7 @@ def makeSmoke(self): smokefact = Engine.FindMeshFactory('engineSmoke') mesh = celMesh(self.entity).Mesh - nodeob = self.scene.QueryObject().GetChild('%s-Engine' % self.codename) + nodeob = self.scene.QueryObject().GetChildByName('%s-Engine' % self.codename) if nodeob: node = nodeob.QueryInterface(iMapNode) if node: @@ -792,7 +791,7 @@ if mech: weapon.PropertyClassList.Remove(mech) #Find the mount for the weapon, and reparent it to the mount position and orientation - nodeob = self.scene.QueryObject().GetChild(self.codename + '-' + mount) + nodeob = self.scene.QueryObject().GetChildByName(self.codename + '-' + mount) if nodeob: mountNode = nodeob.QueryInterface(iMapNode) mesh.GetMovable().SetPosition(mountNode.GetPosition()) Modified: trunk/ioData/vehicles/strider/world =================================================================== --- trunk/ioData/vehicles/strider/world 2008-01-24 09:24:37 UTC (rev 1165) +++ trunk/ioData/vehicles/strider/world 2008-01-24 12:50:43 UTC (rev 1166) @@ -6,14 +6,13 @@ <plugin name="genmeshfact">crystalspace.mesh.loader.factory.genmesh</plugin> </plugins> <shaders> - <shader><file>/shader/stat_dyn_reflect.xml</file></shader> <shader> + <file>/shader/specular/light_spec_bumpmap.xml</file> + </shader> + <shader> <file>/shader/ambient.xml</file> </shader> <shader> - <file>/shader/stat_dyn_reflect.xml</file> - </shader> - <shader> <file>/shader/specular/light_spec_bumpmap.xml</file> </shader> </shaders> @@ -30,22 +29,39 @@ <texture name="wheels.jpg"> <file>textures/wheels.jpg</file> </texture> + <texture name="blank-normalmap"> + <file>/outlaws/textures/blank-normalmap.png</file> + <class>normalmap</class> + </texture> </textures> <materials> <material name="tireswheels.jpg"> <texture>wheels.jpg</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> <material name="str01.png"> <texture>str01.png</texture> - <shader type="standard">stat_dyn_reflect</shader> - <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> - <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> <material name="str01-exp.png"> <texture>str01-exp.png</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> <material name="wheels.png"> <texture>wheels.png</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> </materials> <sounds/> Modified: trunk/ioData/weapons/browning/barrelspark.xml =================================================================== --- trunk/ioData/weapons/browning/barrelspark.xml 2008-01-24 09:24:37 UTC (rev 1165) +++ trunk/ioData/weapons/browning/barrelspark.xml 2008-01-24 12:50:43 UTC (rev 1166) @@ -10,7 +10,8 @@ <materials> <material name='spark.png'> <texture>spark.png</texture> - <shader type="standard">particle_basic2</shader> + <shader type="diffuse">particle_basic2</shader> + <shader type="ambient">*null</shader> </material> </materials> <meshfact name="barrelSpark"> Modified: trunk/ioData/weapons/browning/bulletdirtfly.xml =================================================================== --- trunk/ioData/weapons/browning/bulletdirtfly.xml 2008-01-24 09:24:37 UTC (rev 1165) +++ trunk/ioData/weapons/browning/bulletdirtfly.xml 2008-01-24 12:50:43 UTC (rev 1166) @@ -3,14 +3,15 @@ <shader><file>/outlaws/ioData/scripts/particle_basic_dark.xml</file></shader> </shaders> <textures> - <texture name='dot.png'> + <texture name='bdirt.png'> <file>/outlaws/textures/dot.png</file> </texture> </textures> <materials> - <material name='dirt'> - <texture>dot.png</texture> - <shader type="standard">particle_basic_dark</shader> + <material name='bdirt'> + <texture>bdirt.png</texture> + <shader type="diffuse">particle_basic_dark</shader> + <shader type="ambient">*null</shader> </material> </materials> <meshfact name="bulletDirtFly"> @@ -21,7 +22,7 @@ <mixmode> <add/> </mixmode> - <material>dirt</material> + <material>bdirt</material> <particlesize x="0.035" y="0.035" /> <sortmode>dot</sortmode> <transformmode>local</transformmode> Modified: trunk/ioData/weapons/browning/bulletexplosion.xml =================================================================== --- trunk/ioData/weapons/browning/bulletexplosion.xml 2008-01-24 09:24:37 UTC (rev 1165) +++ trunk/ioData/weapons/browning/bulletexplosion.xml 2008-01-24 12:50:43 UTC (rev 1166) @@ -3,14 +3,15 @@ <shader><file>/outlaws/ioData/scripts/particle_basic2.xml</file></shader> </shaders> <textures> - <texture name='smoke.png'> + <texture name='bsmoke.png'> <file>/outlaws/textures/smoke.png</file> </texture> </textures> <materials> - <material name='smoke.png'> - <texture>smoke.png</texture> - <shader type="standard">particle_basic2</shader> + <material name='bsmoke.png'> + <texture>bsmoke.png</texture> + <shader type="diffuse">particle_basic2</shader> + <shader type="ambient">*null</shader> </material> </materials> <meshfact name="bulletExplosion"> @@ -21,7 +22,7 @@ <mixmode> <add/> </mixmode> - <material>smoke.png</material> + <material>bsmoke.png</material> <particlesize x="0.05" y="0.05" /> <sortmode>dot</sortmode> <transformmode>local</transformmode> Modified: trunk/ioData/weapons/browning/world =================================================================== --- trunk/ioData/weapons/browning/world 2008-01-24 09:24:37 UTC (rev 1165) +++ trunk/ioData/weapons/browning/world 2008-01-24 12:50:43 UTC (rev 1166) @@ -43,6 +43,7 @@ </material> <material name='bullet.png'> <texture>bullet.png</texture> + <shader type="ambient">ambient</shader> <shader type="diffuse">light_spec_bumpmap</shader> <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> <shadervar type="vector4" name="specular">1,1,1,0.5</shadervar> Modified: trunk/ioData/weapons/ffar/ioFFAR.py =================================================================== --- trunk/ioData/weapons/ffar/ioFFAR.py 2008-01-24 09:24:37 UTC (rev 1165) +++ trunk/ioData/weapons/ffar/ioFFAR.py 2008-01-24 12:50:43 UTC (rev 1166) @@ -41,9 +41,9 @@ #Make a rocket in a barrel. def makeRocket(self, barrel): - nodeob = self.scene.QueryObject().GetChild('ffar' + str(barrel)) + nodeob = self.scene.QueryObject().GetChildByName('ffar' + str(barrel)) if nodeob: - node = SCF_QUERY_INTERFACE(nodeob, iMapNode) + node = nodeob.QueryInterface(iMapNode) yvec = node.GetYVector() zvec = node.GetZVector() rocket = CreateEntity('rocket', self.blpython, 'ioRocket') Modified: trunk/ioData/weapons/ffar/rocketdirtfly.xml =================================================================== --- trunk/ioData/weapons/ffar/rocketdirtfly.xml 2008-01-24 09:24:37 UTC (rev 1165) +++ trunk/ioData/weapons/ffar/rocketdirtfly.xml 2008-01-24 12:50:43 UTC (rev 1166) @@ -8,9 +8,10 @@ </texture> </textures> <materials> - <material name='dirt'> + <material name='dirtfly'> <texture>dot.png</texture> - <shader type="standard">particle_basic_dark</shader> + <shader type="diffuse">particle_basic_dark</shader> + <shader type="ambient">*null</shader> </material> </materials> <meshfact name="rocketDirtFly"> @@ -19,15 +20,15 @@ <ztest/> <params> <mixmode> - <add/> + <alpha/> </mixmode> - <material>dirt</material> + <material>dirtfly</material> <particlesize x="0.075" y="0.075" /> <sortmode>dot</sortmode> <transformmode>local</transformmode> <emitter type="sphere"> <duration>0.1</duration> - <emissionrate>250</emissionrate> + <emissionrate>500</emissionrate> <mass min="1" max="5" /> <radius>0.1</radius> <uniformvelocity>no</uniformvelocity> Modified: trunk/ioData/weapons/ffar/rocketexplosion.xml =================================================================== --- trunk/ioData/weapons/ffar/rocketexplosion.xml 2008-01-24 09:24:37 UTC (rev 1165) +++ trunk/ioData/weapons/ffar/rocketexplosion.xml 2008-01-24 12:50:43 UTC (rev 1166) @@ -3,14 +3,15 @@ <shader><file>/outlaws/ioData/scripts/particle_basic2.xml</file></shader> </shaders> <textures> - <texture name='smoke.png'> + <texture name='rexp.png'> <file>/outlaws/textures/smoke.png</file> </texture> </textures> <materials> - <material name='smoke.png'> - <texture>smoke.png</texture> - <shader type="standard">particle_basic2</shader> + <material name='rexp.png'> + <texture>rexp.png</texture> + <shader type="diffuse">particle_basic2</shader> + <shader type="ambient">*null</shader> </material> </materials> <meshfact name="rocketExplosion"> @@ -21,7 +22,7 @@ <mixmode> <add/> </mixmode> - <material>smoke.png</material> + <material>rexp.png</material> <particlesize x="0.6" y="0.6" /> <sortmode>dot</sortmode> <transformmode>local</transformmode> Modified: trunk/ioData/weapons/ffar/rockettrail.xml =================================================================== --- trunk/ioData/weapons/ffar/rockettrail.xml 2008-01-24 09:24:37 UTC (rev 1165) +++ trunk/ioData/weapons/ffar/rockettrail.xml 2008-01-24 12:50:43 UTC (rev 1166) @@ -1,16 +1,17 @@ -<library> +<library> <shaders> <shader><file>/outlaws/ioData/scripts/particle_basic_dark.xml</file></shader> </shaders> <textures> - <texture name='smoke-normed'> + <texture name='smoke-normed.png'> <file>/outlaws/textures/smoke-normed.png</file> </texture> </textures> <materials> - <material name='smoke-normed-dark.png'> - <texture>smoke-normed</texture> - <shader type="standard">particle_basic_dark</shader> + <material name='smoke-normed-dark'> + <texture>smoke-normed.png</texture> + <shader type="diffuse">particle_basic_dark</shader> + <shader type="ambient">*null</shader> </material> </materials> <meshfact name="rocketTrail"> @@ -21,20 +22,43 @@ <mixmode> <alpha/> </mixmode> - <material>smoke-normed-dark.png</material> - <particlesize x="0.125" y="0.125" /> + <material>smoke-normed-dark</material> + <particlesize x="0.15" y="0.15" /> <sortmode>dot</sortmode> <transformmode>localemitter</transformmode> <emitter type="sphere"> - <emissionrate>250</emissionrate> + <emissionrate>60</emissionrate> <mass min="1" max="5" /> - <radius>0.1</radius> - <uniformvelocity>no</uniformvelocity> - <initialvelocity x="0.1" y="0.1" z="0.1" /> - <initialttl min="0.75" max="1.5" /> + <radius>0.06</radius> + <uniformvelocity /> + <initialvelocity x="0" y="0.1" z="0.3" /> + <initialttl min="0.5" max="0.7" /> </emitter> + <effector type="force"> + <randomacceleration>1.5</randomacceleration> + </effector> <effector type="lincolor"> - <color red="0.3" green="0.3" blue="0.3" alpha="0.20" time="0.0" /> + <color red="0.5" green="0.5" blue="0.5" alpha="0.0" time="1.0" /> + <color red="0.5" green="0.5" blue="0.5" alpha="0.05" time="0.95" /> + <color red="0.5" green="0.5" blue="0.5" alpha="0.1" time="0.9" /> + <color red="0.5" green="0.5" blue="0.5" alpha="0.15" time="0.85" /> + <color red="0.5" green="0.5" blue="0.5" alpha="0.2" time="0.8" /> + <color red="0.5" green="0.5" blue="0.5" alpha="0.25" time="0.75" /> + <color red="0.5" green="0.5" blue="0.5" alpha="0.3" time="0.7" /> + <color red="0.5" green="0.5" blue="0.5" alpha="0.35" time="0.65" /> + <color red="0.5" green="0.5" blue="0.5" alpha="0.4" time="0.6" /> + <color red="0.5" green="0.5" blue="0.5" alpha="0.45" time="0.55" /> + <color red="0.5" green="0.5" blue="0.5" alpha="0.5" time="0.5" /> + <color red="0.5" green="0.5" blue="0.5" alpha="0.55" time="0.45" /> + <color red="0.5" green="0.5" blue="0.5" alpha="0.6" time="0.4" /> + <color red="0.5" green="0.5" blue="0.5" alpha="0.65" time="0.35" /> + <color red="0.5" green="0.5" blue="0.5" alpha="0.7" time="0.3" /> + <color red="0.5" green="0.5" blue="0.5" alpha="0.75" time="0.25" /> + <color red="0.5" green="0.5" blue="0.5" alpha="0.8" time="0.2" /> + <color red="0.5" green="0.5" blue="0.5" alpha="0.85" time="0.15" /> + <color red="0.5" green="0.5" blue="0.5" alpha="0.9" time="0.1" /> + <color red="0.5" green="0.5" blue="0.5" alpha="0.95" time="0.05" /> + <color red="0.5" green="0.5" blue="0.5" alpha="1.0" time="0.0" /> </effector> </params> </meshfact> Modified: trunk/ioData/weapons/ffar/world =================================================================== --- trunk/ioData/weapons/ffar/world 2008-01-24 09:24:37 UTC (rev 1165) +++ trunk/ioData/weapons/ffar/world 2008-01-24 12:50:43 UTC (rev 1166) @@ -39,18 +39,21 @@ <materials> <material name="rocketmat"> <texture>ffarmsl.jpg</texture> + <shader type="ambient">ambient</shader> <shader type="diffuse">light_spec_bumpmap</shader> <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> <shadervar type="vector4" name="specular">1,1,1,0.5</shadervar> </material> <material name="ffarmat"> <texture>tubesbrown.jpg</texture> + <shader type="ambient">ambient</shader> <shader type="diffuse">light_spec_bumpmap</shader> <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> <shadervar type="vector4" name="specular">1,1,1,0.5</shadervar> </material> <material name="frontbackffar"> <texture>frontbackffar.jpg</texture> + <shader type="ambient">ambient</shader> <shader type="diffuse">light_spec_bumpmap</shader> <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> <shadervar type="vector4" name="specular">1,1,1,0.5</shadervar> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cf...@us...> - 2008-01-24 09:24:55
|
Revision: 1165 http://automanic.svn.sourceforge.net/automanic/?rev=1165&view=rev Author: cfraz89 Date: 2008-01-24 01:24:37 -0800 (Thu, 24 Jan 2008) Log Message: ----------- bot fix Modified Paths: -------------- trunk/ioData/client/ioBotController.py trunk/ioData/client/ioEntityManagerClient.py trunk/ioData/gametypes/ioGameBaseCl.py trunk/ioData/scripts/ioDispatcher.py trunk/ioData/server/game/ioEntityManager.py trunk/ioData/vehicles/ioVehicleBase.py trunk/ioData/vehicles/ioVehicleCl.py Modified: trunk/ioData/client/ioBotController.py =================================================================== --- trunk/ioData/client/ioBotController.py 2008-01-15 06:00:54 UTC (rev 1164) +++ trunk/ioData/client/ioBotController.py 2008-01-24 09:24:37 UTC (rev 1165) @@ -7,6 +7,7 @@ timer.WakeUp(200, True) self.bot = None self.targetent = None + self.targetmesh = None self.targetname = '' self.accelerating = False self.shooting = False @@ -20,9 +21,10 @@ #The bot has changed targets def settarget(self, pc, args): self.targetname = args[parid('name')] - self.targetent = Entities[self.targetname] - if self.targetent: - self.targetmesh = celMesh(self.targetent) + if self.targetname != '': + self.targetent = Entities[self.targetname] + if self.targetent: + self.targetmesh = celMesh(self.targetent) def pctimer_wakeup(self, pc, args): if self.bot: @@ -31,25 +33,25 @@ self.bot.Behaviour.SendMessage('pccommandinput_accelerate1', None, args) self.accelerating = True ##Try to pick a target - #if not self.targetent: - #self.bot.Behaviour.SendMessage('pccommandinput_target1', None, args) - #else: - #if self.targetent: - #print self.targetent.name - #targetpos = self.targetmesh.Mesh.GetMovable().GetPosition() - #reltargetpos = self.botmesh.Mesh.GetMovable().GetTransform().Other2This(targetpos) - #if reltargetpos.x > 0: - #if self.steering != -1: - #self.bot.Behaviour.SendMessage('pccommandinput_steerleft1', None, args) - #self.steering = -1 - #else: - #if self.steering != 1: - #self.bot.Behaviour.SendMessage('pccommandinput_steerright1', None, args) - #self.steering = 1 + if not self.targetent: + self.bot.Behaviour.SendMessage('pccommandinput_target1', None, args) + else: + if self.targetent: + if self.targetmesh.Mesh: + targetpos = self.targetmesh.Mesh.GetMovable().GetPosition() + reltargetpos = self.botmesh.Mesh.GetMovable().GetTransform().Other2This(targetpos) + if reltargetpos.x > 0: + if self.steering != -1: + self.bot.Behaviour.SendMessage('pccommandinput_steerleft1', None, args) + self.steering = -1 + else: + if self.steering != 1: + self.bot.Behaviour.SendMessage('pccommandinput_steerright1', None, args) + self.steering = 1 ##Fire in bursts: - #if not self.shooting: - #self.bot.Behaviour.SendMessage('pccommandinput_shoot1', None, args) - #self.shooting = True - #else: - #self.bot.Behaviour.SendMessage('pccommandinput_shoot0', None, args) - #self.shooting = False \ No newline at end of file + if not self.shooting: + self.bot.Behaviour.SendMessage('pccommandinput_shoot1', None, args) + self.shooting = True + else: + self.bot.Behaviour.SendMessage('pccommandinput_shoot0', None, args) + self.shooting = False \ No newline at end of file Modified: trunk/ioData/client/ioEntityManagerClient.py =================================================================== --- trunk/ioData/client/ioEntityManagerClient.py 2008-01-15 06:00:54 UTC (rev 1164) +++ trunk/ioData/client/ioEntityManagerClient.py 2008-01-24 09:24:37 UTC (rev 1165) @@ -14,7 +14,7 @@ def __init__(self, celEntity): self.entity = celEntity self.entities = [] - self.maxbots = 0 + self.maxbots = 2 self.bots = 0 self.net = ioNetHelper.ioNetHelper() @@ -74,13 +74,11 @@ #Tell it to be player controlled pars = parblock({'player' : True}) vehicle.Behaviour.SendMessage('setplayer', None, pars) - - pars = celGenericParameterBlock(0) - for mount in ['Front1', 'Front2', 'Roof1', 'Roof2', 'Side1', 'Side2', 'Rear1', 'Rear2']: - weapon = Config.GetStr('Outlaws.Player.' + mount, 'BRWNG') - pars = parblock({'mount' : mount, 'weapon' : weapon}) - vehicle.Behaviour.SendMessage('addweapon', None, pars) - + + #Add the weapons (depending on gametype) + pars = parblock({'vehicle' : vehicle}) + gmtp.Behaviour.SendMessage('equipplayer', None, pars) + #Finally Register it to the network pars = parblock({'registered' : True}) vehicle.Behaviour.SendMessage('setregistered', None, pars) @@ -106,14 +104,9 @@ pars = parblock({'entity' : vehicle}) gmtp.Behaviour.SendMessage('positionplayer', None, pars) - #Equip random model for weapons - models = ioLoader.scanModels(vehicleinfo['Path']) - if len(models) > 0: - model = random.choice(models) - weapons = model['Weapons'] - for mount, weapon in weapons.items(): - pars = parblock({'mount' : mount, 'weapon' : weapon}) - vehicle.Behaviour.SendMessage('addweapon', None, pars) + #Add the weapons (depending on gametype) + pars = parblock({'vehicle' : vehicle}) + gmtp.Behaviour.SendMessage('equipbot', None, pars) pars = parblock({'player' : False}) vehicle.Behaviour.SendMessage('setplayer', None, pars) Modified: trunk/ioData/gametypes/ioGameBaseCl.py =================================================================== --- trunk/ioData/gametypes/ioGameBaseCl.py 2008-01-15 06:00:54 UTC (rev 1164) +++ trunk/ioData/gametypes/ioGameBaseCl.py 2008-01-24 09:24:37 UTC (rev 1165) @@ -3,6 +3,7 @@ import cPickle import Menu +import ioLoader import ioNetHelper class ioGameBaseCl: @@ -116,4 +117,27 @@ #Destroy the killed message def pctimer_wakeup(self, pc, args): - self.kmessage.Billboard.MoveToPosition(1000, -200000, 80000) \ No newline at end of file + self.kmessage.Billboard.MoveToPosition(1000, -200000, 80000) + + #Most gametypes will have the vehicle mounted with weapons + #If you want to make a gametype without weapons, just override this with pass + #This one equips weapons as saved in config + def equipplayer(self, pc, args): + player = args[parid('vehicle')] + for mount in ['Front1', 'Front2', 'Roof1', 'Roof2', 'Side1', 'Side2', 'Rear1', 'Rear2']: + weapon = Config.GetStr('Outlaws.Player.' + mount, 'BRWNG') + pars = parblock({'mount' : mount, 'weapon' : weapon}) + player.Behaviour.SendMessage('addweapon', None, pars) + + #Equip weapons for the bots. + #Takes random weapons and adds them. + def equipbot(self, pc, args): + vehicle = args[parid('vehicle')] + #Equip random model for weapons + models = ioLoader.scanModels(vehicleinfo['Path']) + if len(models) > 0: + model = random.choice(models) + weapons = model['Weapons'] + for mount, weapon in weapons.items(): + pars = parblock({'mount' : mount, 'weapon' : weapon}) + vehicle.Behaviour.SendMessage('addweapon', None, pars) \ No newline at end of file Modified: trunk/ioData/scripts/ioDispatcher.py =================================================================== --- trunk/ioData/scripts/ioDispatcher.py 2008-01-15 06:00:54 UTC (rev 1164) +++ trunk/ioData/scripts/ioDispatcher.py 2008-01-24 09:24:37 UTC (rev 1165) @@ -37,8 +37,6 @@ if packet.ip in self.clients or packet.message in self.exceptions: reciever = pl.FindEntity(packet.entity) if reciever is not None: - if 'tgt' in packet.message: - print packet.message, packet.data reciever.Behaviour.SendMessage('r_%s' % packet.message, None, packet.toPars()) else: #print 'no entity', packet.entity Modified: trunk/ioData/server/game/ioEntityManager.py =================================================================== --- trunk/ioData/server/game/ioEntityManager.py 2008-01-15 06:00:54 UTC (rev 1164) +++ trunk/ioData/server/game/ioEntityManager.py 2008-01-24 09:24:37 UTC (rev 1165) @@ -98,6 +98,7 @@ idx += 1 if idx > len(entities) - 1: idx = 0 + print entities[idx] return entities[idx] else: return '' \ No newline at end of file Modified: trunk/ioData/vehicles/ioVehicleBase.py =================================================================== --- trunk/ioData/vehicles/ioVehicleBase.py 2008-01-15 06:00:54 UTC (rev 1164) +++ trunk/ioData/vehicles/ioVehicleBase.py 2008-01-24 09:24:37 UTC (rev 1165) @@ -296,59 +296,60 @@ #Add a weapon to the vehicle. if we can, return 0. 1 means we don't have the mount point, 2 means that weapon doesnt exist def addweapon(self, pc, args): - mount = args[getid('cel.parameter.mount')] - weapon = args[getid('cel.parameter.weapon')] - if weapon.strip() != '': - bodyMesh = celMesh(self.entity) - nodeob = self.scene.QueryObject().GetChild('', 0) - if self.weapons[mount]: - oldweapon = self.weapons[mount] - self.hardpoints.remove(oldweapon) - RemoveEntity(oldweapon) - #Make sure vehicle has this mount point - if nodeob: - mountNode = nodeob.QueryInterface(iMapNode) - template = EntityTemplates[weapon + '-tpl'] - if template: - name = self.entity.Name + mount - weaponent = CreateEntity(template, name, celEntityTemplateParams()) - self.weapons[mount] = weaponent - self.hardpoints.append(weaponent) - mesh = celMesh(weaponent) - mesh.MoveMesh(self.scene, mountNode.GetPosition()) - mesh.Mesh.GetMovable().GetSceneNode().SetParent(bodyMesh.Mesh.GetMovable().GetSceneNode()) - mesh.Mesh.GetMovable().UpdateMove() - yvec = mountNode.GetYVector() - zvec = mountNode.GetZVector() - #Tell the weapon its initial orienation - pars = parblock({'y' : yvec, 'z' : zvec}) - weaponent.Behaviour.SendMessage('setorientation', None, pars) - #Tell the weapon its codename, so it can use them for the HUD - pars = parblock({'codename' : weapon}) - weaponent.Behaviour.SendMessage('setcodename', None, pars) + pass + #mount = args[getid('cel.parameter.mount')] + #weapon = args[getid('cel.parameter.weapon')] + #if weapon.strip() != '': + #bodyMesh = celMesh(self.entity) + #nodeob = self.scene.QueryObject().GetChild('') + #if self.weapons[mount]: + #oldweapon = self.weapons[mount] + #self.hardpoints.remove(oldweapon) + #RemoveEntity(oldweapon) + ##Make sure vehicle has this mount point + #if nodeob: + #mountNode = nodeob.QueryInterface(iMapNode) + #template = EntityTemplates[weapon + '-tpl'] + #if template: + #name = self.entity.Name + mount + #weaponent = CreateEntity(template, name, celEntityTemplateParams()) + #self.weapons[mount] = weaponent + #self.hardpoints.append(weaponent) + #mesh = celMesh(weaponent) + #mesh.MoveMesh(self.scene, mountNode.GetPosition()) + #mesh.Mesh.GetMovable().GetSceneNode().SetParent(bodyMesh.Mesh.GetMovable().GetSceneNode()) + #mesh.Mesh.GetMovable().UpdateMove() + #yvec = mountNode.GetYVector() + #zvec = mountNode.GetZVector() + ##Tell the weapon its initial orienation + #pars = parblock({'y' : yvec, 'z' : zvec}) + #weaponent.Behaviour.SendMessage('setorientation', None, pars) + ##Tell the weapon its codename, so it can use them for the HUD + #pars = parblock({'codename' : weapon}) + #weaponent.Behaviour.SendMessage('setcodename', None, pars) - index = len(self.hardpoints) - pars = parblock({'index' : index - 1}) - weaponent.Behaviour.SendMessage('setindex', None, pars) + #index = len(self.hardpoints) + #pars = parblock({'index' : index - 1}) + #weaponent.Behaviour.SendMessage('setindex', None, pars) - #Tell the weapon its player so it knows how to act - pars = parblock({'name' : self.entity.Name, 'player' : self.player}) - weaponent.Behaviour.SendMessage('setparent', None, pars) + ##Tell the weapon its player so it knows how to act + #pars = parblock({'name' : self.entity.Name, 'player' : self.player}) + #weaponent.Behaviour.SendMessage('setparent', None, pars) - #Add it to the weapon group for this weapon. - if self.weapongroups.has_key(weapon): - if index not in self.weapongroups[weapon]: - self.weapongroups[weapon].append(index) - else: - self.weapongroups[weapon] = [index] + ##Add it to the weapon group for this weapon. + #if self.weapongroups.has_key(weapon): + #if index not in self.weapongroups[weapon]: + #self.weapongroups[weapon].append(index) + #else: + #self.weapongroups[weapon] = [index] - return 0 - else: - return 2 - else: - return 1 - else: - return 1 + #return 0 + #else: + #return 2 + #else: + #return 1 + #else: + #return 1 def pccommandinput_firehardpoint11(self, pc, args): self.firehardpoint(1) Modified: trunk/ioData/vehicles/ioVehicleCl.py =================================================================== --- trunk/ioData/vehicles/ioVehicleCl.py 2008-01-15 06:00:54 UTC (rev 1164) +++ trunk/ioData/vehicles/ioVehicleCl.py 2008-01-24 09:24:37 UTC (rev 1165) @@ -259,6 +259,7 @@ self.listener.position = self.mesh.Mesh.GetMovable().GetPosition() self.listener.front = self.camera.Camera.GetTransform().GetFront() + #Tells the server version of our vehicle to find the next target def pccommandinput_target1(self, pc, args): self.net.sendData(self.entity.Name, 'nxtgt', []) @@ -287,7 +288,7 @@ pars = parblock({'name' : self.targetname}) self.botcontroller.Behaviour.SendMessage('settarget', None, pars) - #The server sets our link group + #The server sets our link group and chris sucks def r_setlnk(self, pc, args): #Stop shooting first so we don't mess things up for i in self.currentgroup: @@ -345,7 +346,7 @@ def setbot(self, pc, args): ioVehicleBase.setbot(self, pc, args) if self.bot: - self.botcontroller = CreateEntity('ioBotController', self.blpython, 'ioBotController') + self.botcontroller = CreateEntity('ioBC' + self.entity.Name, self.blpython, 'ioBotController') pars = parblock({'entity' : self.entity}) self.botcontroller.Behaviour.SendMessage('setcontrol', None, pars) pars = parblock({'name' : self.targetname}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cf...@us...> - 2008-01-15 06:00:53
|
Revision: 1164 http://automanic.svn.sourceforge.net/automanic/?rev=1164&view=rev Author: cfraz89 Date: 2008-01-14 22:00:54 -0800 (Mon, 14 Jan 2008) Log Message: ----------- update for cs svn Modified Paths: -------------- trunk/ioBaseInit.py trunk/ioData/maps/cod2/foliage-high trunk/ioData/menus/ioGameMenu.py trunk/ioData/menus/ioGameSelect.py trunk/ioData/menus/ioHostGame.py trunk/ioData/menus/ioJoinGame.py trunk/ioData/menus/ioMainMenu.py trunk/ioData/menus/ioOptionsScreen.py trunk/ioData/menus/ioServerSelect.py trunk/ioData/scripts/ioInit.py trunk/ioData/scripts/ioLoader.py trunk/ioData/server/ioServerBase.py trunk/ioData/vehicles/coyote/entities_world trunk/ioData/vehicles/ioVehicleBase.py Modified: trunk/ioBaseInit.py =================================================================== --- trunk/ioBaseInit.py 2007-11-03 00:39:00 UTC (rev 1163) +++ trunk/ioBaseInit.py 2008-01-15 06:00:54 UTC (rev 1164) @@ -42,6 +42,10 @@ path = os.environ['CRYSTAL'] path += '/out/linuxx86/optimize/bindings/python/' os.environ['PYTHONPATH'] += os.path.pathsep + path + if os.environ.has_key('CEL'): + path = os.environ['CEL'] + path += '/out/linuxx86/optimize/bindings/python/' + os.environ['PYTHONPATH'] += os.path.pathsep + path for path in paths: addPath(path) Modified: trunk/ioData/maps/cod2/foliage-high =================================================================== --- trunk/ioData/maps/cod2/foliage-high 2007-11-03 00:39:00 UTC (rev 1163) +++ trunk/ioData/maps/cod2/foliage-high 2008-01-15 06:00:54 UTC (rev 1164) @@ -2,6 +2,9 @@ <world> <shaders> <shader><file>/outlaws/ioData/scripts/particle_basic_dark.xml</file></shader> + <shader> + <file>/shader/specular/light_spec_bumpmap.xml</file> + </shader> </shaders> <textures> <!--foliage textures --> @@ -17,18 +20,24 @@ <binary /> </alpha> </texture> + <texture name="blank-normalmap"> + <file>/outlaws/textures/blank-normalmap.png</file> + <class>normalmap</class> + </texture> </textures> <materials> <!--foliage mats--> <material name="sage2.png"> <texture>sage2.png</texture> - <shader type="diffuse">particle_basic_dark</shader> - <!--<shader type="ambient">*null</shader>--> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="grass.dds"> <texture>grass.dds</texture> - <shader type="diffuse">particle_basic_dark</shader> - <!--<shader type="ambient">*null</shader>--> + <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> </material> </materials> <library>factories/grass.lib</library> Modified: trunk/ioData/menus/ioGameMenu.py =================================================================== --- trunk/ioData/menus/ioGameMenu.py 2007-11-03 00:39:00 UTC (rev 1163) +++ trunk/ioData/menus/ioGameMenu.py 2008-01-15 06:00:54 UTC (rev 1164) @@ -2,6 +2,7 @@ import Menu import os +import ioInit import ioLoader import ioDataBin import ioNetHelper @@ -112,9 +113,7 @@ def quitgame(self): netgame = Entities['ioNetMgrCl'] netgame.Behaviour.SendMessage('leavegame', None, celGenericParameterBlock(0)) - q = CS_QUERY_REGISTRY (oreg, iEventQueue) - if q: - q.GetEventOutlet().Broadcast (csevQuit (oreg)) + ioInit.exitgame() def pctimer_quit_wait(self, pc, args): self.afterpoll() Modified: trunk/ioData/menus/ioGameSelect.py =================================================================== --- trunk/ioData/menus/ioGameSelect.py 2007-11-03 00:39:00 UTC (rev 1163) +++ trunk/ioData/menus/ioGameSelect.py 2008-01-15 06:00:54 UTC (rev 1164) @@ -2,6 +2,7 @@ import cPickle import Menu +import ioInit import ioScroller import ioDataBin import ioNetHelper @@ -97,9 +98,7 @@ self.chatcl = CreateEntity('ioLobbyChat', self.blpython, 'ioLobbyChat') def pccommandinput_exit1(self, pc, args): - q = CS_QUERY_REGISTRY (oreg, iEventQueue) - if q: - q.GetEventOutlet().Broadcast (csevQuit (oreg)) + ioInit.exitgame() def pccommandinput_exit_(self, pc, args): pass Modified: trunk/ioData/menus/ioHostGame.py =================================================================== --- trunk/ioData/menus/ioHostGame.py 2007-11-03 00:39:00 UTC (rev 1163) +++ trunk/ioData/menus/ioHostGame.py 2008-01-15 06:00:54 UTC (rev 1164) @@ -3,6 +3,7 @@ import os import subprocess +import ioInit import ioBaseInit import ioDataBin import ioLoader @@ -116,9 +117,7 @@ self.lobbyname, self.lobbyserver = ioDataBin.Get('lobbyserver', True) def pccommandinput_exit1(self, pc, args): - q = CS_QUERY_REGISTRY (oreg, iEventQueue) - if q: - q.GetEventOutlet().Broadcast (csevQuit (oreg)) + ioInit.exitgame() def pccommandinput_exit_(self, pc, args): pass Modified: trunk/ioData/menus/ioJoinGame.py =================================================================== --- trunk/ioData/menus/ioJoinGame.py 2007-11-03 00:39:00 UTC (rev 1163) +++ trunk/ioData/menus/ioJoinGame.py 2008-01-15 06:00:54 UTC (rev 1164) @@ -2,6 +2,7 @@ import cPickle import os +import ioInit import ioLoader import Menu import ioScroller @@ -108,9 +109,7 @@ self.net.sendData('ioGSrv', 'getinfo', [self.entity.Name]) def pccommandinput_exit1(self, pc, args): - q = CS_QUERY_REGISTRY (oreg, iEventQueue) - if q: - q.GetEventOutlet().Broadcast (csevQuit (oreg)) + ioInit.exitgame() def name_click(self, pc, args): self.inputs.activate('myname') Modified: trunk/ioData/menus/ioMainMenu.py =================================================================== --- trunk/ioData/menus/ioMainMenu.py 2007-11-03 00:39:00 UTC (rev 1163) +++ trunk/ioData/menus/ioMainMenu.py 2008-01-15 06:00:54 UTC (rev 1164) @@ -45,9 +45,7 @@ exitgame.x += 20000 def pccommandinput_exit1(self, pc, args): - q = CS_QUERY_REGISTRY (oreg, iEventQueue) - if q: - q.GetEventOutlet().Broadcast (csevQuit (oreg)) + ioInit.exitgame() def pccommandinput_exit_(self, pc, args): pass Modified: trunk/ioData/menus/ioOptionsScreen.py =================================================================== --- trunk/ioData/menus/ioOptionsScreen.py 2007-11-03 00:39:00 UTC (rev 1163) +++ trunk/ioData/menus/ioOptionsScreen.py 2008-01-15 06:00:54 UTC (rev 1164) @@ -4,6 +4,7 @@ import socket import Menu +import ioInit import ioScroller import ioDataBin @@ -69,9 +70,7 @@ self.currentscreen = CreateEntity('ioVideoOptions', self.blpython, 'ioVideoOptions') def pccommandinput_exit1(self, pc, args): - q = CS_QUERY_REGISTRY (oreg, iEventQueue) - if q: - q.GetEventOutlet().Broadcast (csevQuit (oreg)) + ioInit.exitgame() def pccommandinput_exit_(self, pc, args): pass Modified: trunk/ioData/menus/ioServerSelect.py =================================================================== --- trunk/ioData/menus/ioServerSelect.py 2007-11-03 00:39:00 UTC (rev 1163) +++ trunk/ioData/menus/ioServerSelect.py 2008-01-15 06:00:54 UTC (rev 1164) @@ -3,6 +3,7 @@ import urllib2 import socket +import ioInit import ioNetHelper import ioDownloader import Menu @@ -77,9 +78,7 @@ self.Refresh_click(None, celGenericParameterBlock(0)) def pccommandinput_exit1(self, pc, args): - q = CS_QUERY_REGISTRY (oreg, iEventQueue) - if q: - q.GetEventOutlet().Broadcast (csevQuit (oreg)) + ioInit.exitgame() def pccommandinput_exit_(self, pc, args): pass Modified: trunk/ioData/scripts/ioInit.py =================================================================== --- trunk/ioData/scripts/ioInit.py 2007-11-03 00:39:00 UTC (rev 1163) +++ trunk/ioData/scripts/ioInit.py 2008-01-15 06:00:54 UTC (rev 1164) @@ -10,7 +10,7 @@ exitgame() def exitgame(): - q = CS_QUERY_REGISTRY (oreg, iEventQueue) + q = oreg.Get(iEventQueue) if q: q.GetEventOutlet().Broadcast (csevQuit (oreg)) Modified: trunk/ioData/scripts/ioLoader.py =================================================================== --- trunk/ioData/scripts/ioLoader.py 2007-11-03 00:39:00 UTC (rev 1163) +++ trunk/ioData/scripts/ioLoader.py 2008-01-15 06:00:54 UTC (rev 1164) @@ -14,7 +14,7 @@ mechsysent = CreateEntity('ioMechSys', blpython, None) mechsys = celCreateMechanicsSystem(physicallayer_ptr, mechsysent) dyn = mechsys.DynamicSystem - osys = SCF_QUERY_INTERFACE (dyn, iODEDynamicSystemState) + osys = dyn.QueryInterface(iODEDynamicSystemState) osys.SetContactMaxCorrectingVel(0.5) osys.SetCFM(0.000075) osys.SetERP(0.5) @@ -204,10 +204,10 @@ if file[-4:] in ['.wav', '.mp3', '.ogg']: path = '/outlaws/%s/%s' % (root, file) name = file.split('.')[0] - smgr = CS_QUERY_REGISTRY(oreg, iSndSysManager) - sloader = CS_QUERY_REGISTRY(oreg, iSndSysLoader) + smgr = oreg.Get(iSndSysManager) + sloader = oreg.Get(iSndSysLoader) if not sloader: - sloader = CS_LOAD_PLUGIN(PluginManager, "crystalspace.sndsys.element.loader", iSndSysLoader) + sloader = PluginManager.LoadPlugin("crystalspace.sndsys.element.loader", iSndSysLoader) if sloader: dbuf = Vfs.ReadFile(path) sdata = sloader.LoadSound(dbuf) Modified: trunk/ioData/server/ioServerBase.py =================================================================== --- trunk/ioData/server/ioServerBase.py 2007-11-03 00:39:00 UTC (rev 1163) +++ trunk/ioData/server/ioServerBase.py 2008-01-15 06:00:54 UTC (rev 1164) @@ -260,9 +260,7 @@ #Exit server process def killserver(self): print 'Server quit!' - q = CS_QUERY_REGISTRY (oreg, iEventQueue) - if q: - q.GetEventOutlet().Broadcast (csevQuit (oreg)) + ioInit.exitgame() #Attempt to bind the dispatcher to a port def bindport(self, port): Modified: trunk/ioData/vehicles/coyote/entities_world =================================================================== --- trunk/ioData/vehicles/coyote/entities_world 2007-11-03 00:39:00 UTC (rev 1163) +++ trunk/ioData/vehicles/coyote/entities_world 2008-01-15 06:00:54 UTC (rev 1164) @@ -15,7 +15,7 @@ <propclass name="pcobject.mesh.deform"> <property name="deformfactor" float="50.0" /> <property name="noise" float="0.1" /> - <property name="maxdeform" float="0.05" /> + <property name="maxdeform" float="0.075" /> <property name="radius" float="0.85" /> </propclass> <propclass name="pctools.properties"> Modified: trunk/ioData/vehicles/ioVehicleBase.py =================================================================== --- trunk/ioData/vehicles/ioVehicleBase.py 2007-11-03 00:39:00 UTC (rev 1163) +++ trunk/ioData/vehicles/ioVehicleBase.py 2008-01-15 06:00:54 UTC (rev 1164) @@ -101,7 +101,7 @@ def makeShadow(self): self.decal_mgr = CS_QUERY_REGISTRY_TAG_INTERFACE (oreg, "crystalspace.decal.manager", iDecalManager) if not self.decal_mgr: - self.decal_mgr = CS_LOAD_PLUGIN(PluginManager, "crystalspace.decal.manager", iDecalManager) + self.decal_mgr = PluginManager.LoadPlugin("crystalspace.decal.manager", iDecalManager) mat = Engine.FindMaterial('shadow') if not mat: Loader.LoadTexture ('shadow', '/outlaws/textures/shadow.png') @@ -136,7 +136,7 @@ partfact = Engine.FindMeshFactory('dustTrail') for i in xrange(self.wheeled.WheelCount): colpart = Engine.CreateMeshWrapper(partfact, self.entity.Name + 'trail' + str(i), self.scene, csVector3(0)) - partsys = SCF_QUERY_INTERFACE(colpart.GetMeshObject(), iParticleSystem) + partsys = colpart.GetMeshObject().QueryInterface(iParticleSystem) self.wheeltrails.append([colpart, partsys, False, 0.0]) #Move and reset size of the wheel trails @@ -300,14 +300,14 @@ weapon = args[getid('cel.parameter.weapon')] if weapon.strip() != '': bodyMesh = celMesh(self.entity) - nodeob = self.scene.QueryObject().GetChild(self.codename + '-' + mount) + nodeob = self.scene.QueryObject().GetChild('', 0) if self.weapons[mount]: oldweapon = self.weapons[mount] self.hardpoints.remove(oldweapon) RemoveEntity(oldweapon) #Make sure vehicle has this mount point if nodeob: - mountNode = SCF_QUERY_INTERFACE(nodeob, iMapNode) + mountNode = nodeob.QueryInterface(iMapNode) template = EntityTemplates[weapon + '-tpl'] if template: name = self.entity.Name + mount @@ -747,7 +747,7 @@ for point in ['Exhaust1', 'Exhaust2']: nodeob = self.scene.QueryObject().GetChild('%s-%s'% (self.codename, point)) if nodeob: - node = SCF_QUERY_INTERFACE(nodeob, iMapNode) + node = nodeob.QueryInterface(iMapNode) if node: exhaust = Engine.CreateMeshWrapper(exhaustfact, 'exhaustsmoke', self.scene, node.GetPosition()) exhaust.GetMovable().GetSceneNode().SetParent(mesh.GetMovable().GetSceneNode()) @@ -759,7 +759,7 @@ mesh = celMesh(self.entity).Mesh nodeob = self.scene.QueryObject().GetChild('%s-Engine' % self.codename) if nodeob: - node = SCF_QUERY_INTERFACE(nodeob, iMapNode) + node = nodeob.QueryInterface(iMapNode) if node: self.enginesmoke = Engine.CreateMeshWrapper(smokefact, 'enginesmoke', self.scene, node.GetPosition()) self.enginesmoke.GetMovable().GetSceneNode().SetParent(mesh.GetMovable().GetSceneNode()) @@ -793,7 +793,7 @@ #Find the mount for the weapon, and reparent it to the mount position and orientation nodeob = self.scene.QueryObject().GetChild(self.codename + '-' + mount) if nodeob: - mountNode = SCF_QUERY_INTERFACE(nodeob, iMapNode) + mountNode = nodeob.QueryInterface(iMapNode) mesh.GetMovable().SetPosition(mountNode.GetPosition()) mesh.GetMovable().GetSceneNode().SetParent(dmgmesh.GetMovable().GetSceneNode()) zvec = mountNode.GetZVector() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cf...@us...> - 2007-11-03 00:39:01
|
Revision: 1163 http://automanic.svn.sourceforge.net/automanic/?rev=1163&view=rev Author: cfraz89 Date: 2007-11-02 17:39:00 -0700 (Fri, 02 Nov 2007) Log Message: ----------- disabled antisway Modified Paths: -------------- trunk/ioData/vehicles/Van/entities_world trunk/ioData/vehicles/coyote/entities_world trunk/ioData/vehicles/coyote/world trunk/ioData/vehicles/falcon/entities_world trunk/ioData/vehicles/fedex/entities_world trunk/ioData/vehicles/strider/entities_world trunk/ioData/vehicles/trekker/entities_world trunk/ioData/vehicles/voyager/entities_world Modified: trunk/ioData/vehicles/Van/entities_world =================================================================== --- trunk/ioData/vehicles/Van/entities_world 2007-10-30 04:03:06 UTC (rev 1162) +++ trunk/ioData/vehicles/Van/entities_world 2007-11-03 00:39:00 UTC (rev 1163) @@ -40,7 +40,7 @@ <property name="autoreverse" bool="true"/> <property name="brakeforce" float="1400.0"/> <property name="abs" bool="false"/> - <property name="antisway" bool="true" /> +<!-- <property name="antisway" bool="false" /> --> <property name="steeramount" float="0.7"/> <!--Front Left Wheel--> <action name="AddWheel"> Modified: trunk/ioData/vehicles/coyote/entities_world =================================================================== --- trunk/ioData/vehicles/coyote/entities_world 2007-10-30 04:03:06 UTC (rev 1162) +++ trunk/ioData/vehicles/coyote/entities_world 2007-11-03 00:39:00 UTC (rev 1163) @@ -40,7 +40,7 @@ <property name="autoreverse" bool="true"/> <property name="brakeforce" float="5000.0"/> <property name="abs" bool="false"/> - <property name="antisway" bool="false" /> +<!-- <property name="antisway" bool="false" /> --> <property name="steeramount" float="0.8"/> <!--Front Left Wheel--> <action name="AddWheel"> Modified: trunk/ioData/vehicles/coyote/world =================================================================== --- trunk/ioData/vehicles/coyote/world 2007-10-30 04:03:06 UTC (rev 1162) +++ trunk/ioData/vehicles/coyote/world 2007-11-03 00:39:00 UTC (rev 1163) @@ -47,7 +47,7 @@ <shadervar type="texture" name="tex normal">BUMPWheel_512_N.png</shadervar> <shadervar type="texture" name="tex height">BUMPWheel_512_H.png</shadervar> <shadervar type="texture" name="tex attn">BUMPWheel_512_S.png</shadervar> - <shadervar type="vector4" name="specular">1,1,1,0.5</shadervar> + <shadervar type="vector4" name="specular">0.1,0.1,0.1,0.5</shadervar> </material> <material name="MaterialBody_2k_D.png"> <texture>Body_2k_D.png</texture> @@ -55,7 +55,7 @@ <shader type="diffuse">light_spec_bumpmap</shader> <shadervar type="texture" name="tex normal">blank-normalmap</shadervar> <shadervar type="texture" name="tex attn">BUMPBody_2k_S.png</shadervar> - <shadervar type="vector4" name="specular">1,1,1,0.5</shadervar> + <shadervar type="vector4" name="specular">0.4,0.4,0.4,0.1</shadervar> </material> </materials> <sounds/> Modified: trunk/ioData/vehicles/falcon/entities_world =================================================================== --- trunk/ioData/vehicles/falcon/entities_world 2007-10-30 04:03:06 UTC (rev 1162) +++ trunk/ioData/vehicles/falcon/entities_world 2007-11-03 00:39:00 UTC (rev 1163) @@ -40,7 +40,7 @@ <property name="autoreverse" bool="true"/> <property name="brakeforce" float="1500.0"/> <property name="abs" bool="false"/> - <property name="antisway" bool="true" /> +<!-- <property name="antisway" bool="false" /> --> <property name="steeramount" float="0.7"/> <!--Front Left Wheel--> <action name="AddWheel"> Modified: trunk/ioData/vehicles/fedex/entities_world =================================================================== --- trunk/ioData/vehicles/fedex/entities_world 2007-10-30 04:03:06 UTC (rev 1162) +++ trunk/ioData/vehicles/fedex/entities_world 2007-11-03 00:39:00 UTC (rev 1163) @@ -40,7 +40,7 @@ <property name="autoreverse" bool="true"/> <property name="brakeforce" float="1200.0"/> <property name="abs" bool="false"/> - <property name="antisway" bool="false" /> +<!-- <property name="antisway" bool="false" /> --> <property name="steeramount" float="0.7"/> <!--Front Left Wheel--> <action name="AddWheel"> Modified: trunk/ioData/vehicles/strider/entities_world =================================================================== --- trunk/ioData/vehicles/strider/entities_world 2007-10-30 04:03:06 UTC (rev 1162) +++ trunk/ioData/vehicles/strider/entities_world 2007-11-03 00:39:00 UTC (rev 1163) @@ -37,7 +37,7 @@ <property name="autoreverse" bool="true"/> <property name="brakeforce" float="1200.0"/> <property name="abs" bool="false"/> - <property name="antisway" bool="false" /> +<!-- <property name="antisway" bool="false" /> --> <property name="steeramount" float="0.7"/> <!--Front Left Wheel--> <action name="AddWheel"> Modified: trunk/ioData/vehicles/trekker/entities_world =================================================================== --- trunk/ioData/vehicles/trekker/entities_world 2007-10-30 04:03:06 UTC (rev 1162) +++ trunk/ioData/vehicles/trekker/entities_world 2007-11-03 00:39:00 UTC (rev 1163) @@ -40,7 +40,7 @@ <property name="autoreverse" bool="true"/> <property name="brakeforce" float="2000.0"/> <property name="abs" bool="false"/> - <property name="antisway" bool="true" /> +<!-- <property name="antisway" bool="false" /> --> <property name="steeramount" float="0.7"/> <!--Front Left Wheel--> <action name="AddWheel"> Modified: trunk/ioData/vehicles/voyager/entities_world =================================================================== --- trunk/ioData/vehicles/voyager/entities_world 2007-10-30 04:03:06 UTC (rev 1162) +++ trunk/ioData/vehicles/voyager/entities_world 2007-11-03 00:39:00 UTC (rev 1163) @@ -40,7 +40,7 @@ <property name="autoreverse" bool="true"/> <property name="brakeforce" float="5000.0"/> <property name="abs" bool="false"/> - <property name="antisway" bool="false" /> +<!-- <property name="antisway" bool="false" /> --> <property name="steeramount" float="0.8"/> <!--Front Left Wheel--> <action name="AddWheel"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cf...@us...> - 2007-10-30 04:03:08
|
Revision: 1162 http://automanic.svn.sourceforge.net/automanic/?rev=1162&view=rev Author: cfraz89 Date: 2007-10-29 21:03:06 -0700 (Mon, 29 Oct 2007) Log Message: ----------- added new coyote + cod2 Modified Paths: -------------- trunk/ioData/client/ioBotController.py trunk/ioData/client/ioEntityManagerClient.py trunk/ioData/client/ioNetGameClient.py trunk/ioData/effects/dusttrail.xml trunk/ioData/effects/exhaust.xml trunk/ioData/entities/ioMapBase.py trunk/ioData/hud/ioHUD.py trunk/ioData/menus/ioGameMenu.py trunk/ioData/scripts/ioLoader.py trunk/ioData/vehicles/ioVehicleBase.py trunk/ioData/vehicles/ioVehicleCl.py trunk/ioData/weapons/browning/factories/genBrowning trunk/ioData/weapons/browning/world trunk/ioData/weapons/ffar/factories/genFFAR trunk/ioData/weapons/ffar/factories/genRocket trunk/ioData/weapons/ffar/world trunk/ioData/weapons/flamer/factories/genFlamer trunk/ioData/weapons/flamer/world trunk/ioData/weapons/ioWeapon.py trunk/ioData/weapons/minelayer/factories/genMine trunk/ioData/weapons/minelayer/factories/genMineLayer trunk/ioData/weapons/minelayer/world Added Paths: ----------- trunk/ioData/maps/cod2/ trunk/ioData/maps/cod2/Sand00.png trunk/ioData/maps/cod2/Sand01.png trunk/ioData/maps/cod2/cod.png trunk/ioData/maps/cod2/cracked.png trunk/ioData/maps/cod2/entities_world trunk/ioData/maps/cod2/factories/ trunk/ioData/maps/cod2/factories/bush2.lib trunk/ioData/maps/cod2/factories/genBigRamp trunk/ioData/maps/cod2/factories/genBridge trunk/ioData/maps/cod2/factories/genRamp trunk/ioData/maps/cod2/factories/grass.lib trunk/ioData/maps/cod2/factories/rock.lib trunk/ioData/maps/cod2/foliage-high trunk/ioData/maps/cod2/foliage-low trunk/ioData/maps/cod2/grass.png trunk/ioData/maps/cod2/info.cfg trunk/ioData/maps/cod2/level.xml trunk/ioData/maps/cod2/matbase.png trunk/ioData/maps/cod2/matmap.png trunk/ioData/maps/cod2/sky-old.jpg trunk/ioData/maps/cod2/sky.jpg trunk/ioData/maps/cod2/textures/ trunk/ioData/maps/cod2/textures/BiGRamp.jpg trunk/ioData/maps/cod2/textures/RAMP1.JPG trunk/ioData/maps/cod2/textures/bridge_1.jpg trunk/ioData/maps/cod2/textures/grass.dds trunk/ioData/maps/cod2/textures/normalmap.png trunk/ioData/maps/cod2/textures/rocky_surface.jpg trunk/ioData/maps/cod2/textures/sage2.png trunk/ioData/maps/cod2/textures/sand-n-old.png trunk/ioData/maps/cod2/textures/sand-n.png trunk/ioData/maps/cod2/textures/stone-n.png trunk/ioData/maps/cod2/world trunk/ioData/vehicles/coyote/ trunk/ioData/vehicles/coyote/entities_world trunk/ioData/vehicles/coyote/factories/ trunk/ioData/vehicles/coyote/factories/genCoyoteBody trunk/ioData/vehicles/coyote/factories/genCoyoteFront trunk/ioData/vehicles/coyote/factories/genCoyoteLeft trunk/ioData/vehicles/coyote/factories/genCoyoteRear trunk/ioData/vehicles/coyote/factories/genCoyoteRight trunk/ioData/vehicles/coyote/factories/genCoyoteWheel trunk/ioData/vehicles/coyote/info.cfg trunk/ioData/vehicles/coyote/models/ trunk/ioData/vehicles/coyote/models/.dolphinview trunk/ioData/vehicles/coyote/models/gt.cfg trunk/ioData/vehicles/coyote/models/rx.cfg trunk/ioData/vehicles/coyote/models/tx.cfg trunk/ioData/vehicles/coyote/textures/ trunk/ioData/vehicles/coyote/textures/Body_2k_D.png trunk/ioData/vehicles/coyote/textures/Body_2k_S.png trunk/ioData/vehicles/coyote/textures/Wheel_512_D.png trunk/ioData/vehicles/coyote/textures/Wheel_512_H.png trunk/ioData/vehicles/coyote/textures/Wheel_512_N.png trunk/ioData/vehicles/coyote/textures/Wheel_512_S.png trunk/ioData/vehicles/coyote/world Modified: trunk/ioData/client/ioBotController.py =================================================================== --- trunk/ioData/client/ioBotController.py 2007-10-18 02:10:05 UTC (rev 1161) +++ trunk/ioData/client/ioBotController.py 2007-10-30 04:03:06 UTC (rev 1162) @@ -23,9 +23,6 @@ self.targetent = Entities[self.targetname] if self.targetent: self.targetmesh = celMesh(self.targetent) - - def destruct(self, pc, args): - self.entity.PropertyClassList.RemoveAll() def pctimer_wakeup(self, pc, args): if self.bot: @@ -33,25 +30,26 @@ if not self.accelerating: self.bot.Behaviour.SendMessage('pccommandinput_accelerate1', None, args) self.accelerating = True - #Try to pick a target - if self.targetname == '': - self.bot.Behaviour.SendMessage('pccommandinput_target1', None, args) - else: - if self.targetent: - targetpos = self.targetmesh.Mesh.GetMovable().GetPosition() - reltargetpos = self.botmesh.Mesh.GetMovable().GetTransform().Other2This(targetpos) - if reltargetpos.x > 0: - if self.steering != -1: - self.bot.Behaviour.SendMessage('pccommandinput_steerleft1', None, args) - self.steering = -1 - else: - if self.steering != 1: - self.bot.Behaviour.SendMessage('pccommandinput_steerright1', None, args) - self.steering = 1 - #Fire in bursts: - if not self.shooting: - self.bot.Behaviour.SendMessage('pccommandinput_shoot1', None, args) - self.shooting = True - else: - self.bot.Behaviour.SendMessage('pccommandinput_shoot0', None, args) - self.shooting = False \ No newline at end of file + ##Try to pick a target + #if not self.targetent: + #self.bot.Behaviour.SendMessage('pccommandinput_target1', None, args) + #else: + #if self.targetent: + #print self.targetent.name + #targetpos = self.targetmesh.Mesh.GetMovable().GetPosition() + #reltargetpos = self.botmesh.Mesh.GetMovable().GetTransform().Other2This(targetpos) + #if reltargetpos.x > 0: + #if self.steering != -1: + #self.bot.Behaviour.SendMessage('pccommandinput_steerleft1', None, args) + #self.steering = -1 + #else: + #if self.steering != 1: + #self.bot.Behaviour.SendMessage('pccommandinput_steerright1', None, args) + #self.steering = 1 + ##Fire in bursts: + #if not self.shooting: + #self.bot.Behaviour.SendMessage('pccommandinput_shoot1', None, args) + #self.shooting = True + #else: + #self.bot.Behaviour.SendMessage('pccommandinput_shoot0', None, args) + #self.shooting = False \ No newline at end of file Modified: trunk/ioData/client/ioEntityManagerClient.py =================================================================== --- trunk/ioData/client/ioEntityManagerClient.py 2007-10-18 02:10:05 UTC (rev 1161) +++ trunk/ioData/client/ioEntityManagerClient.py 2007-10-30 04:03:06 UTC (rev 1162) @@ -14,7 +14,7 @@ def __init__(self, celEntity): self.entity = celEntity self.entities = [] - self.maxbots = 2 + self.maxbots = 0 self.bots = 0 self.net = ioNetHelper.ioNetHelper() @@ -96,7 +96,7 @@ #Pick a random vehicle, and extract its template #vehicleinfo = random.choice(vehicles) - vehicleinfo = filter(lambda v: v['Codename'] == 'Voyager', vehicles)[0] + vehicleinfo = filter(lambda v: v['Codename'] == 'Coyote', vehicles)[0] vehicle = ioNetworkEntCl.makeEntity(vehicleinfo['Codename'], 'ioBot' + str(self.bots)) mesh = celMesh(vehicle) mesh.MoveMesh(Engine.GetSectors().Get(0), mesh.Mesh.GetMovable().GetPosition()) Modified: trunk/ioData/client/ioNetGameClient.py =================================================================== --- trunk/ioData/client/ioNetGameClient.py 2007-10-18 02:10:05 UTC (rev 1161) +++ trunk/ioData/client/ioNetGameClient.py 2007-10-30 04:03:06 UTC (rev 1162) @@ -129,8 +129,8 @@ self.timer.Clear() mapinfo = ioLoader.findSubfolderCfgString('maps', self.mapname) ioLoader.loadLibraryFolder('effects') - ioLoader.loadWorldFolder('weapons', True) ioLoader.loadWorldFolder('vehicles', True) + ioLoader.loadWorldFolder('weapons', True) ioLoader.loadWorldFolder('entities', True) gameworld = ioLoader.makeGameWorld(mapinfo['Path']) Engine.PrecacheDraw() @@ -193,7 +193,6 @@ RemoveEntity(self.entity) def destruct(self, pc, args): - self.entity.PropertyClassList.RemoveAll() self.menu.clear() if self.logs: self.logs.destruct() Modified: trunk/ioData/effects/dusttrail.xml =================================================================== --- trunk/ioData/effects/dusttrail.xml 2007-10-18 02:10:05 UTC (rev 1161) +++ trunk/ioData/effects/dusttrail.xml 2007-10-30 04:03:06 UTC (rev 1162) @@ -10,7 +10,8 @@ <materials> <material name='dust.png'> <texture>dust.png</texture> - <shader type="standard">particle_basic_dark</shader> + <shader type="diffuse">particle_basic_dark</shader> + <shader type="ambient">*null</shader> </material> </materials> <meshfact name="dustTrail"> Modified: trunk/ioData/effects/exhaust.xml =================================================================== --- trunk/ioData/effects/exhaust.xml 2007-10-18 02:10:05 UTC (rev 1161) +++ trunk/ioData/effects/exhaust.xml 2007-10-30 04:03:06 UTC (rev 1162) @@ -10,7 +10,8 @@ <materials> <material name='smoke-normed-dark.png'> <texture>smoke-normed.png</texture> - <shader type="standard">particle_basic_dark</shader> + <shader type="diffuse">particle_basic_dark</shader> + <shader type="ambient">*null</shader> </material> </materials> <meshfact name="exhaustSmoke"> Modified: trunk/ioData/entities/ioMapBase.py =================================================================== --- trunk/ioData/entities/ioMapBase.py 2007-10-18 02:10:05 UTC (rev 1161) +++ trunk/ioData/entities/ioMapBase.py 2007-10-30 04:03:06 UTC (rev 1162) @@ -11,7 +11,4 @@ def pcdamage_hurt(self, pc, args): pass - - def destruct(self, pc, args): - self.entity.PropertyClassList.RemoveAll() Modified: trunk/ioData/hud/ioHUD.py =================================================================== --- trunk/ioData/hud/ioHUD.py 2007-10-18 02:10:05 UTC (rev 1161) +++ trunk/ioData/hud/ioHUD.py 2007-10-30 04:03:06 UTC (rev 1162) @@ -490,9 +490,6 @@ #First deselect all for i in group: self.hardpoints[i - 1].materialnamefast = 'selection' - - def destruct(self, pc, args): - self.entity.PropertyClassList.RemoveAll() #Hide or show the hud def setvisible(self, pc, args): Added: trunk/ioData/maps/cod2/Sand00.png =================================================================== (Binary files differ) Property changes on: trunk/ioData/maps/cod2/Sand00.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/ioData/maps/cod2/Sand01.png =================================================================== (Binary files differ) Property changes on: trunk/ioData/maps/cod2/Sand01.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/ioData/maps/cod2/cod.png =================================================================== (Binary files differ) Property changes on: trunk/ioData/maps/cod2/cod.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/ioData/maps/cod2/cracked.png =================================================================== (Binary files differ) Property changes on: trunk/ioData/maps/cod2/cracked.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/ioData/maps/cod2/entities_world =================================================================== --- trunk/ioData/maps/cod2/entities_world (rev 0) +++ trunk/ioData/maps/cod2/entities_world 2007-10-30 04:03:06 UTC (rev 1162) @@ -0,0 +1,198 @@ +<?xml version="1.0" encoding="UTF-8"?> +<world> + <sector name="Scene"> + + <addon entityname="map" plugin="cel.addons.celentity"> + <propclass name="pcobject.mesh"> + <action name="SetMesh"> + <par string="Terrain" name="name"/> + </action> + </propclass> + <propclass name="pcphysics.object"> + <action name="InitPhys"> + <par float="1.15" name="friction"/> + <par float="99999999999999999999.99" name="mass"/> + <par float="0.0" name="elasticity"/> + <par float="1" name="density"/> + <par float="0.0005" name="softness"/> + <par bool="true" name="enabled" /> + </action> + <action name="SetColliderMesh" /> + <action name="AddToGroup"> + <par string="mapgroup" name="group" /> + </action> + <action name="MakeStatic"><par bool="true" name="static" /></action> + </propclass> + <behaviour layer="blpython" name="ioMapBase"/> + </addon> + <addon entityname="Ramp" plugin="cel.addons.celentity"> + <propclass name="pcobject.mesh"> + <action name="SetMesh"> + <par string="RampModel" name="name"/> + </action> + </propclass> + <propclass name="pcphysics.object"> + <action name="InitPhys"> + <par float="1.15" name="friction"/> + <par float="90000.0" name="mass"/> + <par float="0.05" name="elasticity"/> + <par float="1.0" name="density"/> + <par float="0" name="softness"/> + <par bool="true" name="enabled" /> + </action> + <action name="SetColliderMesh" /> + <action name="AddToGroup"> + <par string="mapgroup" name="group" /> + </action> + <action name="MakeStatic"> + <par bool="true" name="static"/> + </action> + </propclass> + </addon> + <addon entityname="Ramp1" plugin="cel.addons.celentity"> + <propclass name="pcobject.mesh"> + <action name="SetMesh"> + <par string="RampModel1" name="name"/> + </action> + </propclass> + <propclass name="pcphysics.object"> + <action name="InitPhys"> + <par float="1.15" name="friction"/> + <par float="90000.0" name="mass"/> + <par float="0.05" name="elasticity"/> + <par float="1.0" name="density"/> + <par float="0" name="softness"/> + <par bool="true" name="enabled" /> + </action> + <action name="SetColliderMesh" /> + <action name="AddToGroup"> + <par string="mapgroup" name="group" /> + </action> + <action name="MakeStatic"> + <par bool="true" name="static"/> + </action> + </propclass> + </addon> + <addon entityname="Bridge1" plugin="cel.addons.celentity"> + <propclass name="pcobject.mesh"> + <action name="SetMesh"> + <par string="BridgeModel" name="name"/> + </action> + </propclass> + <propclass name="pcphysics.object"> + <action name="InitPhys"> + <par float="1.15" name="friction"/> + <par float="9999999999.0" name="mass"/> + <par float="3.0" name="elasticity"/> + <par float="1.0" name="density"/> + <par float="0" name="softness"/> + <par bool="true" name="enabled" /> + </action> + <action name="SetColliderMesh" /> + <action name="AddToGroup"> + <par string="mapgroup" name="group" /> + </action> + <action name="MakeStatic"> + <par bool="true" name="static"/> + </action> + </propclass> + </addon> + <addon entityname="Bridge2" plugin="cel.addons.celentity"> + <propclass name="pcobject.mesh"> + <action name="SetMesh"> + <par string="BridgeModel1" name="name"/> + </action> + </propclass> + <propclass name="pcphysics.object"> + <action name="InitPhys"> + <par float="1.15" name="friction"/> + <par float="9999999999.0" name="mass"/> + <par float="0.0" name="elasticity"/> + <par float="3.0" name="density"/> + <par float="0" name="softness"/> + <par bool="true" name="enabled" /> + </action> + <action name="SetColliderMesh" /> + <action name="AddToGroup"> + <par string="mapgroup" name="group" /> + </action> + <action name="MakeStatic"> + <par bool="true" name="static"/> + </action> + </propclass> + </addon> + <addon entityname="Bridge2" plugin="cel.addons.celentity"> + <propclass name="pcobject.mesh"> + <action name="SetMesh"> + <par string="BridgeModel2" name="name"/> + </action> + </propclass> + <propclass name="pcphysics.object"> + <action name="InitPhys"> + <par float="1.15" name="friction"/> + <par float="9999999999.0" name="mass"/> + <par float="0.0" name="elasticity"/> + <par float="3.0" name="density"/> + <par float="0" name="softness"/> + <par bool="true" name="enabled" /> + </action> + <action name="SetColliderMesh" /> + <action name="AddToGroup"> + <par string="mapgroup" name="group" /> + </action> + <action name="MakeStatic"> + <par bool="true" name="static"/> + </action> + </propclass> + </addon> + <addon entityname="Bridge3" plugin="cel.addons.celentity"> + <propclass name="pcobject.mesh"> + <action name="SetMesh"> + <par string="BridgeModel3" name="name"/> + </action> + </propclass> + <propclass name="pcphysics.object"> + <action name="InitPhys"> + <par float="1.15" name="friction"/> + <par float="9999999999.0" name="mass"/> + <par float="0.0" name="elasticity"/> + <par float="3.0" name="density"/> + <par float="0" name="softness"/> + <par bool="true" name="enabled" /> + </action> + <action name="SetColliderMesh" /> + <action name="AddToGroup"> + <par string="mapgroup" name="group" /> + </action> + <action name="MakeStatic"> + <par bool="true" name="static"/> + </action> + </propclass> + </addon> + <addon entityname="BigRamp" plugin="cel.addons.celentity"> + <propclass name="pcobject.mesh"> + <action name="SetMesh"> + <par string="BigRamp" name="name"/> + </action> + </propclass> + <propclass name="pcphysics.object"> + <action name="InitPhys"> + <par float="1.15" name="friction"/> + <par float="9999999999.0" name="mass"/> + <par float="0.05" name="elasticity"/> + <par float="1.0" name="density"/> + <par float="0" name="softness"/> + <par bool="true" name="enabled" /> + </action> + <action name="SetColliderMesh" /> + <action name="AddToGroup"> + <par string="mapgroup" name="group" /> + </action> + <action name="MakeStatic"> + <par bool="true" name="static"/> + </action> + </propclass> + </addon> + + </sector> +</world> \ No newline at end of file Property changes on: trunk/ioData/maps/cod2/entities_world ___________________________________________________________________ Name: svn:executable + * Added: trunk/ioData/maps/cod2/factories/bush2.lib =================================================================== --- trunk/ioData/maps/cod2/factories/bush2.lib (rev 0) +++ trunk/ioData/maps/cod2/factories/bush2.lib 2007-10-30 04:03:06 UTC (rev 1162) @@ -0,0 +1,2561 @@ +<?xml version="1.0" encoding="utf-8" ?> +<library> + <plugins> + <plugin name="genmeshFactory">crystalspace.mesh.loader.factory.genmesh</plugin> + </plugins> + <meshfact name="bush2"> + <plugin>genmeshFactory</plugin> + <nohitbeam /> + <zuse /> + <params> + <material>sage2.png</material> + <numvt>848</numvt> + <numtri>848</numtri> + <v x="-0.224496" y="0.860113" z="-0.224496" u="1.000000" v="-1.000000" /> + <n x="-0.707107" y="0.000000" z="0.707107" /> + <v x="0.224496" y="0.860113" z="0.224496" u="0.000000" v="-1.000000" /> + <n x="-0.707107" y="0.000000" z="0.707107" /> + <v x="0.224496" y="0.000000" z="0.224496" u="0.000000" v="-0.000000" /> + <n x="-0.707107" y="0.000000" z="0.707107" /> + <v x="-0.224496" y="0.000000" z="-0.224496" u="1.000000" v="0.000000" /> + <n x="-0.707107" y="0.000000" z="0.707107" /> + <t v1="3" v2="2" v3="1" /> + <t v1="3" v2="1" v3="0" /> + <t v1="0" v2="1" v3="2" /> + <t v1="0" v2="2" v3="3" /> + <v x="0.281940" y="0.846003" z="-0.214893" u="1.000000" v="-1.000000" /> + <n x="-0.707107" y="0.000000" z="-0.707107" /> + <v x="-0.167052" y="0.846003" z="0.234099" u="0.000000" v="-1.000000" /> + <n x="-0.707107" y="0.000000" z="-0.707107" /> + <v x="-0.167052" y="-0.014111" z="0.234099" u="0.000000" v="-0.000000" /> + <n x="-0.707107" y="0.000000" z="-0.707107" /> + <v x="0.281940" y="-0.014111" z="-0.214893" u="1.000000" v="0.000000" /> + <n x="-0.707107" y="0.000000" z="-0.707107" /> + <t v1="7" v2="6" v3="5" /> + <t v1="7" v2="5" v3="4" /> + <t v1="4" v2="5" v3="6" /> + <t v1="4" v2="6" v3="7" /> + <v x="0.048898" y="0.403131" z="-0.409963" u="0.997910" v="-0.990420" /> + <n x="0.798865" y="0.454823" z="-0.393637" /> + <v x="0.052711" y="0.389743" z="-0.417693" u="0.837583" v="-0.992091" /> + <n x="0.798865" y="0.454823" z="-0.393637" /> + <v x="0.092791" y="0.378017" z="-0.349901" u="0.827834" v="-0.784418" /> + <n x="0.798865" y="0.454823" z="-0.393637" /> + <v x="0.085745" y="0.402756" z="-0.335618" u="0.990218" v="-0.787138" /> + <n x="0.798865" y="0.454823" z="-0.393637" /> + <t v1="11" v2="10" v3="9" /> + <t v1="11" v2="9" v3="8" /> + <t v1="8" v2="9" v3="10" /> + <t v1="8" v2="10" v3="11" /> + <v x="0.085745" y="0.402756" z="-0.335618" u="0.990218" v="-0.787138" /> + <n x="0.927784" y="0.345547" z="-0.140761" /> + <v x="0.092791" y="0.378017" z="-0.349901" u="0.827834" v="-0.784418" /> + <n x="0.927784" y="0.345547" z="-0.140761" /> + <v x="0.119572" y="0.343435" z="-0.258278" u="0.827985" v="-0.631514" /> + <n x="0.927784" y="0.345547" z="-0.140761" /> + <v x="0.110365" y="0.375758" z="-0.239616" u="0.995285" v="-0.631774" /> + <n x="0.927784" y="0.345547" z="-0.140761" /> + <t v1="15" v2="14" v3="13" /> + <t v1="15" v2="13" v3="12" /> + <t v1="12" v2="13" v3="14" /> + <t v1="12" v2="14" v3="15" /> + <v x="0.110365" y="0.375758" z="-0.239616" u="0.995285" v="-0.631774" /> + <n x="0.966829" y="0.252258" z="0.040085" /> + <v x="0.119572" y="0.343435" z="-0.258278" u="0.827985" v="-0.631514" /> + <n x="0.966829" y="0.252258" z="0.040085" /> + <v x="0.128976" y="0.291262" z="-0.156771" u="0.828468" v="-0.499016" /> + <n x="0.966829" y="0.252258" z="0.040085" /> + <v x="0.119010" y="0.326248" z="-0.136572" u="0.987363" v="-0.497791" /> + <n x="0.966829" y="0.252258" z="0.040085" /> + <t v1="19" v2="18" v3="17" /> + <t v1="19" v2="17" v3="16" /> + <t v1="16" v2="17" v3="18" /> + <t v1="16" v2="18" v3="19" /> + <v x="0.119010" y="0.326248" z="-0.136572" u="0.987363" v="-0.497791" /> + <n x="0.966829" y="0.160844" z="0.198420" /> + <v x="0.128976" y="0.291262" z="-0.156771" u="0.828468" v="-0.499016" /> + <n x="0.966829" y="0.160844" z="0.198420" /> + <v x="0.119572" y="0.229441" z="-0.060835" u="0.831546" v="-0.367574" /> + <n x="0.966829" y="0.160844" z="0.198420" /> + <v x="0.110365" y="0.261764" z="-0.042173" u="0.996898" v="-0.371652" /> + <n x="0.966829" y="0.160844" z="0.198420" /> + <t v1="23" v2="22" v3="21" /> + <t v1="23" v2="21" v3="20" /> + <t v1="20" v2="21" v3="22" /> + <t v1="20" v2="22" v3="23" /> + <v x="0.092791" y="0.167384" z="0.014926" u="0.832161" v="-0.214731" /> + <n x="0.927784" y="0.050872" z="0.369633" /> + <v x="0.085745" y="0.192123" z="0.029209" u="0.998009" v="-0.219698" /> + <n x="0.927784" y="0.050872" z="0.369633" /> + <v x="0.110365" y="0.261764" z="-0.042173" u="0.996898" v="-0.371652" /> + <n x="0.927784" y="0.050872" z="0.369633" /> + <v x="0.119572" y="0.229441" z="-0.060835" u="0.831546" v="-0.367574" /> + <n x="0.927784" y="0.050872" z="0.369633" /> + <t v1="27" v2="26" v3="25" /> + <t v1="27" v2="25" v3="24" /> + <t v1="24" v2="25" v3="26" /> + <t v1="24" v2="26" v3="27" /> + <v x="0.092791" y="0.167384" z="0.014926" u="0.832161" v="-0.214731" /> + <n x="0.851858" y="-0.488447" z="0.189098" /> + <v x="0.076431" y="0.130638" z="-0.006290" u="0.666409" v="-0.213389" /> + <n x="0.851858" y="-0.488447" z="0.189098" /> + <v x="0.043857" y="0.094651" z="0.047495" u="0.656261" v="-0.002102" /> + <n x="0.851858" y="-0.488447" z="0.189098" /> + <v x="0.052711" y="0.114538" z="0.058977" u="0.824120" v="-0.000799" /> + <n x="0.851858" y="-0.488447" z="0.189098" /> + <t v1="31" v2="30" v3="29" /> + <t v1="31" v2="29" v3="28" /> + <t v1="28" v2="29" v3="30" /> + <t v1="28" v2="30" v3="31" /> + <v x="0.119572" y="0.229441" z="-0.060835" u="0.831546" v="-0.367574" /> + <n x="0.915011" y="-0.403369" z="-0.006962" /> + <v x="0.098196" y="0.181430" z="-0.088554" u="0.666762" v="-0.366057" /> + <n x="0.915011" y="-0.403369" z="-0.006962" /> + <v x="0.076431" y="0.130638" z="-0.006290" u="0.666409" v="-0.213389" /> + <n x="0.915011" y="-0.403369" z="-0.006962" /> + <v x="0.092791" y="0.167384" z="0.014926" u="0.832161" v="-0.214731" /> + <n x="0.915011" y="-0.403369" z="-0.006962" /> + <t v1="35" v2="34" v3="33" /> + <t v1="35" v2="33" v3="32" /> + <t v1="32" v2="33" v3="34" /> + <t v1="32" v2="34" v3="35" /> + <v x="0.128976" y="0.291262" z="-0.156771" u="0.828468" v="-0.499016" /> + <n x="0.931403" y="-0.340659" z="-0.128219" /> + <v x="0.105839" y="0.239295" z="-0.186774" u="0.664855" v="-0.498422" /> + <n x="0.931403" y="-0.340659" z="-0.128219" /> + <v x="0.098196" y="0.181430" z="-0.088554" u="0.666762" v="-0.366057" /> + <n x="0.931403" y="-0.340659" z="-0.128219" /> + <v x="0.119572" y="0.229441" z="-0.060835" u="0.831546" v="-0.367574" /> + <n x="0.931403" y="-0.340659" z="-0.128219" /> + <t v1="39" v2="38" v3="37" /> + <t v1="39" v2="37" v3="36" /> + <t v1="36" v2="37" v3="38" /> + <t v1="36" v2="38" v3="39" /> + <v x="0.119572" y="0.343435" z="-0.258278" u="0.827985" v="-0.631514" /> + <n x="0.931403" y="-0.281371" z="-0.230910" /> + <v x="0.098196" y="0.295424" z="-0.285997" u="0.663306" v="-0.630877" /> + <n x="0.931403" y="-0.281371" z="-0.230910" /> + <v x="0.105839" y="0.239295" z="-0.186774" u="0.664855" v="-0.498422" /> + <n x="0.931403" y="-0.281371" z="-0.230910" /> + <v x="0.128976" y="0.291262" z="-0.156771" u="0.828468" v="-0.499016" /> + <n x="0.931403" y="-0.281371" z="-0.230910" /> + <t v1="43" v2="42" v3="41" /> + <t v1="43" v2="41" v3="40" /> + <t v1="40" v2="41" v3="42" /> + <t v1="40" v2="42" v3="43" /> + <v x="0.092791" y="0.378017" z="-0.349901" u="0.827834" v="-0.784418" /> + <n x="0.915011" y="-0.207714" z="-0.345847" /> + <v x="0.076431" y="0.341270" z="-0.371117" u="0.663689" v="-0.783353" /> + <n x="0.915011" y="-0.207714" z="-0.345847" /> + <v x="0.098196" y="0.295424" z="-0.285997" u="0.663306" v="-0.630877" /> + <n x="0.915011" y="-0.207714" z="-0.345847" /> + <v x="0.119572" y="0.343435" z="-0.258278" u="0.827985" v="-0.631514" /> + <n x="0.915011" y="-0.207714" z="-0.345847" /> + <t v1="47" v2="46" v3="45" /> + <t v1="47" v2="45" v3="44" /> + <t v1="44" v2="45" v3="46" /> + <t v1="44" v2="46" v3="47" /> + <v x="0.052711" y="0.389743" z="-0.417693" u="0.837583" v="-0.992091" /> + <n x="0.851857" y="-0.080460" z="-0.517557" /> + <v x="0.043857" y="0.369856" z="-0.429174" u="0.673609" v="-0.992926" /> + <n x="0.851857" y="-0.080460" z="-0.517557" /> + <v x="0.076431" y="0.341270" z="-0.371117" u="0.663689" v="-0.783353" /> + <n x="0.851857" y="-0.080460" z="-0.517557" /> + <v x="0.092791" y="0.378017" z="-0.349901" u="0.827834" v="-0.784418" /> + <n x="0.851857" y="-0.080460" z="-0.517557" /> + <t v1="51" v2="50" v3="49" /> + <t v1="51" v2="49" v3="48" /> + <t v1="48" v2="49" v3="50" /> + <t v1="48" v2="50" v3="51" /> + <v x="0.043857" y="0.369856" z="-0.429174" u="0.673609" v="-0.992926" /> + <n x="0.740250" y="-0.337490" z="-0.581490" /> + <v x="0.024707" y="0.348799" z="-0.441331" u="0.506821" v="-0.991336" /> + <n x="0.740250" y="-0.337490" z="-0.581490" /> + <v x="0.041047" y="0.302363" z="-0.393580" u="0.499086" v="-0.782154" /> + <n x="0.740250" y="-0.337490" z="-0.581490" /> + <v x="0.076431" y="0.341270" z="-0.371117" u="0.663689" v="-0.783353" /> + <n x="0.740250" y="-0.337490" z="-0.581490" /> + <t v1="55" v2="54" v3="53" /> + <t v1="55" v2="53" v3="52" /> + <t v1="52" v2="53" v3="54" /> + <t v1="52" v2="54" v3="55" /> + <v x="0.076431" y="0.341270" z="-0.371117" u="0.663689" v="-0.783353" /> + <n x="0.775895" y="-0.450876" z="-0.441246" /> + <v x="0.041047" y="0.302363" z="-0.393580" u="0.499086" v="-0.782154" /> + <n x="0.775895" y="-0.450876" z="-0.441246" /> + <v x="0.051964" y="0.244588" z="-0.315347" u="0.498843" v="-0.630014" /> + <n x="0.775895" y="-0.450876" z="-0.441246" /> + <v x="0.098196" y="0.295424" z="-0.285997" u="0.663306" v="-0.630877" /> + <n x="0.775895" y="-0.450876" z="-0.441246" /> + <t v1="59" v2="58" v3="57" /> + <t v1="59" v2="57" v3="56" /> + <t v1="56" v2="57" v3="58" /> + <t v1="56" v2="58" v3="59" /> + <v x="0.098196" y="0.295424" z="-0.285997" u="0.663306" v="-0.630877" /> + <n x="0.784724" y="-0.511656" z="-0.349880" /> + <v x="0.051964" y="0.244588" z="-0.315347" u="0.498843" v="-0.630014" /> + <n x="0.784724" y="-0.511656" z="-0.349880" /> + <v x="0.055798" y="0.184271" z="-0.218542" u="0.500583" v="-0.497689" /> + <n x="0.784724" y="-0.511656" z="-0.349880" /> + <v x="0.105839" y="0.239295" z="-0.186774" u="0.664855" v="-0.498422" /> + <n x="0.784724" y="-0.511656" z="-0.349880" /> + <t v1="63" v2="62" v3="61" /> + <t v1="63" v2="61" v3="60" /> + <t v1="60" v2="61" v3="62" /> + <t v1="60" v2="62" v3="63" /> + <v x="0.105839" y="0.239295" z="-0.186774" u="0.664855" v="-0.498422" /> + <n x="0.784724" y="-0.558833" z="-0.268167" /> + <v x="0.055798" y="0.184271" z="-0.218542" u="0.500583" v="-0.497689" /> + <n x="0.784724" y="-0.558833" z="-0.268167" /> + <v x="0.051964" y="0.130595" z="-0.117904" u="0.502284" v="-0.365379" /> + <n x="0.784724" y="-0.558833" z="-0.268167" /> + <v x="0.098196" y="0.181430" z="-0.088554" u="0.666762" v="-0.366057" /> + <n x="0.784724" y="-0.558833" z="-0.268167" /> + <t v1="67" v2="66" v3="65" /> + <t v1="67" v2="65" v3="64" /> + <t v1="64" v2="65" v3="66" /> + <t v1="64" v2="66" v3="67" /> + <v x="0.098196" y="0.181430" z="-0.088554" u="0.666762" v="-0.366057" /> + <n x="0.775895" y="-0.607569" z="-0.169847" /> + <v x="0.051964" y="0.130595" z="-0.117904" u="0.502284" v="-0.365379" /> + <n x="0.775895" y="-0.607569" z="-0.169847" /> + <v x="0.041047" y="0.091730" z="-0.028753" u="0.501841" v="-0.213309" /> + <n x="0.775895" y="-0.607569" z="-0.169847" /> + <v x="0.076431" y="0.130638" z="-0.006290" u="0.666409" v="-0.213389" /> + <n x="0.775895" y="-0.607569" z="-0.169847" /> + <t v1="71" v2="70" v3="69" /> + <t v1="71" v2="69" v3="68" /> + <t v1="68" v2="69" v3="70" /> + <t v1="68" v2="70" v3="71" /> + <v x="0.076431" y="0.130638" z="-0.006290" u="0.666409" v="-0.213389" /> + <n x="0.740250" y="-0.672330" z="-0.001530" /> + <v x="0.041047" y="0.091730" z="-0.028753" u="0.501841" v="-0.213309" /> + <n x="0.740250" y="-0.672330" z="-0.001530" /> + <v x="0.024707" y="0.073594" z="0.035338" u="0.493190" v="-0.004237" /> + <n x="0.740250" y="-0.672330" z="-0.001530" /> + <v x="0.043857" y="0.094651" z="0.047495" u="0.656261" v="-0.002102" /> + <n x="0.740250" y="-0.672330" z="-0.001530" /> + <t v1="75" v2="74" v3="73" /> + <t v1="75" v2="73" v3="72" /> + <t v1="72" v2="73" v3="74" /> + <t v1="72" v2="74" v3="75" /> + <v x="0.041047" y="0.091730" z="-0.028753" u="0.501841" v="-0.213309" /> + <n x="0.583020" y="-0.808495" z="-0.080145" /> + <v x="-0.003880" y="0.061086" z="-0.046445" u="0.337868" v="-0.212837" /> + <n x="0.583020" y="-0.808495" z="-0.080145" /> + <v x="0.000393" y="0.057010" z="0.025763" u="0.327910" v="-0.005211" /> + <n x="0.583020" y="-0.808495" z="-0.080145" /> + <v x="0.024707" y="0.073594" z="0.035338" u="0.493190" v="-0.004237" /> + <n x="0.583020" y="-0.808495" z="-0.080145" /> + <t v1="79" v2="78" v3="77" /> + <t v1="79" v2="77" v3="76" /> + <t v1="76" v2="77" v3="78" /> + <t v1="76" v2="78" v3="79" /> + <v x="0.051964" y="0.130595" z="-0.117904" u="0.502284" v="-0.365379" /> + <n x="0.611093" y="-0.750290" z="-0.252248" /> + <v x="-0.006735" y="0.090557" z="-0.141020" u="0.338086" v="-0.364714" /> + <n x="0.611093" y="-0.750290" z="-0.252248" /> + <v x="-0.003880" y="0.061086" z="-0.046445" u="0.337868" v="-0.212837" /> + <n x="0.611093" y="-0.750290" z="-0.252248" /> + <v x="0.041047" y="0.091730" z="-0.028753" u="0.501841" v="-0.213309" /> + <n x="0.611093" y="-0.750290" z="-0.252248" /> + <t v1="83" v2="82" v3="81" /> + <t v1="83" v2="81" v3="80" /> + <t v1="80" v2="81" v3="82" /> + <t v1="80" v2="82" v3="83" /> + <v x="0.055798" y="0.184271" z="-0.218542" u="0.500583" v="-0.497689" /> + <n x="0.618047" y="-0.703179" z="-0.351505" /> + <v x="-0.007738" y="0.140935" z="-0.243562" u="0.336392" v="-0.496933" /> + <n x="0.618047" y="-0.703179" z="-0.351505" /> + <v x="-0.006735" y="0.090557" z="-0.141020" u="0.338086" v="-0.364714" /> + <n x="0.618047" y="-0.703179" z="-0.351505" /> + <v x="0.051964" y="0.130595" z="-0.117904" u="0.502284" v="-0.365379" /> + <n x="0.618047" y="-0.703179" z="-0.351505" /> + <t v1="87" v2="86" v3="85" /> + <t v1="87" v2="85" v3="84" /> + <t v1="84" v2="85" v3="86" /> + <t v1="84" v2="86" v3="87" /> + <v x="0.051964" y="0.244588" z="-0.315347" u="0.498843" v="-0.630014" /> + <n x="0.618048" y="-0.656002" z="-0.433218" /> + <v x="-0.006735" y="0.204551" z="-0.338463" u="0.334389" v="-0.629079" /> + <n x="0.618048" y="-0.656002" z="-0.433218" /> + <v x="-0.007738" y="0.140935" z="-0.243562" u="0.336392" v="-0.496933" /> + <n x="0.618048" y="-0.656002" z="-0.433218" /> + <v x="0.055798" y="0.184271" z="-0.218542" u="0.500583" v="-0.497689" /> + <n x="0.618048" y="-0.656002" z="-0.433218" /> + <t v1="91" v2="90" v3="89" /> + <t v1="91" v2="89" v3="88" /> + <t v1="88" v2="89" v3="90" /> + <t v1="88" v2="90" v3="91" /> + <v x="0.041047" y="0.302363" z="-0.393580" u="0.499086" v="-0.782154" /> + <n x="0.611094" y="-0.593598" z="-0.523647" /> + <v x="-0.003880" y="0.271719" z="-0.411272" u="0.334499" v="-0.781391" /> + <n x="0.611094" y="-0.593598" z="-0.523647" /> + <v x="-0.006735" y="0.204551" z="-0.338463" u="0.334389" v="-0.629079" /> + <n x="0.611094" y="-0.593598" z="-0.523647" /> + <v x="0.051964" y="0.244588" z="-0.315347" u="0.498843" v="-0.630014" /> + <n x="0.611094" y="-0.593598" z="-0.523647" /> + <t v1="95" v2="94" v3="93" /> + <t v1="95" v2="93" v3="92" /> + <t v1="92" v2="93" v3="94" /> + <t v1="92" v2="94" v3="95" /> + <v x="0.024707" y="0.348799" z="-0.441331" u="0.506821" v="-0.991336" /> + <n x="0.583020" y="-0.473655" z="-0.660105" /> + <v x="0.000393" y="0.332215" z="-0.450906" u="0.343765" v="-0.992091" /> + <n x="0.583020" y="-0.473655" z="-0.660105" /> + <v x="-0.003880" y="0.271719" z="-0.411272" u="0.334499" v="-0.781391" /> + <n x="0.583020" y="-0.473655" z="-0.660105" /> + <v x="0.041047" y="0.302363" z="-0.393580" u="0.499086" v="-0.782154" /> + <n x="0.583020" y="-0.473655" z="-0.660105" /> + <t v1="99" v2="98" v3="97" /> + <t v1="99" v2="97" v3="96" /> + <t v1="96" v2="97" v3="98" /> + <t v1="96" v2="98" v3="99" /> + <v x="0.000393" y="0.332215" z="-0.450906" u="0.343765" v="-0.992091" /> + <n x="0.328458" y="-0.533736" z="-0.779257" /> + <v x="-0.022570" y="0.324547" z="-0.455333" u="0.176602" v="-0.991678" /> + <n x="0.328458" y="-0.533736" z="-0.779257" /> + <v x="-0.046311" y="0.257551" z="-0.419452" u="0.169322" v="-0.779510" /> + <n x="0.328458" y="-0.533736" z="-0.779257" /> + <v x="-0.003880" y="0.271719" z="-0.411272" u="0.334499" v="-0.781391" /> + <n x="0.328458" y="-0.533736" z="-0.779257" /> + <t v1="103" v2="102" v3="101" /> + <t v1="103" v2="101" v3="100" /> + <t v1="100" v2="101" v3="102" /> + <t v1="100" v2="102" v3="103" /> + <v x="-0.003880" y="0.271719" z="-0.411272" u="0.334499" v="-0.781391" /> + <n x="0.352809" y="-0.694595" z="-0.626948" /> + <v x="-0.046311" y="0.257551" z="-0.419452" u="0.169322" v="-0.779510" /> + <n x="0.352809" y="-0.694595" z="-0.626948" /> + <v x="-0.062174" y="0.186038" z="-0.349151" u="0.169837" v="-0.627485" /> + <n x="0.352809" y="-0.694595" z="-0.626948" /> + <v x="-0.006735" y="0.204551" z="-0.338463" u="0.334389" v="-0.629079" /> + <n x="0.352809" y="-0.694595" z="-0.626948" /> + <t v1="107" v2="106" v3="105" /> + <t v1="107" v2="105" v3="104" /> + <t v1="104" v2="105" v3="106" /> + <t v1="104" v2="106" v3="107" /> + <v x="-0.006735" y="0.204551" z="-0.338463" u="0.334389" v="-0.629079" /> + <n x="0.359129" y="-0.776974" z="-0.517047" /> + <v x="-0.062174" y="0.186038" z="-0.349151" u="0.169837" v="-0.627485" /> + <n x="0.359129" y="-0.776974" z="-0.517047" /> + <v x="-0.067744" y="0.120897" z="-0.255131" u="0.172788" v="-0.496288" /> + <n x="0.359129" y="-0.776974" z="-0.517047" /> + <v x="-0.007738" y="0.140935" z="-0.243562" u="0.336392" v="-0.496933" /> + <n x="0.359129" y="-0.776974" z="-0.517047" /> + <t v1="111" v2="110" v3="109" /> + <t v1="111" v2="109" v3="108" /> + <t v1="108" v2="109" v3="110" /> + <t v1="108" v2="110" v3="111" /> + <v x="-0.007738" y="0.140935" z="-0.243562" u="0.336392" v="-0.496933" /> + <n x="0.359129" y="-0.836263" z="-0.414356" /> + <v x="-0.067744" y="0.120897" z="-0.255131" u="0.172788" v="-0.496288" /> + <n x="0.359129" y="-0.836263" z="-0.414356" /> + <v x="-0.062174" y="0.072045" z="-0.151708" u="0.173831" v="-0.363840" /> + <n x="0.359129" y="-0.836263" z="-0.414356" /> + <v x="-0.006735" y="0.090557" z="-0.141020" u="0.338086" v="-0.364714" /> + <n x="0.359129" y="-0.836263" z="-0.414356" /> + <t v1="115" v2="114" v3="113" /> + <t v1="115" v2="113" v3="112" /> + <t v1="112" v2="113" v3="114" /> + <t v1="112" v2="114" v3="115" /> + <v x="-0.006735" y="0.090557" z="-0.141020" u="0.338086" v="-0.364714" /> + <n x="0.352809" y="-0.890250" z="-0.288063" /> + <v x="-0.062174" y="0.072045" z="-0.151708" u="0.173831" v="-0.363840" /> + <n x="0.352809" y="-0.890250" z="-0.288063" /> + <v x="-0.046311" y="0.046918" z="-0.054625" u="0.175153" v="-0.211799" /> + <n x="0.352809" y="-0.890250" z="-0.288063" /> + <v x="-0.003880" y="0.061086" z="-0.046445" u="0.337868" v="-0.212837" /> + <n x="0.352809" y="-0.890250" z="-0.288063" /> + <t v1="119" v2="118" v3="117" /> + <t v1="119" v2="117" v3="116" /> + <t v1="116" v2="117" v3="118" /> + <t v1="116" v2="118" v3="119" /> + <v x="-0.003880" y="0.061086" z="-0.046445" u="0.337868" v="-0.212837" /> + <n x="0.328458" y="-0.941724" z="-0.072601" /> + <v x="-0.046311" y="0.046918" z="-0.054625" u="0.175153" v="-0.211799" /> + <n x="0.328458" y="-0.941724" z="-0.072601" /> + <v x="-0.022570" y="0.049342" z="0.021336" u="0.167182" v="-0.007847" /> + <n x="0.328458" y="-0.941724" z="-0.072601" /> + <v x="0.000393" y="0.057010" z="0.025763" u="0.327910" v="-0.005211" /> + <n x="0.328458" y="-0.941724" z="-0.072601" /> + <t v1="123" v2="122" v3="121" /> + <t v1="123" v2="121" v3="120" /> + <t v1="120" v2="121" v3="122" /> + <t v1="120" v2="122" v3="123" /> + <v x="-0.046311" y="0.046918" z="-0.054625" u="0.175153" v="-0.211799" /> + <n x="-0.197070" y="-0.975993" z="0.092739" /> + <v x="-0.074877" y="0.053021" z="-0.051102" u="0.014921" v="-0.207350" /> + <n x="-0.197070" y="-0.975993" z="0.092739" /> + <v x="-0.038030" y="0.052645" z="0.023243" u="0.012282" v="-0.010427" /> + <n x="-0.197070" y="-0.975993" z="0.092739" /> + <v x="-0.022570" y="0.049342" z="0.021336" u="0.167182" v="-0.007847" /> + <n x="-0.197070" y="-0.975993" z="0.092739" /> + <t v1="127" v2="126" v3="125" /> + <t v1="127" v2="125" v3="124" /> + <t v1="124" v2="125" v3="126" /> + <t v1="124" v2="126" v3="127" /> + <v x="-0.062174" y="0.072045" z="-0.151708" u="0.173831" v="-0.363840" /> + <n x="-0.228873" y="-0.950823" z="-0.208695" /> + <v x="-0.099497" y="0.080018" z="-0.147104" u="0.006485" v="-0.362181" /> + <n x="-0.228873" y="-0.950823" z="-0.208695" /> + <v x="-0.074877" y="0.053021" z="-0.051102" u="0.014921" v="-0.207350" /> + <n x="-0.228873" y="-0.950823" z="-0.208695" /> + <v x="-0.046311" y="0.046918" z="-0.054625" u="0.175153" v="-0.211799" /> + <n x="-0.228873" y="-0.950823" z="-0.208695" /> + <t v1="131" v2="130" v3="129" /> + <t v1="131" v2="129" v3="128" /> + <t v1="128" v2="129" v3="130" /> + <t v1="128" v2="130" v3="131" /> + <v x="-0.067744" y="0.120897" z="-0.255131" u="0.172788" v="-0.496288" /> + <n x="-0.238505" y="-0.883006" z="-0.404247" /> + <v x="-0.108143" y="0.129528" z="-0.250148" u="0.012652" v="-0.497791" /> + <n x="-0.238505" y="-0.883006" z="-0.404247" /> + <v x="-0.099497" y="0.080018" z="-0.147104" u="0.006485" v="-0.362181" /> + <n x="-0.238505" y="-0.883006" z="-0.404247" /> + <v x="-0.062174" y="0.072045" z="-0.151708" u="0.173831" v="-0.363840" /> + <n x="-0.238505" y="-0.883006" z="-0.404247" /> + <t v1="135" v2="134" v3="133" /> + <t v1="135" v2="133" v3="132" /> + <t v1="132" v2="133" v3="134" /> + <t v1="132" v2="134" v3="135" /> + <v x="-0.062174" y="0.186038" z="-0.349151" u="0.169837" v="-0.627485" /> + <n x="-0.238505" y="-0.791591" z="-0.562582" /> + <v x="-0.099497" y="0.194012" z="-0.344547" u="0.004766" v="-0.624179" /> + <n x="-0.238505" y="-0.791591" z="-0.562582" /> + <v x="-0.108143" y="0.129528" z="-0.250148" u="0.012652" v="-0.497791" /> + <n x="-0.238505" y="-0.791591" z="-0.562582" /> + <v x="-0.067744" y="0.120897" z="-0.255131" u="0.172788" v="-0.496288" /> + <n x="-0.238505" y="-0.791591" z="-0.562582" /> + <t v1="139" v2="138" v3="137" /> + <t v1="139" v2="137" v3="136" /> + <t v1="136" v2="137" v3="138" /> + <t v1="136" v2="138" v3="139" /> + <v x="-0.046311" y="0.257551" z="-0.419452" u="0.169322" v="-0.779510" /> + <n x="-0.228873" y="-0.656147" z="-0.719089" /> + <v x="-0.074877" y="0.263653" z="-0.415929" u="0.005006" v="-0.774603" /> + <n x="-0.228873" y="-0.656147" z="-0.719089" /> + <v x="-0.099497" y="0.194012" z="-0.344547" u="0.004766" v="-0.624179" /> + <n x="-0.228873" y="-0.656147" z="-0.719089" /> + <v x="-0.062174" y="0.186038" z="-0.349151" u="0.169837" v="-0.627485" /> + <n x="-0.228873" y="-0.656147" z="-0.719089" /> + <t v1="143" v2="142" v3="141" /> + <t v1="143" v2="141" v3="140" /> + <t v1="140" v2="141" v3="142" /> + <t v1="140" v2="142" v3="143" /> + <v x="-0.022570" y="0.324547" z="-0.455333" u="0.176602" v="-0.991678" /> + <n x="-0.197070" y="-0.407682" z="-0.891605" /> + <v x="-0.038030" y="0.327850" z="-0.453427" u="0.005718" v="-0.987658" /> + <n x="-0.197070" y="-0.407682" z="-0.891605" /> + <v x="-0.074877" y="0.263653" z="-0.415929" u="0.005006" v="-0.774603" /> + <n x="-0.197070" y="-0.407682" z="-0.891605" /> + <v x="-0.046311" y="0.257551" z="-0.419452" u="0.169322" v="-0.779510" /> + <n x="-0.197070" y="-0.407682" z="-0.891605" /> + <t v1="147" v2="146" v3="145" /> + <t v1="147" v2="145" v3="144" /> + <t v1="144" v2="145" v3="146" /> + <t v1="144" v2="146" v3="147" /> + <v x="0.120548" y="1.002716" z="0.056873" u="0.997910" v="-0.990420" /> + <n x="-0.769583" y="0.577875" z="-0.271667" /> + <v x="0.110511" y="0.996696" z="0.072500" u="0.837583" v="-0.992091" /> + <n x="-0.769583" y="0.577875" z="-0.271667" /> + <v x="0.088434" y="0.957441" z="0.051540" u="0.827834" v="-0.784418" /> + <n x="-0.769583" y="0.577875" z="-0.271667" /> + <v x="0.106978" y="0.968563" z="0.022666" u="0.990218" v="-0.787138" /> + <n x="-0.769583" y="0.577875" z="-0.271667" /> + <t v1="151" v2="150" v3="149" /> + <t v1="151" v2="149" v3="148" /> + <t v1="148" v2="149" v3="150" /> + <t v1="148" v2="150" v3="151" /> + <v x="0.106978" y="0.968563" z="0.022666" u="0.990218" v="-0.787138" /> + <n x="-0.853294" y="0.278804" z="-0.440632" /> + <v x="0.088434" y="0.957441" z="0.051540" u="0.827834" v="-0.784418" /> + <n x="-0.853294" y="0.278804" z="-0.440632" /> + <v x="0.081039" y="0.902918" z="0.031362" u="0.827985" v="-0.631514" /> + <n x="-0.853294" y="0.278804" z="-0.440632" /> + <v x="0.105268" y="0.917450" z="-0.006364" u="0.995285" v="-0.631774" /> + <n x="-0.853294" y="0.278804" z="-0.440632" /> + <t v1="155" v2="154" v3="153" /> + <t v1="155" v2="153" v3="152" /> + <t v1="152" v2="153" v3="154" /> + <t v1="152" v2="154" v3="155" /> + <v x="0.105268" y="0.917450" z="-0.006364" u="0.995285" v="-0.631774" /> + <n x="-0.845625" y="0.025833" z="-0.533152" /> + <v x="0.081039" y="0.902918" z="0.031362" u="0.827985" v="-0.631514" /> + <n x="-0.845625" y="0.025833" z="-0.533152" /> + <v x="0.089452" y="0.841429" z="0.015038" u="0.828468" v="-0.499016" /> + <n x="-0.845625" y="0.025833" z="-0.533152" /> + <v x="0.115678" y="0.857158" z="-0.025797" u="0.987363" v="-0.497791" /> + <n x="-0.845625" y="0.025833" z="-0.533152" /> + <t v1="159" v2="158" v3="157" /> + <t v1="159" v2="157" v3="156" /> + <t v1="156" v2="157" v3="158" /> + <t v1="156" v2="158" v3="159" /> + <v x="0.115678" y="0.857158" z="-0.025797" u="0.987363" v="-0.497791" /> + <n x="-0.785285" y="-0.206215" z="-0.583783" /> + <v x="0.089452" y="0.841429" z="0.015038" u="0.828468" v="-0.499016" /> + <n x="-0.785285" y="-0.206215" z="-0.583783" /> + <v x="0.112394" y="0.782334" z="0.005052" u="0.831546" v="-0.367574" /> + <n x="-0.785285" y="-0.206215" z="-0.583783" /> + <v x="0.136624" y="0.796866" z="-0.032675" u="0.996898" v="-0.371652" /> + <n x="-0.785285" y="-0.206215" z="-0.583783" /> + <t v1="163" v2="162" v3="161" /> + <t v1="163" v2="161" v3="160" /> + <t v1="160" v2="161" v3="162" /> + <t v1="160" v2="162" v3="163" /> + <v x="0.146371" y="0.734631" z="0.002925" u="0.832161" v="-0.214731" /> + <n x="-0.664642" y="-0.446691" z="-0.598931" /> + <v x="0.164916" y="0.745753" z="-0.025950" u="0.998009" v="-0.219698" /> + <n x="-0.664642" y="-0.446691" z="-0.598931" /> + <v x="0.136624" y="0.796866" z="-0.032675" u="0.996898" v="-0.371652" /> + <n x="-0.664642" y="-0.446691" z="-0.598931" /> + <v x="0.112394" y="0.782334" z="0.005052" u="0.831546" v="-0.367574" /> + <n x="-0.664642" y="-0.446691" z="-0.598931" /> + <t v1="167" v2="166" v3="165" /> + <t v1="167" v2="165" v3="164" /> + <t v1="164" v2="165" v3="166" /> + <t v1="164" v2="166" v3="167" /> + <v x="0.146371" y="0.734631" z="0.002925" u="0.832161" v="-0.214731" /> + <n x="-0.560308" y="-0.807166" z="-0.185843" /> + <v x="0.145907" y="0.726489" z="0.039688" u="0.666409" v="-0.213389" /> + <n x="-0.560308" y="-0.807166" z="-0.185843" /> + <v x="0.185959" y="0.701175" z="0.028876" u="0.656261" v="-0.002102" /> + <n x="-0.560308" y="-0.807166" z="-0.185843" /> + <v x="0.186211" y="0.705581" z="0.008980" u="0.824120" v="-0.000799" /> + <n x="-0.560308" y="-0.807166" z="-0.185843" /> + <t v1="171" v2="170" v3="169" /> + <t v1="171" v2="169" v3="168" /> + <t v1="168" v2="169" v3="170" /> + <t v1="168" v2="170" v3="171" /> + <v x="0.112394" y="0.782334" z="0.005052" u="0.831546" v="-0.367574" /> + <n x="-0.809746" y="-0.570656" z="-0.136612" /> + <v x="0.111788" y="0.771696" z="0.053085" u="0.666762" v="-0.366057" /> + <n x="-0.809746" y="-0.570656" z="-0.136612" /> + <v x="0.145907" y="0.726489" z="0.039688" u="0.666409" v="-0.213389" /> + <n x="-0.809746" y="-0.570656" z="-0.136612" /> + <v x="0.146371" y="0.734631" z="0.002925" u="0.832161" v="-0.214731" /> + <n x="-0.809746" y="-0.570656" z="-0.136612" /> + <t v1="175" v2="174" v3="173" /> + <t v1="175" v2="173" v3="172" /> + <t v1="172" v2="173" v3="174" /> + <t v1="172" v2="174" v3="175" /> + <v x="0.089452" y="0.841429" z="0.015038" u="0.828468" v="-0.499016" /> + <n x="-0.933505" y="-0.347412" z="-0.088730" /> + <v x="0.088796" y="0.829914" z="0.067029" u="0.664855" v="-0.498422" /> + <n x="-0.933505" y="-0.347412" z="-0.088730" /> + <v x="0.111788" y="0.771696" z="0.053085" u="0.666762" v="-0.366057" /> + <n x="-0.933505" y="-0.347412" z="-0.088730" /> + <v x="0.112394" y="0.782334" z="0.005052" u="0.831546" v="-0.367574" /> + <n x="-0.933505" y="-0.347412" z="-0.088730" /> + <t v1="179" v2="178" v3="177" /> + <t v1="179" v2="177" v3="176" /> + <t v1="176" v2="177" v3="178" /> + <t v1="176" v2="178" v3="179" /> + <v x="0.081039" y="0.902918" z="0.031362" u="0.827985" v="-0.631514" /> + <n x="-0.991345" y="-0.124979" z="-0.040196" /> + <v x="0.080432" y="0.892280" z="0.079396" u="0.663306" v="-0.630877" /> + <n x="-0.991345" y="-0.124979" z="-0.040196" /> + <v x="0.088796" y="0.829914" z="0.067029" u="0.664855" v="-0.498422" /> + <n x="-0.991345" y="-0.124979" z="-0.040196" /> + <v x="0.089452" y="0.841429" z="0.015038" u="0.828468" v="-0.499016" /> + <n x="-0.991345" y="-0.124979" z="-0.040196" /> + <t v1="183" v2="182" v3="181" /> + <t v1="183" v2="181" v3="180" /> + <t v1="180" v2="181" v3="182" /> + <t v1="180" v2="182" v3="183" /> + <v x="0.088434" y="0.957441" z="0.051540" u="0.827834" v="-0.784418" /> + <n x="-0.991571" y="0.128582" z="0.015958" /> + <v x="0.087969" y="0.949299" z="0.088303" u="0.663689" v="-0.783353" /> + <n x="-0.991571" y="0.128582" z="0.015958" /> + <v x="0.080432" y="0.892280" z="0.079396" u="0.663306" v="-0.630877" /> + <n x="-0.991571" y="0.128582" z="0.015958" /> + <v x="0.081039" y="0.902918" z="0.031362" u="0.827985" v="-0.631514" /> + <n x="-0.991571" y="0.128582" z="0.015958" /> + <t v1="187" v2="186" v3="185" /> + <t v1="187" v2="185" v3="184" /> + <t v1="184" v2="185" v3="186" /> + <t v1="184" v2="186" v3="187" /> + <v x="0.110511" y="0.996696" z="0.072500" u="0.837583" v="-0.992091" /> + <n x="-0.887681" y="0.451803" z="0.088855" /> + <v x="0.110260" y="0.992290" z="0.092396" u="0.673609" v="-0.992926" /> + <n x="-0.887681" y="0.451803" z="0.088855" /> + <v x="0.087969" y="0.949299" z="0.088303" u="0.663689" v="-0.783353" /> + <n x="-0.887681" y="0.451803" z="0.088855" /> + <v x="0.088434" y="0.957441" z="0.051540" u="0.827834" v="-0.784418" /> + <n x="-0.887681" y="0.451803" z="0.088855" /> + <t v1="191" v2="190" v3="189" /> + <t v1="191" v2="189" v3="188" /> + <t v1="188" v2="189" v3="190" /> + <t v1="188" v2="190" v3="191" /> + <v x="0.110260" y="0.992290" z="0.092396" u="0.673609" v="-0.992926" /> + <n x="-0.811246" y="0.378181" z="0.445936" /> + <v x="0.119861" y="0.990677" z="0.111230" u="0.506821" v="-0.991336" /> + <n x="-0.811246" y="0.378181" z="0.445936" /> + <v x="0.105710" y="0.946318" z="0.123104" u="0.499086" v="-0.782154" /> + <n x="-0.811246" y="0.378181" z="0.445936" /> + <v x="0.087969" y="0.949299" z="0.088303" u="0.663689" v="-0.783353" /> + <n x="-0.811246" y="0.378181" z="0.445936" /> + <t v1="195" v2="194" v3="193" /> + <t v1="195" v2="193" v3="192" /> + <t v1="192" v2="193" v3="194" /> + <t v1="192" v2="194" v3="195" /> + <v x="0.087969" y="0.949299" z="0.088303" u="0.663689" v="-0.783353" /> + <n x="-0.888370" y="0.046067" z="0.456810" /> + <v x="0.105710" y="0.946318" z="0.123104" u="0.499086" v="-0.782154" /> + <n x="-0.888370" y="0.046067" z="0.456810" /> + <v x="0.103611" y="0.888386" z="0.124865" u="0.498843" v="-0.630014" /> + <n x="-0.888370" y="0.046067" z="0.456810" /> + <v x="0.080432" y="0.892280" z="0.079396" u="0.663306" v="-0.630877" /> + <n x="-0.888370" y="0.046067" z="0.456810" /> + <t v1="199" v2="198" v3="197" /> + <t v1="199" v2="197" v3="196" /> + <t v1="196" v2="197" v3="198" /> + <t v1="196" v2="198" v3="199" /> + ... [truncated message content] |
From: <cf...@us...> - 2007-10-18 02:10:04
|
Revision: 1161 http://automanic.svn.sourceforge.net/automanic/?rev=1161&view=rev Author: cfraz89 Date: 2007-10-17 19:10:05 -0700 (Wed, 17 Oct 2007) Log Message: ----------- small fix Modified Paths: -------------- trunk/ioData/vehicles/Van/world trunk/ioData/vehicles/falcon/world trunk/ioData/vehicles/fedex/world trunk/ioData/vehicles/strider/world trunk/ioData/vehicles/trekker/entities_world trunk/ioData/vehicles/trekker/world trunk/ioData/vehicles/voyager/world trunk/iomapedit/scripts/cament.py Modified: trunk/ioData/vehicles/Van/world =================================================================== --- trunk/ioData/vehicles/Van/world 2007-10-09 12:23:05 UTC (rev 1160) +++ trunk/ioData/vehicles/Van/world 2007-10-18 02:10:05 UTC (rev 1161) @@ -61,55 +61,39 @@ <shader type="standard">stat_dyn_reflect</shader> <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="bodyvanbody.jpg"> <texture>vanbody.jpg</texture> <shader type="standard">stat_dyn_reflect</shader> <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="detailsdetails1.jpg"> <texture>details1.jpg</texture> <shader type="standard">stat_dyn_reflect</shader> <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="windowswindows.jpg"> <texture>windows.jpg</texture> <shader type="standard">stat_dyn_reflect</shader> <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="15 - Defaultshocks.jpg"> <texture>shocks.jpg</texture> <shader type="standard">stat_dyn_reflect</shader> <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="6 - Defaultspeakers.jpg"> <texture>speakers.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="vanbody-t.jpg"> <texture>vanbody-t.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="vanwheels.jpg"> <texture>vanwheels.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> </materials> <sounds/> Modified: trunk/ioData/vehicles/falcon/world =================================================================== --- trunk/ioData/vehicles/falcon/world 2007-10-09 12:23:05 UTC (rev 1160) +++ trunk/ioData/vehicles/falcon/world 2007-10-18 02:10:05 UTC (rev 1161) @@ -47,8 +47,6 @@ <shader type="standard">stat_dyn_reflect</shader> <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> <shadervar name="tex mask" type="texture">blank-reflect-mask-shiny.png</shadervar> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="otherparts.png"> <texture>otherparts.png</texture> @@ -58,8 +56,6 @@ <shader type="standard">stat_dyn_reflect</shader> <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> </materials> <sounds/> Modified: trunk/ioData/vehicles/fedex/world =================================================================== --- trunk/ioData/vehicles/fedex/world 2007-10-09 12:23:05 UTC (rev 1160) +++ trunk/ioData/vehicles/fedex/world 2007-10-18 02:10:05 UTC (rev 1161) @@ -35,38 +35,24 @@ <materials> <material name="Color_F16fedexwheel.jpg"> <texture>fedexwheel.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="Translucent_Glass_Blufedexglass.jpg"> <texture>fedexglass.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="Color_006fedexbumpers.jpg"> <texture>fedexbumpers.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="Color_A01fedexbumpers.jpg"> <texture>fedexbumpers.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="Color_B02fedexbumpers.jpg"> <texture>fedexbumpers.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="fedexmirrors.jpg"> <texture>fedexmirrors.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="fedexbody.jpg"> <texture>fedexbody.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> </materials> <sounds/> Modified: trunk/ioData/vehicles/strider/world =================================================================== --- trunk/ioData/vehicles/strider/world 2007-10-09 12:23:05 UTC (rev 1160) +++ trunk/ioData/vehicles/strider/world 2007-10-18 02:10:05 UTC (rev 1161) @@ -34,26 +34,18 @@ <materials> <material name="tireswheels.jpg"> <texture>wheels.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="str01.png"> <texture>str01.png</texture> <shader type="standard">stat_dyn_reflect</shader> <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="str01-exp.png"> <texture>str01-exp.png</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="wheels.png"> <texture>wheels.png</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> </materials> <sounds/> Modified: trunk/ioData/vehicles/trekker/entities_world =================================================================== --- trunk/ioData/vehicles/trekker/entities_world 2007-10-09 12:23:05 UTC (rev 1160) +++ trunk/ioData/vehicles/trekker/entities_world 2007-10-18 02:10:05 UTC (rev 1161) @@ -44,7 +44,7 @@ <property name="steeramount" float="0.7"/> <!--Front Left Wheel--> <action name="AddWheel"> - <par vector="0.55, 0.15, -0.95" name="position"/> + <par vector="0.55, 0.1, -0.95" name="position"/> <par float="2.0" name="turnspeed"/> <par float="2.0" name="returnspeed"/> <par float="0.0002" name="suspensionsoftness"/> @@ -63,7 +63,7 @@ </action> <!--Front Right Wheel--> <action name="AddWheel"> - <par vector="-0.55, 0.15, -0.95" name="position"/> + <par vector="-0.55, 0.1, -0.95" name="position"/> <par float="2.0" name="turnspeed"/> <par float="2.0" name="returnspeed"/> <par float="0.0002" name="suspensionsoftness"/> Modified: trunk/ioData/vehicles/trekker/world =================================================================== --- trunk/ioData/vehicles/trekker/world 2007-10-09 12:23:05 UTC (rev 1160) +++ trunk/ioData/vehicles/trekker/world 2007-10-18 02:10:05 UTC (rev 1161) @@ -36,28 +36,18 @@ <shader type="standard">stat_dyn_reflect</shader> <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="Layer0.001trekkertires.png"> <texture>trekkertires.png</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="FrontColortop.jpg"> <texture>top.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="Layer0top.jpg"> <texture>top.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="frontback.jpg"> <texture>frontback.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> </materials> <sounds/> Modified: trunk/ioData/vehicles/voyager/world =================================================================== --- trunk/ioData/vehicles/voyager/world 2007-10-09 12:23:05 UTC (rev 1160) +++ trunk/ioData/vehicles/voyager/world 2007-10-18 02:10:05 UTC (rev 1161) @@ -24,83 +24,51 @@ <materials> <material name="Wheel01SG.001no"> <texture>frontback2.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="InteriorSG.001no"> <texture>frontback2.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="Plane01SG.001no"> <texture>frontback2.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="L_doorSG.001no"> <texture>frontback2.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="wind_glassSG.001no"> <texture>frontback2.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="hoodSG.001no"> <texture>frontback2.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="EngineSG.001no"> <texture>frontback2.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="R_doorSG.001no"> <texture>frontback2.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="trunkSG.001no"> <texture>frontback2.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="Plane01SG1.001no"> <texture>frontback2.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="bottomSG.001no"> <texture>frontback2.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="R_AxleSG.001no"> <texture>frontback2.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="LF_wheel_supportSno"> <texture>frontback2.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="RR_Spring02SG.001no"> <texture>frontback2.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="LR_Softener_RodSG.001no"> <texture>frontback2.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="LF_Softener_BodySno"> <texture>frontback2.jpg</texture> - <shader type="ambient">ambient</shader> - <shader type="diffuse">light_spec_bumpmap</shader> </material> </materials> <sounds/> Modified: trunk/iomapedit/scripts/cament.py =================================================================== --- trunk/iomapedit/scripts/cament.py 2007-10-09 12:23:05 UTC (rev 1160) +++ trunk/iomapedit/scripts/cament.py 2007-10-18 02:10:05 UTC (rev 1161) @@ -18,6 +18,11 @@ pcinput.Bind('down', 'backward') pcinput.Bind('left', 'turnleft') pcinput.Bind('right', 'turnright') + mesh = Engine.FindMeshObject('Terrain') + terrain = SCF_QUERY_INTERFACE(mesh.GetMeshObject(), iTerrainSystem) + cell = terrain.GetCell(0) + data = cell.LockHeightData(csRect(0, 0, 257, 257)) + print data.data def pccommandinput_forward1(self, pc, args): self.move.Forward(True) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cf...@us...> - 2007-10-09 12:23:13
|
Revision: 1160 http://automanic.svn.sourceforge.net/automanic/?rev=1160&view=rev Author: cfraz89 Date: 2007-10-09 05:23:05 -0700 (Tue, 09 Oct 2007) Log Message: ----------- handling tweaks Modified Paths: -------------- trunk/ioData/client/ioEntityManagerClient.py trunk/ioData/vehicles/Van/entities_world trunk/ioData/vehicles/fedex/entities_world trunk/ioData/vehicles/strider/entities_world trunk/ioData/vehicles/strider/factories/genStriderBody Modified: trunk/ioData/client/ioEntityManagerClient.py =================================================================== --- trunk/ioData/client/ioEntityManagerClient.py 2007-10-08 08:56:57 UTC (rev 1159) +++ trunk/ioData/client/ioEntityManagerClient.py 2007-10-09 12:23:05 UTC (rev 1160) @@ -14,7 +14,7 @@ def __init__(self, celEntity): self.entity = celEntity self.entities = [] - self.maxbots = 7 + self.maxbots = 2 self.bots = 0 self.net = ioNetHelper.ioNetHelper() Modified: trunk/ioData/vehicles/Van/entities_world =================================================================== --- trunk/ioData/vehicles/Van/entities_world 2007-10-08 08:56:57 UTC (rev 1159) +++ trunk/ioData/vehicles/Van/entities_world 2007-10-09 12:23:05 UTC (rev 1160) @@ -47,8 +47,8 @@ <par vector="0.55,0,-0.9" name="position"/> <par float="4.0" name="turnspeed"/> <par float="4.0" name="returnspeed"/> - <par float="0.00005" name="suspensionsoftness"/> - <par float="0.2" name="suspensiondamping"/> + <par float="0.0001" name="suspensionsoftness"/> + <par float="0.1" name="suspensiondamping"/> <par float="0.7" name="brakepower"/> <par float="0.0" name="enginepower"/> <par float="1.0" name="leftsteersensitivity"/> @@ -66,8 +66,8 @@ <par vector="-0.55,0,-0.9" name="position"/> <par float="4.0" name="turnspeed"/> <par float="4.0" name="returnspeed"/> - <par float="0.00005" name="suspensionsoftness"/> - <par float="0.2" name="suspensiondamping"/> + <par float="0.0001" name="suspensionsoftness"/> + <par float="0.1" name="suspensiondamping"/> <par float="0.7" name="brakepower"/> <par float="0.0" name="enginepower"/> <par float="0.8" name="leftsteersensitivity"/> @@ -85,8 +85,8 @@ <par vector="0.55,0,1.1" name="position"/> <par float="4.0" name="turnspeed"/> <par float="2.0" name="returnspeed"/> - <par float="0.00005" name="suspensionsoftness"/> - <par float="0.2" name="suspensiondamping"/> + <par float="0.0001" name="suspensionsoftness"/> + <par float="0.1" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="1.0" name="enginepower"/> <par float="0.0" name="leftsteersensitivity"/> @@ -104,8 +104,8 @@ <par vector="-0.55,0,1.1" name="position"/> <par float="4.0" name="turnspeed"/> <par float="4.0" name="returnspeed"/> - <par float="0.00005" name="suspensionsoftness"/> - <par float="0.2" name="suspensiondamping"/> + <par float="0.0001" name="suspensionsoftness"/> + <par float="0.1" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="1.0" name="enginepower"/> <par float="0.0" name="leftsteersensitivity"/> @@ -120,32 +120,32 @@ </action> <action name="SetGearSettings"> <par float="-1" name="gear"/> - <par float="2100.0" name="force"/> + <par float="1600.0" name="force"/> <par float="-50.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="1" name="gear"/> - <par float="2100.0" name="force"/> + <par float="1800.0" name="force"/> <par float="40.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="2" name="gear"/> - <par float="1500.0" name="force"/> + <par float="800.0" name="force"/> <par float="85.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="3" name="gear"/> - <par float="1200.0" name="force"/> + <par float="600.0" name="force"/> <par float="125.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="4" name="gear"/> - <par float="900.0" name="force"/> + <par float="400.0" name="force"/> <par float="190.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="5" name="gear"/> - <par float="500.0" name="force"/> + <par float="300.0" name="force"/> <par float="250.0" name="velocity"/> </action> </propclass> Modified: trunk/ioData/vehicles/fedex/entities_world =================================================================== --- trunk/ioData/vehicles/fedex/entities_world 2007-10-08 08:56:57 UTC (rev 1159) +++ trunk/ioData/vehicles/fedex/entities_world 2007-10-09 12:23:05 UTC (rev 1160) @@ -38,22 +38,22 @@ <property name="tankmode" bool="false"/> <property name="autotransmission" bool="true"/> <property name="autoreverse" bool="true"/> - <property name="brakeforce" float="800.0"/> + <property name="brakeforce" float="1200.0"/> <property name="abs" bool="false"/> - <property name="antisway" bool="true" /> + <property name="antisway" bool="false" /> <property name="steeramount" float="0.7"/> <!--Front Left Wheel--> <action name="AddWheel"> <par vector="0.45, 0.05, -0.75" name="position"/> <par float="4.0" name="turnspeed"/> <par float="4.0" name="returnspeed"/> - <par float="0.00015" name="suspensionsoftness"/> - <par float="0.15" name="suspensiondamping"/> + <par float="0.0001" name="suspensionsoftness"/> + <par float="0.1" name="suspensiondamping"/> <par float="0.7" name="brakepower"/> <par float="0.0" name="enginepower"/> <par float="1.0" name="leftsteersensitivity"/> <par float="0.8" name="rightsteersensitivity"/> - <par float="1.0" name="friction"/> + <par float="1.2" name="friction"/> <par float="0.0000125" name="slip"/> <par float="10.0" name="mass"/> <par bool="false" name="handbrakeaffected"/> @@ -66,13 +66,13 @@ <par vector="-0.45, 0.05, -0.75" name="position"/> <par float="4.0" name="turnspeed"/> <par float="4.0" name="returnspeed"/> - <par float="0.00015" name="suspensionsoftness"/> - <par float="0.15" name="suspensiondamping"/> + <par float="0.0001" name="suspensionsoftness"/> + <par float="0.1" name="suspensiondamping"/> <par float="0.7" name="brakepower"/> <par float="0.0" name="enginepower"/> <par float="0.8" name="leftsteersensitivity"/> <par float="1.0" name="rightsteersensitivity"/> - <par float="1.0" name="friction"/> + <par float="1.2" name="friction"/> <par float="0.0000125" name="slip"/> <par float="10.0" name="mass"/> <par bool="false" name="handbrakeaffected"/> @@ -82,16 +82,16 @@ </action> <!--Rear Left Wheel--> <action name="AddWheel"> - <par vector="0.45, 0.0, 0.98" name="position"/> + <par vector="0.45, 0.05, 0.98" name="position"/> <par float="4.0" name="turnspeed"/> <par float="4.0" name="returnspeed"/> - <par float="0.000225" name="suspensionsoftness"/> - <par float="0.15" name="suspensiondamping"/> + <par float="0.0001" name="suspensionsoftness"/> + <par float="0.1" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="1.0" name="enginepower"/> <par float="0.0" name="leftsteersensitivity"/> <par float="0.0" name="rightsteersensitivity"/> - <par float="1.0" name="friction"/> + <par float="1.3" name="friction"/> <par float="0.0000125" name="slip"/> <par float="10.0" name="mass"/> <par bool="true" name="handbrakeaffected"/> @@ -101,16 +101,16 @@ </action> <!--Rear Right Wheel--> <action name="AddWheel"> - <par vector="-0.45, 0.0, 0.98" name="position"/> + <par vector="-0.45, 0.05, 0.98" name="position"/> <par float="4.0" name="turnspeed"/> <par float="4.0" name="returnspeed"/> - <par float="0.000225" name="suspensionsoftness"/> - <par float="0.15" name="suspensiondamping"/> + <par float="0.0001" name="suspensionsoftness"/> + <par float="0.1" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="1.0" name="enginepower"/> <par float="0.0" name="leftsteersensitivity"/> <par float="0.0" name="rightsteersensitivity"/> - <par float="1.0" name="friction"/> + <par float="1.3" name="friction"/> <par float="0.0000125" name="slip"/> <par float="10.0" name="mass"/> <par bool="true" name="handbrakeaffected"/> @@ -125,17 +125,17 @@ </action> <action name="SetGearSettings"> <par float="1" name="gear"/> - <par float="2200.0" name="force"/> + <par float="1800.0" name="force"/> <par float="40.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="2" name="gear"/> - <par float="1200.0" name="force"/> + <par float="1000.0" name="force"/> <par float="84.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="3" name="gear"/> - <par float="900.0" name="force"/> + <par float="600.0" name="force"/> <par float="125.0" name="velocity"/> </action> <action name="SetGearSettings"> Modified: trunk/ioData/vehicles/strider/entities_world =================================================================== --- trunk/ioData/vehicles/strider/entities_world 2007-10-08 08:56:57 UTC (rev 1159) +++ trunk/ioData/vehicles/strider/entities_world 2007-10-09 12:23:05 UTC (rev 1160) @@ -21,7 +21,7 @@ <propclass name="pcphysics.object"> <action name="InitPhys"> <par float="0.4" name="friction"/> - <par float="1100.0" name="mass"/> + <par float="800.0" name="mass"/> <par float="0" name="elasticity"/> <par float="1" name="density"/> <par float="0" name="softness"/> @@ -37,17 +37,17 @@ <property name="autoreverse" bool="true"/> <property name="brakeforce" float="1200.0"/> <property name="abs" bool="false"/> - <property name="antisway" bool="true" /> - <property name="steeramount" float="1.0"/> + <property name="antisway" bool="false" /> + <property name="steeramount" float="0.7"/> <!--Front Left Wheel--> <action name="AddWheel"> - <par vector="0.45,-0.05,-1.0" name="position"/> - <par float="2.0" name="turnspeed"/> - <par float="2.0" name="returnspeed"/> - <par float="0.00025" name="suspensionsoftness"/> + <par vector="0.45,0.05,-1.0" name="position"/> + <par float="4.0" name="turnspeed"/> + <par float="4.0" name="returnspeed"/> + <par float="0.00035" name="suspensionsoftness"/> <par float="0.1" name="suspensiondamping"/> <par float="0.7" name="brakepower"/> - <par float="0.5" name="enginepower"/> + <par float="0.0" name="enginepower"/> <par float="1.0" name="leftsteersensitivity"/> <par float="0.8" name="rightsteersensitivity"/> <par float="1.3" name="friction"/> @@ -60,13 +60,13 @@ </action> <!--Front Right Wheel--> <action name="AddWheel"> - <par vector="-0.45,-0.05,-1.0" name="position"/> - <par float="2.0" name="turnspeed"/> - <par float="2.0" name="returnspeed"/> - <par float="0.00025" name="suspensionsoftness"/> + <par vector="-0.45,0.05,-1.0" name="position"/> + <par float="4.0" name="turnspeed"/> + <par float="4.0" name="returnspeed"/> + <par float="0.00035" name="suspensionsoftness"/> <par float="0.1" name="suspensiondamping"/> <par float="0.7" name="brakepower"/> - <par float="0.5" name="enginepower"/> + <par float="0.0" name="enginepower"/> <par float="0.8" name="leftsteersensitivity"/> <par float="1.0" name="rightsteersensitivity"/> <par float="1.3" name="friction"/> @@ -79,10 +79,10 @@ </action> <!--Rear Left Wheel--> <action name="AddWheel"> - <par vector="0.55,-0.05,0.9" name="position"/> - <par float="2.0" name="turnspeed"/> - <par float="2.0" name="returnspeed"/> - <par float="0.00025" name="suspensionsoftness"/> + <par vector="0.55,0.055,0.9" name="position"/> + <par float="4.0" name="turnspeed"/> + <par float="4.0" name="returnspeed"/> + <par float="0.00035" name="suspensionsoftness"/> <par float="0.1" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="0.5" name="enginepower"/> @@ -98,10 +98,10 @@ </action> <!--Rear Right Wheel--> <action name="AddWheel"> - <par vector="-0.55,-0.05,0.9" name="position"/> - <par float="2.0" name="turnspeed"/> - <par float="2.0" name="returnspeed"/> - <par float="0.00025" name="suspensionsoftness"/> + <par vector="-0.55,0.055,0.9" name="position"/> + <par float="4.0" name="turnspeed"/> + <par float="4.0" name="returnspeed"/> + <par float="0.00035" name="suspensionsoftness"/> <par float="0.1" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="0.5" name="enginepower"/> @@ -117,32 +117,32 @@ </action> <action name="SetGearSettings"> <par float="-1" name="gear"/> - <par float="1000.0" name="force"/> + <par float="1500.0" name="force"/> <par float="-50.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="1" name="gear"/> - <par float="1500.0" name="force"/> + <par float="1900.0" name="force"/> <par float="40.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="2" name="gear"/> - <par float="750.0" name="force"/> + <par float="950.0" name="force"/> <par float="80.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="3" name="gear"/> - <par float="500.0" name="force"/> + <par float="550.0" name="force"/> <par float="120.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="4" name="gear"/> - <par float="300.0" name="force"/> + <par float="400.0" name="force"/> <par float="162.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="5" name="gear"/> - <par float="150.0" name="force"/> + <par float="350.0" name="force"/> <par float="205.0" name="velocity"/> </action> </propclass> Modified: trunk/ioData/vehicles/strider/factories/genStriderBody =================================================================== --- trunk/ioData/vehicles/strider/factories/genStriderBody 2007-10-08 08:56:57 UTC (rev 1159) +++ trunk/ioData/vehicles/strider/factories/genStriderBody 2007-10-09 12:23:05 UTC (rev 1160) @@ -3,707 +3,707 @@ <plugin>genmeshfact</plugin> <zuse/> <params> -<material>mat1STRIDE~3.BMP.001</material> +<material>str01.png</material> <manualcolors/> -<v x="-0.398606" y="0.0381779" z="0.97203" u="0.963217" v="-0.241795" nx="3.14555e-07" ny="-1" nz="9.99167e-06" red="1" green="1" blue="1"/> -<v x="0.406728" y="0.0381782" z="0.972029" u="0.858858" v="-0.241795" nx="3.14555e-07" ny="-1" nz="9.99167e-06" red="1" green="1" blue="1"/> -<v x="-0.398606" y="0.0381739" z="0.569363" u="0.963217" v="-0.344410" nx="3.14555e-07" ny="-1" nz="9.99167e-06" red="1" green="1" blue="1"/> +<v x="-0.398606" y="0.183171" z="0.97203" u="0.963217" v="-0.241795" nx="3.14555e-07" ny="-1" nz="9.99167e-06" red="1" green="1" blue="1"/> +<v x="0.406728" y="0.183171" z="0.972029" u="0.858858" v="-0.241795" nx="3.14555e-07" ny="-1" nz="9.99167e-06" red="1" green="1" blue="1"/> +<v x="-0.398606" y="0.183167" z="0.569363" u="0.963217" v="-0.344410" nx="3.14555e-07" ny="-1" nz="9.99167e-06" red="1" green="1" blue="1"/> <t v1="2" v2="1" v3="0"/> -<v x="-0.633495" y="0.0381738" z="0.569363" u="0.993656" v="-0.344410" nx="3.40873e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> -<v x="-0.398606" y="0.0381739" z="0.569363" u="0.963217" v="-0.344410" nx="3.40873e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> -<v x="-0.516058" y="0.00461495" z="0.233807" u="0.978437" v="-0.429922" nx="3.40873e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> +<v x="-0.633495" y="0.183167" z="0.569363" u="0.993656" v="-0.344410" nx="3.40873e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> +<v x="-0.398606" y="0.183167" z="0.569363" u="0.963217" v="-0.344410" nx="3.40873e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> +<v x="-0.516058" y="0.149608" z="0.233807" u="0.978437" v="-0.429922" nx="3.40873e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> <t v1="5" v2="4" v3="3"/> -<v x="-0.516058" y="0.0046109" z="-0.168859" u="0.423550" v="-0.753524" nx="0.799959" ny="-0.600055" nz="5.92154e-06" red="1" green="1" blue="1"/> -<v x="-0.516058" y="0.00461495" z="0.233807" u="0.295142" v="-0.753524" nx="0.799959" ny="-0.600055" nz="5.92154e-06" red="1" green="1" blue="1"/> -<v x="-0.465717" y="0.071722" z="-0.16886" u="0.423550" v="-0.778384" nx="0.799959" ny="-0.600055" nz="5.92154e-06" red="1" green="1" blue="1"/> +<v x="-0.516058" y="0.149604" z="-0.168859" u="0.423550" v="-0.753524" nx="0.799959" ny="-0.600055" nz="5.92154e-06" red="1" green="1" blue="1"/> +<v x="-0.516058" y="0.149608" z="0.233807" u="0.295142" v="-0.753524" nx="0.799959" ny="-0.600055" nz="5.92154e-06" red="1" green="1" blue="1"/> +<v x="-0.465717" y="0.216715" z="-0.16886" u="0.423550" v="-0.778384" nx="0.799959" ny="-0.600055" nz="5.92154e-06" red="1" green="1" blue="1"/> <t v1="8" v2="7" v3="6"/> -<v x="-0.230828" y="0.0381558" z="-1.24264" u="0.941476" v="-0.806175" nx="3.07135e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> -<v x="-0.465717" y="0.071722" z="-0.16886" u="0.971914" v="-0.532536" nx="3.07135e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> -<v x="0.473839" y="0.0717223" z="-0.16886" u="0.850161" v="-0.532536" nx="3.07135e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> +<v x="-0.230828" y="0.183149" z="-1.24264" u="0.941476" v="-0.806175" nx="3.07135e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> +<v x="-0.465717" y="0.216715" z="-0.16886" u="0.971914" v="-0.532536" nx="3.07135e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.216715" z="-0.16886" u="0.850161" v="-0.532536" nx="3.07135e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> <t v1="11" v2="10" v3="9"/> -<v x="0.23895" y="0.0381559" z="-1.24264" u="0.880600" v="-0.806175" nx="2.93265e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> -<v x="-0.230828" y="0.0381558" z="-1.24264" u="0.941476" v="-0.806175" nx="2.93265e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> -<v x="0.473839" y="0.0717223" z="-0.16886" u="0.850161" v="-0.532536" nx="2.93265e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> +<v x="0.23895" y="0.183149" z="-1.24264" u="0.880600" v="-0.806175" nx="2.93265e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> +<v x="-0.230828" y="0.183149" z="-1.24264" u="0.941476" v="-0.806175" nx="2.93265e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.216715" z="-0.16886" u="0.850161" v="-0.532536" nx="2.93265e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> <t v1="14" v2="13" v3="12"/> -<v x="0.525701" y="0.00461122" z="-0.16886" u="0.440550" v="-0.286242" nx="-0.791263" ny="-0.611476" nz="6.22679e-06" red="1" green="1" blue="1"/> -<v x="0.473839" y="0.0717223" z="-0.16886" u="0.440550" v="-0.256643" nx="-0.791263" ny="-0.611476" nz="6.22679e-06" red="1" green="1" blue="1"/> -<v x="0.525701" y="0.00461525" z="0.233807" u="0.306174" v="-0.286242" nx="-0.791263" ny="-0.611476" nz="6.22679e-06" red="1" green="1" blue="1"/> +<v x="0.525701" y="0.149604" z="-0.16886" u="0.440550" v="-0.286242" nx="-0.791263" ny="-0.611476" nz="6.22679e-06" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.216715" z="-0.16886" u="0.440550" v="-0.256643" nx="-0.791263" ny="-0.611476" nz="6.22679e-06" red="1" green="1" blue="1"/> +<v x="0.525701" y="0.149608" z="0.233807" u="0.306174" v="-0.286242" nx="-0.791263" ny="-0.611476" nz="6.22679e-06" red="1" green="1" blue="1"/> <t v1="17" v2="16" v3="15"/> -<v x="0.641617" y="0.0381742" z="0.569363" u="0.828420" v="-0.344410" nx="3.15621e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> -<v x="0.525701" y="0.00461525" z="0.233807" u="0.843441" v="-0.429922" nx="3.15621e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> -<v x="0.406728" y="0.0381741" z="0.569363" u="0.858858" v="-0.344410" nx="3.15621e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> +<v x="0.641617" y="0.183167" z="0.569363" u="0.828420" v="-0.344410" nx="3.15621e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> +<v x="0.525701" y="0.149608" z="0.233807" u="0.843441" v="-0.429922" nx="3.15621e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> +<v x="0.406728" y="0.183167" z="0.569363" u="0.858858" v="-0.344410" nx="3.15621e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> <t v1="20" v2="19" v3="18"/> -<v x="0.406728" y="0.0381782" z="0.972029" u="0.858858" v="-0.241795" nx="2.96051e-07" ny="-1" nz="1.00287e-05" red="1" green="1" blue="1"/> -<v x="0.406728" y="0.0381741" z="0.569363" u="0.858858" v="-0.344410" nx="2.96051e-07" ny="-1" nz="1.00287e-05" red="1" green="1" blue="1"/> -<v x="-0.398606" y="0.0381739" z="0.569363" u="0.963217" v="-0.344410" nx="2.96051e-07" ny="-1" nz="1.00287e-05" red="1" green="1" blue="1"/> +<v x="0.406728" y="0.183171" z="0.972029" u="0.858858" v="-0.241795" nx="2.96051e-07" ny="-1" nz="1.00287e-05" red="1" green="1" blue="1"/> +<v x="0.406728" y="0.183167" z="0.569363" u="0.858858" v="-0.344410" nx="2.96051e-07" ny="-1" nz="1.00287e-05" red="1" green="1" blue="1"/> +<v x="-0.398606" y="0.183167" z="0.569363" u="0.963217" v="-0.344410" nx="2.96051e-07" ny="-1" nz="1.00287e-05" red="1" green="1" blue="1"/> <t v1="23" v2="22" v3="21"/> -<v x="-0.516058" y="0.00461495" z="0.233807" u="0.978437" v="-0.429922" nx="3.0931e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> -<v x="-0.398606" y="0.0381739" z="0.569363" u="0.963217" v="-0.344410" nx="3.0931e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> -<v x="0.406728" y="0.0381741" z="0.569363" u="0.858858" v="-0.344410" nx="3.0931e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> +<v x="-0.516058" y="0.149608" z="0.233807" u="0.978437" v="-0.429922" nx="3.0931e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> +<v x="-0.398606" y="0.183167" z="0.569363" u="0.963217" v="-0.344410" nx="3.0931e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> +<v x="0.406728" y="0.183167" z="0.569363" u="0.858858" v="-0.344410" nx="3.0931e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> <t v1="26" v2="25" v3="24"/> -<v x="-0.465717" y="0.071722" z="-0.16886" u="0.971914" v="-0.532536" nx="2.6595e-07" ny="-0.986396" nz="-0.164389" red="1" green="1" blue="1"/> -<v x="-0.516058" y="0.00461495" z="0.233807" u="0.978437" v="-0.429922" nx="2.6595e-07" ny="-0.986396" nz="-0.164389" red="1" green="1" blue="1"/> -<v x="0.473839" y="0.0717223" z="-0.16886" u="0.850161" v="-0.532536" nx="2.6595e-07" ny="-0.986396" nz="-0.164389" red="1" green="1" blue="1"/> +<v x="-0.465717" y="0.216715" z="-0.16886" u="0.971914" v="-0.532536" nx="2.6595e-07" ny="-0.986396" nz="-0.164389" red="1" green="1" blue="1"/> +<v x="-0.516058" y="0.149608" z="0.233807" u="0.978437" v="-0.429922" nx="2.6595e-07" ny="-0.986396" nz="-0.164389" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.216715" z="-0.16886" u="0.850161" v="-0.532536" nx="2.6595e-07" ny="-0.986396" nz="-0.164389" red="1" green="1" blue="1"/> <t v1="29" v2="28" v3="27"/> -<v x="0.525701" y="0.00461525" z="0.233807" u="0.843441" v="-0.429922" nx="-0.481377" ny="-0.872536" nz="-0.0834134" red="1" green="1" blue="1"/> -<v x="0.473839" y="0.0717223" z="-0.16886" u="0.850161" v="-0.532536" nx="-0.481377" ny="-0.872536" nz="-0.0834134" red="1" green="1" blue="1"/> -<v x="0.406728" y="0.0381741" z="0.569363" u="0.858858" v="-0.344410" nx="-0.481377" ny="-0.872536" nz="-0.0834134" red="1" green="1" blue="1"/> +<v x="0.525701" y="0.149608" z="0.233807" u="0.843441" v="-0.429922" nx="-0.481377" ny="-0.872536" nz="-0.0834134" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.216715" z="-0.16886" u="0.850161" v="-0.532536" nx="-0.481377" ny="-0.872536" nz="-0.0834134" red="1" green="1" blue="1"/> +<v x="0.406728" y="0.183167" z="0.569363" u="0.858858" v="-0.344410" nx="-0.481377" ny="-0.872536" nz="-0.0834134" red="1" green="1" blue="1"/> <t v1="32" v2="31" v3="30"/> -<v x="0.406728" y="0.0381741" z="0.569363" u="0.858858" v="-0.344410" nx="0.0510905" ny="-0.997864" nz="-0.0407029" red="1" green="1" blue="1"/> -<v x="0.473839" y="0.0717223" z="-0.16886" u="0.850161" v="-0.532536" nx="0.0510905" ny="-0.997864" nz="-0.0407029" red="1" green="1" blue="1"/> -<v x="-0.516058" y="0.00461495" z="0.233807" u="0.978437" v="-0.429922" nx="0.0510905" ny="-0.997864" nz="-0.0407029" red="1" green="1" blue="1"/> +<v x="0.406728" y="0.183167" z="0.569363" u="0.858858" v="-0.344410" nx="0.0510905" ny="-0.997864" nz="-0.0407029" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.216715" z="-0.16886" u="0.850161" v="-0.532536" nx="0.0510905" ny="-0.997864" nz="-0.0407029" red="1" green="1" blue="1"/> +<v x="-0.516058" y="0.149608" z="0.233807" u="0.978437" v="-0.429922" nx="0.0510905" ny="-0.997864" nz="-0.0407029" red="1" green="1" blue="1"/> <t v1="35" v2="34" v3="33"/> -<v x="0.0384768" y="0.288272" z="1.42681" u="0.887551" v="-0.176219" nx="0.673041" ny="-0.705577" nz="0.22176" red="1" green="1" blue="1"/> -<v x="0.00406083" y="0.108914" z="0.960596" u="0.890995" v="-0.222178" nx="0.673041" ny="-0.705577" nz="0.22176" red="1" green="1" blue="1"/> -<v x="0.00406085" y="0.258394" z="1.4362" u="0.890995" v="-0.175293" nx="0.673041" ny="-0.705577" nz="0.22176" red="1" green="1" blue="1"/> +<v x="0.0384768" y="0.433265" z="1.42681" u="0.887551" v="-0.176219" nx="0.673041" ny="-0.705576" nz="0.22176" red="1" green="1" blue="1"/> +<v x="0.00406083" y="0.253907" z="0.960596" u="0.890995" v="-0.222178" nx="0.673041" ny="-0.705576" nz="0.22176" red="1" green="1" blue="1"/> +<v x="0.00406085" y="0.403387" z="1.4362" u="0.890995" v="-0.175293" nx="0.673041" ny="-0.705576" nz="0.22176" red="1" green="1" blue="1"/> <t v1="38" v2="37" v3="36"/> -<v x="0.0384768" y="0.288272" z="1.42681" u="0.949435" v="-0.222444" nx="-0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> -<v x="-0.0303551" y="0.288272" z="1.42681" u="0.935799" v="-0.222444" nx="-0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> -<v x="-0.0131472" y="0.318149" z="1.41742" u="0.939208" v="-0.228632" nx="-0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> +<v x="0.0384768" y="0.433265" z="1.42681" u="0.949435" v="-0.222444" nx="-0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> +<v x="-0.0303551" y="0.433265" z="1.42681" u="0.935799" v="-0.222444" nx="-0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> +<v x="-0.0131472" y="0.463142" z="1.41742" u="0.939208" v="-0.228632" nx="-0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> <t v1="41" v2="40" v3="39"/> -<v x="0.0384768" y="0.288272" z="1.42681" u="0.949435" v="-0.222444" nx="0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> -<v x="-0.0131472" y="0.318149" z="1.41742" u="0.939208" v="-0.228632" nx="0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> -<v x="0.0212688" y="0.318149" z="1.41742" u="0.946026" v="-0.228632" nx="0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> +<v x="0.0384768" y="0.433265" z="1.42681" u="0.949435" v="-0.222444" nx="0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> +<v x="-0.0131472" y="0.463142" z="1.41742" u="0.939208" v="-0.228632" nx="0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> +<v x="0.0212688" y="0.463142" z="1.41742" u="0.946026" v="-0.228632" nx="0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> <t v1="44" v2="43" v3="42"/> -<v x="-0.0303551" y="0.288272" z="1.42681" u="0.935799" v="-0.222444" nx="0" ny="0.299841" nz="0.953989" red="1" green="1" blue="1"/> -<v x="0.0384768" y="0.288272" z="1.42681" u="0.949435" v="-0.222444" nx="0" ny="0.299841" nz="0.953989" red="1" green="1" blue="1"/> -<v x="0.00406085" y="0.258394" z="1.4362" u="0.942617" v="-0.216256" nx="0" ny="0.299841" nz="0.953989" red="1" green="1" blue="1"/> +<v x="-0.0303551" y="0.433265" z="1.42681" u="0.935799" v="-0.222444" nx="0" ny="0.299841" nz="0.953989" red="1" green="1" blue="1"/> +<v x="0.0384768" y="0.433265" z="1.42681" u="0.949435" v="-0.222444" nx="0" ny="0.299841" nz="0.953989" red="1" green="1" blue="1"/> +<v x="0.00406085" y="0.403387" z="1.4362" u="0.942617" v="-0.216256" nx="0" ny="0.299841" nz="0.953989" red="1" green="1" blue="1"/> <t v1="47" v2="46" v3="45"/> -<v x="-0.0131472" y="0.318149" z="1.41742" u="0.905320" v="-0.221221" nx="0" ny="0.909171" nz="-0.416423" red="1" green="1" blue="1"/> -<v x="0.00406083" y="0.108914" z="0.960596" u="0.903654" v="-0.178643" nx="0" ny="0.909171" nz="-0.416423" red="1" green="1" blue="1"/> -<v x="0.0212688" y="0.318149" z="1.41742" u="0.901988" v="-0.221221" nx="0" ny="0.909171" nz="-0.416423" red="1" green="1" blue="1"/> +<v x="-0.0131472" y="0.463142" z="1.41742" u="0.905320" v="-0.221221" nx="0" ny="0.909171" nz="-0.416423" red="1" green="1" blue="1"/> +<v x="0.00406083" y="0.253907" z="0.960596" u="0.903654" v="-0.178643" nx="0" ny="0.909171" nz="-0.416423" red="1" green="1" blue="1"/> +<v x="0.0212688" y="0.463142" z="1.41742" u="0.901988" v="-0.221221" nx="0" ny="0.909171" nz="-0.416423" red="1" green="1" blue="1"/> <t v1="50" v2="49" v3="48"/> -<v x="0.0212688" y="0.318149" z="1.41742" u="0.927756" v="-0.206972" nx="0.872832" ny="0.430414" nz="-0.230019" red="1" green="1" blue="1"/> -<v x="0.00406083" y="0.108914" z="0.960596" u="0.973464" v="-0.186346" nx="0.872832" ny="0.430414" nz="-0.230019" red="1" green="1" blue="1"/> -<v x="0.0384768" y="0.288272" z="1.42681" u="0.926816" v="-0.204027" nx="0.872832" ny="0.430414" nz="-0.230019" red="1" green="1" blue="1"/> +<v x="0.0212688" y="0.463142" z="1.41742" u="0.927756" v="-0.206972" nx="0.872832" ny="0.430414" nz="-0.230019" red="1" green="1" blue="1"/> +<v x="0.00406083" y="0.253907" z="0.960596" u="0.973464" v="-0.186346" nx="0.872832" ny="0.430414" nz="-0.230019" red="1" green="1" blue="1"/> +<v x="0.0384768" y="0.433265" z="1.42681" u="0.926816" v="-0.204027" nx="0.872832" ny="0.430414" nz="-0.230019" red="1" green="1" blue="1"/> <t v1="53" v2="52" v3="51"/> -<v x="0.00406085" y="0.258394" z="1.4362" u="0.890995" v="-0.175293" nx="-0.673041" ny="-0.705577" nz="0.22176" red="1" green="1" blue="1"/> -<v x="0.00406083" y="0.108914" z="0.960596" u="0.890995" v="-0.222178" nx="-0.673041" ny="-0.705577" nz="0.22176" red="1" green="1" blue="1"/> -<v x="-0.0303551" y="0.288272" z="1.42681" u="0.894438" v="-0.176219" nx="-0.673041" ny="-0.705577" nz="0.22176" red="1" green="1" blue="1"/> +<v x="0.00406085" y="0.403387" z="1.4362" u="0.890995" v="-0.175293" nx="-0.673041" ny="-0.705576" nz="0.22176" red="1" green="1" blue="1"/> +<v x="0.00406083" y="0.253907" z="0.960596" u="0.890995" v="-0.222178" nx="-0.673041" ny="-0.705576" nz="0.22176" red="1" green="1" blue="1"/> +<v x="-0.0303551" y="0.433265" z="1.42681" u="0.894438" v="-0.176219" nx="-0.673041" ny="-0.705576" nz="0.22176" red="1" green="1" blue="1"/> <t v1="56" v2="55" v3="54"/> -<v x="-0.0303551" y="0.288272" z="1.42681" u="0.913939" v="-0.236363" nx="-0.872832" ny="0.430413" nz="-0.230018" red="1" green="1" blue="1"/> -<v x="0.00406083" y="0.108914" z="0.960596" u="0.867291" v="-0.218682" nx="-0.872832" ny="0.430413" nz="-0.230018" red="1" green="1" blue="1"/> -<v x="-0.0131472" y="0.318149" z="1.41742" u="0.913000" v="-0.239308" nx="-0.872832" ny="0.430413" nz="-0.230018" red="1" green="1" blue="1"/> +<v x="-0.0303551" y="0.433265" z="1.42681" u="0.913939" v="-0.236363" nx="-0.872832" ny="0.430413" nz="-0.230018" red="1" green="1" blue="1"/> +<v x="0.00406083" y="0.253907" z="0.960596" u="0.867291" v="-0.218682" nx="-0.872832" ny="0.430413" nz="-0.230018" red="1" green="1" blue="1"/> +<v x="-0.0131472" y="0.463142" z="1.41742" u="0.913000" v="-0.239308" nx="-0.872832" ny="0.430413" nz="-0.230018" red="1" green="1" blue="1"/> <t v1="59" v2="58" v3="57"/> -<v x="0.525701" y="0.00461122" z="-0.16886" u="0.423550" v="-0.753524" nx="0.853728" ny="0.465771" nz="0.232819" red="1" green="1" blue="1"/> -<v x="0.507394" y="0.0381668" z="-0.16886" u="0.423550" v="-0.765954" nx="0.853728" ny="0.465771" nz="0.232819" red="1" green="1" blue="1"/> -<v x="0.608061" y="0.00460821" z="-0.47086" u="0.519856" v="-0.753524" nx="0.853728" ny="0.465771" nz="0.232819" red="1" green="1" blue="1"/> +<v x="0.525701" y="0.149604" z="-0.16886" u="0.423550" v="-0.753524" nx="0.853728" ny="0.465771" nz="0.232819" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.18316" z="-0.16886" u="0.423550" v="-0.765954" nx="0.853728" ny="0.465771" nz="0.232819" red="1" green="1" blue="1"/> +<v x="0.608061" y="0.149601" z="-0.47086" u="0.519856" v="-0.753524" nx="0.853728" ny="0.465771" nz="0.232819" red="1" green="1" blue="1"/> <t v1="62" v2="61" v3="60"/> -<v x="0.54095" y="0.105273" z="-0.638639" u="0.603567" v="-0.316452" nx="0.688211" ny="0.70972" nz="0.150539" red="1" green="1" blue="1"/> -<v x="0.608061" y="0.00460821" z="-0.47086" u="0.546431" v="-0.290508" nx="0.688211" ny="0.70972" nz="0.150539" red="1" green="1" blue="1"/> -<v x="0.507394" y="0.0381668" z="-0.16886" u="0.443587" v="-0.329425" nx="0.688211" ny="0.70972" nz="0.150539" red="1" green="1" blue="1"/> +<v x="0.54095" y="0.250266" z="-0.638639" u="0.603567" v="-0.316452" nx="0.688211" ny="0.70972" nz="0.150539" red="1" green="1" blue="1"/> +<v x="0.608061" y="0.149601" z="-0.47086" u="0.546431" v="-0.290508" nx="0.688211" ny="0.70972" nz="0.150539" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.18316" z="-0.16886" u="0.443587" v="-0.329425" nx="0.688211" ny="0.70972" nz="0.150539" red="1" green="1" blue="1"/> <t v1="65" v2="64" v3="63"/> -<v x="0.507394" y="0.205938" z="-0.806418" u="0.626863" v="-0.828105" nx="0.820763" ny="0.547178" nz="0.164147" red="1" green="1" blue="1"/> -<v x="0.54095" y="0.105273" z="-0.638639" u="0.573360" v="-0.790815" nx="0.820763" ny="0.547178" nz="0.164147" red="1" green="1" blue="1"/> -<v x="0.440283" y="0.306605" z="-0.806419" u="0.626863" v="-0.865396" nx="0.820763" ny="0.547178" nz="0.164147" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.350931" z="-0.806418" u="0.626863" v="-0.828105" nx="0.820763" ny="0.547178" nz="0.164147" red="1" green="1" blue="1"/> +<v x="0.54095" y="0.250266" z="-0.638639" u="0.573360" v="-0.790815" nx="0.820763" ny="0.547178" nz="0.164147" red="1" green="1" blue="1"/> +<v x="0.440283" y="0.451598" z="-0.806419" u="0.626863" v="-0.865396" nx="0.820763" ny="0.547178" nz="0.164147" red="1" green="1" blue="1"/> <t v1="68" v2="67" v3="66"/> -<v x="0.440283" y="0.306605" z="-0.806419" u="0.626863" v="-0.865396" nx="0.836332" ny="0.531185" nz="0.135616" red="1" green="1" blue="1"/> -<v x="0.54095" y="0.105273" z="-0.638639" u="0.573360" v="-0.790815" nx="0.836332" ny="0.531185" nz="0.135616" red="1" green="1" blue="1"/> -<v x="0.507394" y="0.0381668" z="-0.16886" u="0.423550" v="-0.765954" nx="0.836332" ny="0.531185" nz="0.135616" red="1" green="1" blue="1"/> +<v x="0.440283" y="0.451598" z="-0.806419" u="0.626863" v="-0.865396" nx="0.836332" ny="0.531185" nz="0.135616" red="1" green="1" blue="1"/> +<v x="0.54095" y="0.250266" z="-0.638639" u="0.573360" v="-0.790815" nx="0.836332" ny="0.531185" nz="0.135616" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.18316" z="-0.16886" u="0.423550" v="-0.765954" nx="0.836332" ny="0.531185" nz="0.135616" red="1" green="1" blue="1"/> <t v1="71" v2="70" v3="69"/> -<v x="0.507394" y="0.0381668" z="-0.16886" u="0.423550" v="-0.765954" nx="0.690111" ny="0.690113" nz="0.217923" red="1" green="1" blue="1"/> -<v x="0.473839" y="0.0717223" z="-0.16886" u="0.423550" v="-0.778384" nx="0.690111" ny="0.690113" nz="0.217923" red="1" green="1" blue="1"/> -<v x="0.440283" y="0.306605" z="-0.806419" u="0.626863" v="-0.865396" nx="0.690111" ny="0.690113" nz="0.217923" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.18316" z="-0.16886" u="0.423550" v="-0.765954" nx="0.690111" ny="0.690113" nz="0.217923" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.216715" z="-0.16886" u="0.423550" v="-0.778384" nx="0.690111" ny="0.690113" nz="0.217923" red="1" green="1" blue="1"/> +<v x="0.440283" y="0.451598" z="-0.806419" u="0.626863" v="-0.865396" nx="0.690111" ny="0.690113" nz="0.217923" red="1" green="1" blue="1"/> <t v1="74" v2="73" v3="72"/> -<v x="0.440283" y="0.306605" z="-0.806419" u="0.660703" v="-0.355369" nx="-8.33391e-07" ny="0.938347" nz="0.345696" red="1" green="1" blue="1"/> -<v x="0.473839" y="0.0717223" z="-0.16886" u="0.443587" v="-0.342397" nx="-8.33391e-07" ny="0.938347" nz="0.345696" red="1" green="1" blue="1"/> -<v x="0.373172" y="0.306605" z="-0.806419" u="0.660703" v="-0.381313" nx="-8.33391e-07" ny="0.938347" nz="0.345696" red="1" green="1" blue="1"/> +<v x="0.440283" y="0.451598" z="-0.806419" u="0.660703" v="-0.355369" nx="-4.16695e-07" ny="0.938347" nz="0.345696" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.216715" z="-0.16886" u="0.443587" v="-0.342397" nx="-4.16695e-07" ny="0.938347" nz="0.345696" red="1" green="1" blue="1"/> +<v x="0.373172" y="0.451598" z="-0.806419" u="0.660703" v="-0.381313" nx="-4.16695e-07" ny="0.938347" nz="0.345696" red="1" green="1" blue="1"/> <t v1="77" v2="76" v3="75"/> -<v x="0.525701" y="0.00461122" z="-0.16886" u="0.423550" v="-0.753524" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> -<v x="0.525701" y="0.00461525" z="0.233807" u="0.295142" v="-0.753524" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> -<v x="0.507394" y="0.0381668" z="-0.16886" u="0.423550" v="-0.765954" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> +<v x="0.525701" y="0.149604" z="-0.16886" u="0.423550" v="-0.753524" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> +<v x="0.525701" y="0.149608" z="0.233807" u="0.295142" v="-0.753524" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.18316" z="-0.16886" u="0.423550" v="-0.765954" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> <t v1="80" v2="79" v3="78"/> -<v x="0.507394" y="0.0381668" z="-0.16886" u="0.423550" v="-0.765954" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> -<v x="0.525701" y="0.00461525" z="0.233807" u="0.295142" v="-0.753524" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> -<v x="0.507394" y="0.0381708" z="0.233807" u="0.295142" v="-0.765954" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.18316" z="-0.16886" u="0.423550" v="-0.765954" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> +<v x="0.525701" y="0.149608" z="0.233807" u="0.295142" v="-0.753524" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.183164" z="0.233807" u="0.295142" v="-0.765954" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> <t v1="83" v2="82" v3="81"/> -<v x="0.507394" y="0.0381668" z="-0.16886" u="0.423550" v="-0.765954" nx="0.707107" ny="0.707106" nz="-7.16984e-06" red="1" green="1" blue="1"/> -<v x="0.507394" y="0.0381708" z="0.233807" u="0.295142" v="-0.765954" nx="0.707107" ny="0.707106" nz="-7.16984e-06" red="1" green="1" blue="1"/> -<v x="0.473839" y="0.0717223" z="-0.16886" u="0.423550" v="-0.778384" nx="0.707107" ny="0.707106" nz="-7.16984e-06" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.18316" z="-0.16886" u="0.423550" v="-0.765954" nx="0.707107" ny="0.707106" nz="-7.16984e-06" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.183164" z="0.233807" u="0.295142" v="-0.765954" nx="0.707107" ny="0.707106" nz="-7.16984e-06" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.216715" z="-0.16886" u="0.423550" v="-0.778384" nx="0.707107" ny="0.707106" nz="-7.16984e-06" red="1" green="1" blue="1"/> <t v1="86" v2="85" v3="84"/> -<v x="0.473839" y="0.0717223" z="-0.16886" u="0.423550" v="-0.778384" nx="0.707107" ny="0.707106" nz="-7.19601e-06" red="1" green="1" blue="1"/> -<v x="0.507394" y="0.0381708" z="0.233807" u="0.295142" v="-0.765954" nx="0.707107" ny="0.707106" nz="-7.19601e-06" red="1" green="1" blue="1"/> -<v x="0.473839" y="0.0717264" z="0.233807" u="0.295142" v="-0.778384" nx="0.707107" ny="0.707106" nz="-7.19601e-06" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.216715" z="-0.16886" u="0.423550" v="-0.778384" nx="0.707107" ny="0.707106" nz="-7.19601e-06" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.183164" z="0.233807" u="0.295142" v="-0.765954" nx="0.707107" ny="0.707106" nz="-7.19601e-06" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.216719" z="0.233807" u="0.295142" v="-0.778384" nx="0.707107" ny="0.707106" nz="-7.19601e-06" red="1" green="1" blue="1"/> <t v1="89" v2="88" v3="87"/> -<v x="-0.59994" y="0.273063" z="0.535805" u="0.205391" v="-0.167845" nx="-1" ny="-5.92099e-07" nz="6.04752e-12" red="1" green="1" blue="1"/> -<v x="-0.59994" y="0.273064" z="0.670027" u="0.160599" v="-0.167845" nx="-1" ny="-5.92099e-07" nz="6.04752e-12" red="1" green="1" blue="1"/> -<v x="-0.59994" y="0.172396" z="0.535806" u="0.205391" v="-0.212244" nx="-1" ny="-5.92099e-07" nz="6.04752e-12" red="1" green="1" blue="1"/> +<v x="-0.59994" y="0.418055" z="0.535805" u="0.205391" v="-0.167845" nx="-1" ny="-5.92099e-07" nz="6.04752e-12" red="1" green="1" blue="1"/> +<v x="-0.59994" y="0.418057" z="0.670027" u="0.160599" v="-0.167845" nx="-1" ny="-5.92099e-07" nz="6.04752e-12" red="1" green="1" blue="1"/> +<v x="-0.59994" y="0.317389" z="0.535806" u="0.205391" v="-0.212244" nx="-1" ny="-5.92099e-07" nz="6.04752e-12" red="1" green="1" blue="1"/> <t v1="92" v2="91" v3="90"/> -<v x="0.608061" y="0.273068" z="1.07269" u="0.027624" v="-0.852966" nx="0.639603" ny="0.426407" nz="0.639597" red="1" green="1" blue="1"/> -<v x="0.54095" y="0.273069" z="1.13981" u="0.006223" v="-0.852966" nx="0.639603" ny="0.426407" nz="0.639597" red="1" green="1" blue="1"/> -<v x="0.574506" y="0.373735" z="1.03914" u="0.038325" v="-0.890257" nx="0.639603" ny="0.426407" nz="0.639597" red="1" green="1" blue="1"/> +<v x="0.608061" y="0.418061" z="1.07269" u="0.027624" v="-0.852966" nx="0.639603" ny="0.426407" nz="0.639597" red="1" green="1" blue="1"/> +<v x="0.54095" y="0.418062" z="1.13981" u="0.006223" v="-0.852966" nx="0.639603" ny="0.426407" nz="0.639597" red="1" green="1" blue="1"/> +<v x="0.574506" y="0.518727" z="1.03914" u="0.038325" v="-0.890257" nx="0.639603" ny="0.426407" nz="0.639597" red="1" green="1" blue="1"/> <t v1="95" v2="94" v3="93"/> -<v x="0.574506" y="0.373735" z="1.03914" u="0.038325" v="-0.890257" nx="0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> -<v x="0.54095" y="0.273069" z="1.13981" u="0.006223" v="-0.852966" nx="0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> -<v x="0.507394" y="0.373735" z="1.10625" u="0.016923" v="-0.890257" nx="0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> +<v x="0.574506" y="0.518727" z="1.03914" u="0.038325" v="-0.890257" nx="0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> +<v x="0.54095" y="0.418062" z="1.13981" u="0.006223" v="-0.852966" nx="0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.518728" z="1.10625" u="0.016923" v="-0.890257" nx="0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> <t v1="98" v2="97" v3="96"/> -<v x="-0.59994" y="0.273068" z="1.07269" u="0.026222" v="-0.167845" nx="-0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> -<v x="-0.566384" y="0.373734" z="1.03914" u="0.037420" v="-0.123446" nx="-0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> -<v x="-0.532828" y="0.273069" z="1.13981" u="0.003826" v="-0.167844" nx="-0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> +<v x="-0.59994" y="0.418061" z="1.07269" u="0.026222" v="-0.167845" nx="-0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> +<v x="-0.566384" y="0.518727" z="1.03914" u="0.037420" v="-0.123446" nx="-0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> +<v x="-0.532828" y="0.418061" z="1.13981" u="0.003826" v="-0.167844" nx="-0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> <t v1="101" v2="100" v3="99"/> -<v x="-0.532828" y="0.273069" z="1.13981" u="0.722255" v="-0.066889" nx="-0.639603" ny="0.426407" nz="0.639598" red="1" green="1" blue="1"/> -<v x="-0.566384" y="0.373734" z="1.03914" u="0.714377" v="-0.093867" nx="-0.639603" ny="0.426407" nz="0.639598" red="1" green="1" blue="1"/> -<v x="-0.499273" y="0.373735" z="1.10625" u="0.730133" v="-0.093867" nx="-0.639603" ny="0.426407" nz="0.639598" red="1" green="1" blue="1"/> +<v x="-0.532828" y="0.418061" z="1.13981" u="0.722255" v="-0.066889" nx="-0.639603" ny="0.426407" nz="0.639598" red="1" green="1" blue="1"/> +<v x="-0.566384" y="0.518727" z="1.03914" u="0.714377" v="-0.093867" nx="-0.639603" ny="0.426407" nz="0.639598" red="1" green="1" blue="1"/> +<v x="-0.499273" y="0.518728" z="1.10625" u="0.730133" v="-0.093867" nx="-0.639603" ny="0.426407" nz="0.639598" red="1" green="1" blue="1"/> <t v1="104" v2="103" v3="102"/> -<v x="0.23895" y="0.172378" z="-1.2762" u="0.754445" v="-0.889270" nx="7.69344e-08" ny="-0.242545" nz="-0.97014" red="1" green="1" blue="1"/> -<v x="-0.230829" y="0.172378" z="-1.2762" u="0.918860" v="-0.889270" nx="7.69344e-08" ny="-0.242545" nz="-0.97014" red="1" green="1" blue="1"/> -<v x="0.23895" y="0.0381559" z="-1.24264" u="0.754445" v="-0.827758" nx="7.69344e-08" ny="-0.242545" nz="-0.97014" red="1" green="1" blue="1"/> +<v x="0.23895" y="0.317371" z="-1.2762" u="0.754445" v="-0.889270" nx="7.69344e-08" ny="-0.242545" nz="-0.97014" red="1" green="1" blue="1"/> +<v x="-0.230829" y="0.317371" z="-1.2762" u="0.918860" v="-0.889270" nx="7.69344e-08" ny="-0.242545" nz="-0.97014" red="1" green="1" blue="1"/> +<v x="0.23895" y="0.183149" z="-1.24264" u="0.754445" v="-0.827758" nx="7.69344e-08" ny="-0.242545" nz="-0.97014" red="1" green="1" blue="1"/> <t v1="107" v2="106" v3="105"/> -<v x="0.23895" y="0.0381559" z="-1.24264" u="0.754445" v="-0.827758" nx="-1.76938e-07" ny="-0.242546" nz="-0.97014" red="1" green="1" blue="1"/> -<v x="-0.230829" y="0.172378" z="-1.2762" u="0.918860" v="-0.889270" nx="-1.76938e-07" ny="-0.242546" nz="-0.97014" red="1" green="1" blue="1"/> -<v x="-0.230828" y="0.0381558" z="-1.24264" u="0.918860" v="-0.827758" nx="-1.76938e-07" ny="-0.242546" nz="-0.97014" red="1" green="1" blue="1"/> +<v x="0.23895" y="0.183149" z="-1.24264" u="0.754445" v="-0.827758" nx="-1.76938e-07" ny="-0.242546" nz="-0.97014" red="1" green="1" blue="1"/> +<v x="-0.230829" y="0.317371" z="-1.2762" u="0.918860" v="-0.889270" nx="-1.76938e-07" ny="-0.242546" nz="-0.97014" red="1" green="1" blue="1"/> +<v x="-0.230828" y="0.183149" z="-1.24264" u="0.918860" v="-0.827758" nx="-1.76938e-07" ny="-0.242546" nz="-0.97014" red="1" green="1" blue="1"/> <t v1="110" v2="109" v3="108"/> -<v x="-0.130162" y="0.642167" z="-0.13531" u="0.429353" v="-0.005051" nx="-1" ny="1.2453e-09" nz="1.48025e-07" red="1" green="1" blue="1"/> -<v x="-0.130162" y="0.642171" z="0.267357" u="0.294976" v="-0.005050" nx="-1" ny="1.2453e-09" nz="1.48025e-07" red="1" green="1" blue="1"/> -<v x="-0.130162" y="0.615719" z="-0.135088" u="0.429279" v="-0.016716" nx="-1" ny="1.2453e-09" nz="1.48025e-07" red="1" green="1" blue="1"/> +<v x="-0.130162" y="0.78716" z="-0.13531" u="0.429353" v="-0.005051" nx="-1" ny="1.2453e-09" nz="1.48025e-07" red="1" green="1" blue="1"/> +<v x="-0.130162" y="0.787164" z="0.267357" u="0.294976" v="-0.005050" nx="-1" ny="1.2453e-09" nz="1.48025e-07" red="1" green="1" blue="1"/> +<v x="-0.130162" y="0.760712" z="-0.135088" u="0.429279" v="-0.016716" nx="-1" ny="1.2453e-09" nz="1.48025e-07" red="1" green="1" blue="1"/> <t v1="113" v2="112" v3="111"/> -<v x="0.137357" y="0.615719" z="-0.13531" u="0.412849" v="-0.979901" nx="0.999387" ny="-0.0349955" nz="0.000550445" red="1" green="1" blue="1"/> -<v x="0.138061" y="0.642171" z="0.267357" u="0.284441" v="-0.989699" nx="0.999387" ny="-0.0349955" nz="0.000550445" red="1" green="1" blue="1"/> -<v x="0.138283" y="0.642167" z="-0.13531" u="0.412849" v="-0.989699" nx="0.999387" ny="-0.0349955" nz="0.000550445" red="1" green="1" blue="1"/> +<v x="0.137357" y="0.760712" z="-0.13531" u="0.412849" v="-0.979901" nx="0.999387" ny="-0.0349955" nz="0.000550445" red="1" green="1" blue="1"/> +<v x="0.138061" y="0.787164" z="0.267357" u="0.284441" v="-0.989699" nx="0.999387" ny="-0.0349955" nz="0.000550445" red="1" green="1" blue="1"/> +<v x="0.138283" y="0.78716" z="-0.13531" u="0.412849" v="-0.989699" nx="0.999387" ny="-0.0349955" nz="0.000550445" red="1" green="1" blue="1"/> <t v1="116" v2="115" v3="114"/> -<v x="-0.398606" y="0.642177" z="0.804246" u="0.112201" v="-0.679675" nx="-4.45315e-07" ny="1" nz="-1.02143e-05" red="1" green="1" blue="1"/> -<v x="-0.397859" y="0.642171" z="0.267357" u="0.295035" v="-0.679386" nx="-4.45315e-07" ny="1" nz="-1.02143e-05" red="1" green="1" blue="1"/> -<v x="-0.130162" y="0.642171" z="0.267357" u="0.295035" v="-0.575897" nx="-4.45315e-07" ny="1" nz="-1.02143e-05" red="1" green="1" blue="1"/> +<v x="-0.398606" y="0.787169" z="0.804246" u="0.112201" v="-0.679675" nx="-4.45315e-07" ny="1" nz="-1.02143e-05" red="1" green="1" blue="1"/> +<v x="-0.397859" y="0.787164" z="0.267357" u="0.295035" v="-0.679386" nx="-4.45315e-07" ny="1" nz="-1.02143e-05" red="1" green="1" blue="1"/> +<v x="-0.130162" y="0.787164" z="0.267357" u="0.295035" v="-0.575897" nx="-4.45315e-07" ny="1" nz="-1.02143e-05" red="1" green="1" blue="1"/> <t v1="119" v2="118" v3="117"/> -<v x="0.406728" y="0.642177" z="0.804246" u="0.112201" v="-0.368341" nx="-2.96051e-07" ny="1" nz="-1.0071e-05" red="1" green="1" blue="1"/> -<v x="-0.398606" y="0.642177" z="0.804246" u="0.112201" v="-0.679675" nx="-2.96051e-07" ny="1" nz="-1.0071e-05" red="1" green="1" blue="1"/> -<v x="0.139029" y="0.642171" z="0.267619" u="0.294945" v="-0.471831" nx="-2.96051e-07" ny="1" nz="-1.0071e-05" red="1" green="1" blue="1"/> +<v x="0.406728" y="0.78717" z="0.804246" u="0.112201" v="-0.368341" nx="-2.96051e-07" ny="1" nz="-1.0071e-05" red="1" green="1" blue="1"/> +<v x="-0.398606" y="0.787169" z="0.804246" u="0.112201" v="-0.679675" nx="-2.96051e-07" ny="1" nz="-1.0071e-05" red="1" green="1" blue="1"/> +<v x="0.139029" y="0.787164" z="0.267619" u="0.294945" v="-0.471831" nx="-2.96051e-07" ny="1" nz="-1.0071e-05" red="1" green="1" blue="1"/> <t v1="122" v2="121" v3="120"/> -<v x="0.406727" y="0.642171" z="0.267357" u="0.295035" v="-0.368341" nx="-1.00221e-08" ny="1" nz="-1.02137e-05" red="1" green="1" blue="1"/> -<v x="0.406728" y="0.642177" z="0.804246" u="0.112201" v="-0.368341" nx="-1.00221e-08" ny="1" nz="-1.02137e-05" red="1" green="1" blue="1"/> -<v x="0.139029" y="0.642171" z="0.267619" u="0.294945" v="-0.471831" nx="-1.00221e-08" ny="1" nz="-1.02137e-05" red="1" green="1" blue="1"/> +<v x="0.406727" y="0.787164" z="0.267357" u="0.295035" v="-0.368341" nx="-1.00221e-08" ny="1" nz="-1.02137e-05" red="1" green="1" blue="1"/> +<v x="0.406728" y="0.78717" z="0.804246" u="0.112201" v="-0.368341" nx="-1.00221e-08" ny="1" nz="-1.02137e-05" red="1" green="1" blue="1"/> +<v x="0.139029" y="0.787164" z="0.267619" u="0.294945" v="-0.471831" nx="-1.00221e-08" ny="1" nz="-1.02137e-05" red="1" green="1" blue="1"/> <t v1="125" v2="124" v3="123"/> -<v x="0.138283" y="0.642167" z="-0.13531" u="0.432160" v="-0.472119" nx="-4.33031e-07" ny="1" nz="-1.00583e-05" red="1" green="1" blue="1"/> -<v x="0.139029" y="0.642171" z="0.267619" u="0.294945" v="-0.471831" nx="-4.33031e-07" ny="1" nz="-1.00583e-05" red="1" green="1" blue="1"/> -<v x="-0.130162" y="0.642171" z="0.267357" u="0.295035" v="-0.575897" nx="-4.33031e-07" ny="1" nz="-1.00583e-05" red="1" green="1" blue="1"/> +<v x="0.138283" y="0.78716" z="-0.13531" u="0.432160" v="-0.472119" nx="-4.33031e-07" ny="1" nz="-1.00583e-05" red="1" green="1" blue="1"/> +<v x="0.139029" y="0.787164" z="0.267619" u="0.294945" v="-0.471831" nx="-4.33031e-07" ny="1" nz="-1.00583e-05" red="1" green="1" blue="1"/> +<v x="-0.130162" y="0.787164" z="0.267357" u="0.295035" v="-0.575897" nx="-4.33031e-07" ny="1" nz="-1.00583e-05" red="1" green="1" blue="1"/> <t v1="128" v2="127" v3="126"/> -<v x="-0.130162" y="0.642167" z="-0.13531" u="0.432160" v="-0.575897" nx="-4.44076e-07" ny="1" nz="-1.00657e-05" red="1" green="1" blue="1"/> -<v x="0.138283" y="0.642167" z="-0.13531" u="0.432160" v="-0.472119" nx="-4.44076e-07" ny="1" nz="-1.00657e-05" red="1" green="1" blue="1"/> -<v x="-0.130162" y="0.642171" z="0.267357" u="0.295035" v="-0.575897" nx="-4.44076e-07" ny="1" nz="-1.00657e-05" red="1" green="1" blue="1"/> +<v x="-0.130162" y="0.78716" z="-0.13531" u="0.432160" v="-0.575897" nx="-4.44076e-07" ny="1" nz="-1.00657e-05" red="1" green="1" blue="1"/> +<v x="0.138283" y="0.78716" z="-0.13531" u="0.432160" v="-0.472119" nx="-4.44076e-07" ny="1" nz="-1.00657e-05" red="1" green="1" blue="1"/> +<v x="-0.130162" y="0.787164" z="0.267357" u="0.295035" v="-0.575897" nx="-4.44076e-07" ny="1" nz="-1.00657e-05" red="1" green="1" blue="1"/> <t v1="131" v2="130" v3="129"/> -<v x="-0.398606" y="0.642177" z="0.804246" u="0.112201" v="-0.679675" nx="-4.32885e-07" ny="1" nz="-1.02081e-05" red="1" green="1" blue="1"/> -<v x="-0.130162" y="0.642171" z="0.267357" u="0.295035" v="-0.575897" nx="-4.32885e-07" ny="1" nz="-1.02081e-05" red="1" green="1" blue="1"/> -<v x="0.139029" y="0.642171" z="0.267619" u="0.294945" v="-0.471831" nx="-4.32885e-07" ny="1" nz="-1.02081e-05" red="1" green="1" blue="1"/> +<v x="-0.398606" y="0.787169" z="0.804246" u="0.112201" v="-0.679675" nx="-4.32885e-07" ny="1" nz="-1.02081e-05" red="1" green="1" blue="1"/> +<v x="-0.130162" y="0.787164" z="0.267357" u="0.295035" v="-0.575897" nx="-4.32885e-07" ny="1" nz="-1.02081e-05" red="1" green="1" blue="1"/> +<v x="0.139029" y="0.787164" z="0.267619" u="0.294945" v="-0.471831" nx="-4.32885e-07" ny="1" nz="-1.02081e-05" red="1" green="1" blue="1"/> <t v1="134" v2="133" v3="132"/> -<v x="0.406727" y="0.608611" z="-0.168866" u="0.443587" v="-0.368341" nx="0.0167359" ny="0.996905" nz="-0.076812" red="1" green="1" blue="1"/> -<v x="0.406727" y="0.642171" z="0.266692" u="0.295261" v="-0.368341" nx="0.0167359" ny="0.996905" nz="-0.076812" red="1" green="1" blue="1"/> -<v x="0.137357" y="0.615719" z="-0.13531" u="0.432160" v="-0.472477" nx="0.0167359" ny="0.996905" nz="-0.076812" red="1" green="1" blue="1"/> +<v x="0.406727" y="0.753604" z="-0.168866" u="0.443587" v="-0.368341" nx="0.0167359" ny="0.996905" nz="-0.076812" red="1" green="1" blue="1"/> +<v x="0.406727" y="0.787164" z="0.266692" u="0.295261" v="-0.368341" nx="0.0167359" ny="0.996905" nz="-0.076812" red="1" green="1" blue="1"/> +<v x="0.137357" y="0.760712" z="-0.13531" u="0.432160" v="-0.472477" nx="0.0167359" ny="0.996905" nz="-0.076812" red="1" green="1" blue="1"/> <t v1="137" v2="136" v3="135"/> -<v x="-0.398606" y="0.608611" z="-0.168866" u="0.443587" v="-0.679675" nx="-3.20297e-07" ny="0.978294" nz="-0.207221" red="1" green="1" blue="1"/> -<v x="0.406727" y="0.608611" z="-0.168866" u="0.443587" v="-0.368341" nx="-3.20297e-07" ny="0.978294" nz="-0.207221" red="1" green="1" blue="1"/> -<v x="0.137357" y="0.615719" z="-0.13531" u="0.432160" v="-0.472477" nx="-3.20297e-07" ny="0.978294" nz="-0.207221" red="1" green="1" blue="1"/> +<v x="-0.398606" y="0.753604" z="-0.168866" u="0.443587" v="-0.679675" nx="-3.20297e-07" ny="0.978294" nz="-0.207221" red="1" green="1" blue="1"/> +<v x="0.406727" y="0.753604" z="-0.168866" u="0.443587" v="-0.368341" nx="-3.20297e-07" ny="0.978294" nz="-0.207221" red="1" green="1" blue="1"/> +<v x="0.137357" y="0.760712" z="-0.13531" u="0.432160" v="-0.472477" nx="-3.20297e-07" ny="0.978294" nz="-0.207221" red="1" green="1" blue="1"/> <t v1="140" v2="139" v3="138"/> -<v x="-0.398606" y="0.642171" z="0.268021" u="0.294808" v="-0.679675" nx="-0.0167602" ny="0.996923" nz="-0.0765796" red="1" green="1" blue="1"/> -<v x="-0.398606" y="0.608611" z="-0.168866" u="0.443587" v="-0.679675" nx="-0.0167602" ny="0.996923" nz="-0.0765796" red="1" green="1" blue="1"/> -<v x="-0.130162" y="0.615719" z="-0.135088" u="0.432084" v="-0.575897" nx="-0.0167602" ny="0.996923" nz="-0.0765796" red="1" green="1" blue="1"/> +<v x="-0.398606" y="0.787164" z="0.268021" u="0.294808" v="-0.679675" nx="-0.0167602" ny="0.996923" nz="-0.0765796" red="1" green="1" blue="1"/> +<v x="-0.398606" y="0.753604" z="-0.168866" u="0.443587" v="-0.679675" nx="-0.0167602" ny="0.996923" nz="-0.0765796" red="1" green="1" blue="1"/> +<v x="-0.130162" y="0.760712" z="-0.135088" u="0.432084" v="-0.575897" nx="-0.0167602" ny="0.996923" nz="-0.0765796" red="1" green="1" blue="1"/> <t v1="143" v2="142" v3="141"/> -<v x="-0.130383" y="0.642171" z="0.267357" u="0.295035" v="-0.575983" nx="-0.000162983" ny="0.997847" nz="-0.0655876" red="1" green="1" blue="1"/> -<v x="-0.398606" y="0.642171" z="0.268021" u="0.294808" v="-0.679675" nx="-0.000162983" ny="0.997847" nz="-0.0655876" red="1" green="1" blue="1"/> -<v x="-0.130162" y="0.615719" z="-0.135088" u="0.432084" v="-0.575897" nx="-0.000162983" ny="0.997847" nz="-0.0655876" red="1" green="1" blue="1"/> +<v x="-0.130383" y="0.787164" z="0.267357" u="0.295035" v="-0.575983" nx="-0.000162983" ny="0.997847" nz="-0.0655876" red="1" green="1" blue="1"/> +<v x="-0.398606" y="0.787164" z="0.268021" u="0.294808" v="-0.679675" nx="-0.000162983" ny="0.997847" nz="-0.0655876" red="1" green="1" blue="1"/> +<v x="-0.130162" y="0.760712" z="-0.135088" u="0.432084" v="-0.575897" nx="-0.000162983" ny="0.997847" nz="-0.0655876" red="1" green="1" blue="1"/> <t v1="146" v2="145" v3="144"/> -<v x="0.137357" y="0.615719" z="-0.13531" u="0.432160" v="-0.472477" nx="-0.000170443" ny="0.978841" nz="-0.20462" red="1" green="1" blue="1"/> -<v x="-0.130162" y="0.615719" z="-0.135088" u="0.432084" v="-0.575897" nx="-0.000170443" ny="0.978841" nz="-0.20462" red="1" green="1" blue="1"/> -<v x="-0.398606" y="0.608611" z="-0.168866" u="0.443587" v="-0.679675" nx="-0.000170443" ny="0.978841" nz="-0.20462" red="1" green="1" blue="1"/> +<v x="0.137357" y="0.760712" z="-0.13531" u="0.432160" v="-0.472477" nx="-0.000170443" ny="0.978841" nz="-0.20462" red="1" green="1" blue="1"/> +<v x="-0.130162" y="0.760712" z="-0... [truncated message content] |
From: <cf...@us...> - 2007-10-08 08:56:54
|
Revision: 1159 http://automanic.svn.sourceforge.net/automanic/?rev=1159&view=rev Author: cfraz89 Date: 2007-10-08 01:56:57 -0700 (Mon, 08 Oct 2007) Log Message: ----------- crash fix Modified Paths: -------------- trunk/ioBaseInit.py trunk/ioData/client/ioEntityManagerClient.py trunk/ioData/maps/cod/entities_world trunk/ioData/menus/ioAutoUpdater.py trunk/ioData/menus/ioGarage.py trunk/ioData/vehicles/Van/entities_world trunk/ioData/vehicles/Van/world trunk/ioData/vehicles/falcon/entities_world trunk/ioData/vehicles/falcon/world trunk/ioData/vehicles/fedex/entities_world trunk/ioData/vehicles/fedex/world trunk/ioData/vehicles/strider/entities_world trunk/ioData/vehicles/strider/factories/genStriderBody trunk/ioData/vehicles/strider/world trunk/ioData/vehicles/trekker/world trunk/ioData/vehicles/voyager/entities_world trunk/ioData/vehicles/voyager/world trunk/iomapedit/ioBaseInit.py trunk/iomapedit/scripts/cament.py Modified: trunk/ioBaseInit.py =================================================================== --- trunk/ioBaseInit.py 2007-10-02 17:00:12 UTC (rev 1158) +++ trunk/ioBaseInit.py 2007-10-08 08:56:57 UTC (rev 1159) @@ -40,6 +40,7 @@ #Add crystal dir to pythonpath if os.environ.has_key('CRYSTAL'): path = os.environ['CRYSTAL'] + path += '/out/linuxx86/optimize/bindings/python/' os.environ['PYTHONPATH'] += os.path.pathsep + path for path in paths: addPath(path) Modified: trunk/ioData/client/ioEntityManagerClient.py =================================================================== --- trunk/ioData/client/ioEntityManagerClient.py 2007-10-02 17:00:12 UTC (rev 1158) +++ trunk/ioData/client/ioEntityManagerClient.py 2007-10-08 08:56:57 UTC (rev 1159) @@ -14,8 +14,8 @@ def __init__(self, celEntity): self.entity = celEntity self.entities = [] - self.numbots = 0 - + self.maxbots = 7 + self.bots = 0 self.net = ioNetHelper.ioNetHelper() def authok(self, pc, args): @@ -88,44 +88,50 @@ self.entities.append(vehicle.Name) def fillbots(self, pc, args): + if self.bots < self.maxbots: + celTimer(self.entity).WakeUp(5000, False, 'addbot') + + def pctimer_addbot(self, pc, args): vehicles = ioLoader.scanDir('vehicles') - for i in xrange(self.numbots): - #Pick a random vehicle, and extract its template - vehicleinfo = random.choice(vehicles) - vehicle = ioNetworkEntCl.makeEntity(vehicleinfo['Codename'], 'ioBot' + str(i)) - mesh = celMesh(vehicle) - mesh.MoveMesh(Engine.GetSectors().Get(0), mesh.Mesh.GetMovable().GetPosition()) - if vehicle: - gmtp = Entities['ioGmTpCl'] - pars = parblock({'entity' : vehicle}) - gmtp.Behaviour.SendMessage('positionplayer', None, pars) + #Pick a random vehicle, and extract its template + #vehicleinfo = random.choice(vehicles) + vehicleinfo = filter(lambda v: v['Codename'] == 'Voyager', vehicles)[0] + vehicle = ioNetworkEntCl.makeEntity(vehicleinfo['Codename'], 'ioBot' + str(self.bots)) + mesh = celMesh(vehicle) + mesh.MoveMesh(Engine.GetSectors().Get(0), mesh.Mesh.GetMovable().GetPosition()) - #Equip random model for weapons - models = ioLoader.scanModels(vehicleinfo['Path']) - if len(models) > 0: - model = random.choice(models) - weapons = model['Weapons'] - for mount, weapon in weapons.items(): - pars = parblock({'mount' : mount, 'weapon' : weapon}) - vehicle.Behaviour.SendMessage('addweapon', None, pars) - - pars = parblock({'player' : False}) - vehicle.Behaviour.SendMessage('setplayer', None, pars) - - print 'registering bot' - #Finally Register it to the network - pars = parblock({'registered' : True}) - vehicle.Behaviour.SendMessage('setregistered', None, pars) + if vehicle: + gmtp = Entities['ioGmTpCl'] + pars = parblock({'entity' : vehicle}) + gmtp.Behaviour.SendMessage('positionplayer', None, pars) + + #Equip random model for weapons + models = ioLoader.scanModels(vehicleinfo['Path']) + if len(models) > 0: + model = random.choice(models) + weapons = model['Weapons'] + for mount, weapon in weapons.items(): + pars = parblock({'mount' : mount, 'weapon' : weapon}) + vehicle.Behaviour.SendMessage('addweapon', None, pars) - pars = parblock({'bot' : True}) - vehicle.Behaviour.SendMessage('setbot', None, pars) + pars = parblock({'player' : False}) + vehicle.Behaviour.SendMessage('setplayer', None, pars) - self.entities.append(vehicle.Name) - + print 'registering bot' + #Finally Register it to the network + pars = parblock({'registered' : True}) + vehicle.Behaviour.SendMessage('setregistered', None, pars) + + pars = parblock({'bot' : True}) + vehicle.Behaviour.SendMessage('setbot', None, pars) + + self.entities.append(vehicle.Name) + + self.bots += 1 + self.entity.Behaviour.SendMessage('fillbots', pc, args) + def destruct(self, pc, args): - self.entity.PropertyClassList.RemoveAll() - for entname in self.entities: ent = Entities[entname] if ent: Modified: trunk/ioData/maps/cod/entities_world =================================================================== --- trunk/ioData/maps/cod/entities_world 2007-10-02 17:00:12 UTC (rev 1158) +++ trunk/ioData/maps/cod/entities_world 2007-10-08 08:56:57 UTC (rev 1159) @@ -14,7 +14,7 @@ <par float="99999999999999999999.99" name="mass"/> <par float="0.0" name="elasticity"/> <par float="1" name="density"/> - <par float="0.0000" name="softness"/> + <par float="0.0005" name="softness"/> <par bool="true" name="enabled" /> </action> <action name="SetColliderMesh" /> Modified: trunk/ioData/menus/ioAutoUpdater.py =================================================================== --- trunk/ioData/menus/ioAutoUpdater.py 2007-10-02 17:00:12 UTC (rev 1158) +++ trunk/ioData/menus/ioAutoUpdater.py 2007-10-08 08:56:57 UTC (rev 1159) @@ -96,7 +96,7 @@ def downloader_error(self, pars): error = pars[0] - self.completeupdate('Error getting %s, %s' % (self.dl.url, error), 4000) + self.completeupdate('Error getting %s, %s' % (self.dl.url, error), 2000) def downloader_complete(self, pars): if self.state == 'gettingversions': @@ -123,7 +123,7 @@ self.menu.addElement('Skip', 'Abort_clicked', (115000, 235000), (18000, 9000), self.fconst, 'button-bg') self.menu.addElement('Update', 'Update_clicked', (155000, 235000), (18000, 9000), self.fconst, 'button-bg') else: - self.completeupdate('No updates available', 2000) + self.completeupdate('No updates available', 1000) #Show the popup window thingy with info def makedescwindow(self): Modified: trunk/ioData/menus/ioGarage.py =================================================================== --- trunk/ioData/menus/ioGarage.py 2007-10-02 17:00:12 UTC (rev 1158) +++ trunk/ioData/menus/ioGarage.py 2007-10-08 08:56:57 UTC (rev 1159) @@ -169,26 +169,26 @@ self.modelscroller.scrolldown() def pccommandinput_camleft1(self, pc, args): - self.camera.SetYawVelocity(0.6) + self.camera.SetYawVelocity(1.0) def pccommandinput_camleft0(self, pc, args): self.camera.SetYawVelocity(0) def pccommandinput_camright1(self, pc, args): - self.camera.SetYawVelocity(-0.6) + self.camera.SetYawVelocity(-1.0) def pccommandinput_camright0(self, pc, args): self.camera.SetYawVelocity(0) def pccommandinput_camup1(self, pc, args): - self.camera.SetPitchVelocity(-0.6) + self.camera.SetPitchVelocity(-1.0) def pccommandinput_camup0(self, pc, args): self.camera.SetPitchVelocity(0) def pccommandinput_camdown1(self, pc, args): - self.camera.SetPitchVelocity(0.6) + self.camera.SetPitchVelocity(1.0) def pccommandinput_camdown0(self, pc, args): self.camera.SetPitchVelocity(0) Modified: trunk/ioData/vehicles/Van/entities_world =================================================================== --- trunk/ioData/vehicles/Van/entities_world 2007-10-02 17:00:12 UTC (rev 1158) +++ trunk/ioData/vehicles/Van/entities_world 2007-10-08 08:56:57 UTC (rev 1159) @@ -45,9 +45,9 @@ <!--Front Left Wheel--> <action name="AddWheel"> <par vector="0.55,0,-0.9" name="position"/> - <par float="2.0" name="turnspeed"/> - <par float="2.0" name="returnspeed"/> - <par float="0.00025" name="suspensionsoftness"/> + <par float="4.0" name="turnspeed"/> + <par float="4.0" name="returnspeed"/> + <par float="0.00005" name="suspensionsoftness"/> <par float="0.2" name="suspensiondamping"/> <par float="0.7" name="brakepower"/> <par float="0.0" name="enginepower"/> @@ -64,9 +64,9 @@ <!--Front Right Wheel--> <action name="AddWheel"> <par vector="-0.55,0,-0.9" name="position"/> - <par float="2.0" name="turnspeed"/> - <par float="2.0" name="returnspeed"/> - <par float="0.00025" name="suspensionsoftness"/> + <par float="4.0" name="turnspeed"/> + <par float="4.0" name="returnspeed"/> + <par float="0.00005" name="suspensionsoftness"/> <par float="0.2" name="suspensiondamping"/> <par float="0.7" name="brakepower"/> <par float="0.0" name="enginepower"/> @@ -83,9 +83,9 @@ <!--Rear Left Wheel--> <action name="AddWheel"> <par vector="0.55,0,1.1" name="position"/> - <par float="2.0" name="turnspeed"/> + <par float="4.0" name="turnspeed"/> <par float="2.0" name="returnspeed"/> - <par float="0.00025" name="suspensionsoftness"/> + <par float="0.00005" name="suspensionsoftness"/> <par float="0.2" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="1.0" name="enginepower"/> @@ -102,9 +102,9 @@ <!--Rear Right Wheel--> <action name="AddWheel"> <par vector="-0.55,0,1.1" name="position"/> - <par float="2.0" name="turnspeed"/> - <par float="2.0" name="returnspeed"/> - <par float="0.00025" name="suspensionsoftness"/> + <par float="4.0" name="turnspeed"/> + <par float="4.0" name="returnspeed"/> + <par float="0.00005" name="suspensionsoftness"/> <par float="0.2" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="1.0" name="enginepower"/> Modified: trunk/ioData/vehicles/Van/world =================================================================== --- trunk/ioData/vehicles/Van/world 2007-10-02 17:00:12 UTC (rev 1158) +++ trunk/ioData/vehicles/Van/world 2007-10-08 08:56:57 UTC (rev 1159) @@ -7,6 +7,15 @@ </plugins> <shaders> <shader><file>/shader/stat_dyn_reflect.xml</file></shader> + <shader> + <file>/shader/parallaxAtt/parallaxAtt.xml</file> + </shader> + <shader> + <file>/shader/ambient.xml</file> + </shader> + <shader> + <file>/shader/std_lighting.xml</file> + </shader> </shaders> <textures> <texture name='blank-reflect-mask.png'> @@ -52,39 +61,55 @@ <shader type="standard">stat_dyn_reflect</shader> <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="bodyvanbody.jpg"> <texture>vanbody.jpg</texture> <shader type="standard">stat_dyn_reflect</shader> <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="detailsdetails1.jpg"> <texture>details1.jpg</texture> <shader type="standard">stat_dyn_reflect</shader> <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="windowswindows.jpg"> <texture>windows.jpg</texture> <shader type="standard">stat_dyn_reflect</shader> <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="15 - Defaultshocks.jpg"> <texture>shocks.jpg</texture> <shader type="standard">stat_dyn_reflect</shader> <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="6 - Defaultspeakers.jpg"> <texture>speakers.jpg</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="vanbody-t.jpg"> <texture>vanbody-t.jpg</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="vanwheels.jpg"> <texture>vanwheels.jpg</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> </material> </materials> <sounds/> Modified: trunk/ioData/vehicles/falcon/entities_world =================================================================== --- trunk/ioData/vehicles/falcon/entities_world 2007-10-02 17:00:12 UTC (rev 1158) +++ trunk/ioData/vehicles/falcon/entities_world 2007-10-08 08:56:57 UTC (rev 1159) @@ -45,8 +45,8 @@ <!--Front Left Wheel--> <action name="AddWheel"> <par vector="0.58,0.05,-0.9" name="position"/> - <par float="2.0" name="turnspeed"/> - <par float="2.0" name="returnspeed"/> + <par float="4.0" name="turnspeed"/> + <par float="4.0" name="returnspeed"/> <par float="0.00025" name="suspensionsoftness"/> <par float="0.125" name="suspensiondamping"/> <par float="0.7" name="brakepower"/> @@ -64,8 +64,8 @@ <!--Front Right Wheel--> <action name="AddWheel"> <par vector="-0.58,0.05,-0.9" name="position"/> - <par float="2.0" name="turnspeed"/> - <par float="2.0" name="returnspeed"/> + <par float="4.0" name="turnspeed"/> + <par float="4.0" name="returnspeed"/> <par float="0.00025" name="suspensionsoftness"/> <par float="0.125" name="suspensiondamping"/> <par float="0.7" name="brakepower"/> @@ -83,15 +83,15 @@ <!--Rear Left Wheel--> <action name="AddWheel"> <par vector="0.58,0.05,0.93" name="position"/> - <par float="2.0" name="turnspeed"/> - <par float="2.0" name="returnspeed"/> + <par float="4.0" name="turnspeed"/> + <par float="4.0" name="returnspeed"/> <par float="0.00025" name="suspensionsoftness"/> <par float="0.125" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="1.0" name="enginepower"/> <par float="0.0" name="leftsteersensitivity"/> <par float="0.0" name="rightsteersensitivity"/> - <par float="1.7" name="friction"/> + <par float="1.6" name="friction"/> <par float="0.0000085" name="slip"/> <par float="10.0" name="mass"/> <par bool="true" name="handbrakeaffected"/> @@ -102,15 +102,15 @@ <!--Rear Right Wheel--> <action name="AddWheel"> <par vector="-0.58,0.05,0.93" name="position"/> - <par float="2.0" name="turnspeed"/> - <par float="2.0" name="returnspeed"/> + <par float="4.0" name="turnspeed"/> + <par float="4.0" name="returnspeed"/> <par float="0.00025" name="suspensionsoftness"/> <par float="0.125" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="1.0" name="enginepower"/> <par float="0.0" name="leftsteersensitivity"/> <par float="0.0" name="rightsteersensitivity"/> - <par float="1.7" name="friction"/> + <par float="1.6" name="friction"/> <par float="0.0000085" name="slip"/> <par float="10.0" name="mass"/> <par bool="true" name="handbrakeaffected"/> Modified: trunk/ioData/vehicles/falcon/world =================================================================== --- trunk/ioData/vehicles/falcon/world 2007-10-02 17:00:12 UTC (rev 1158) +++ trunk/ioData/vehicles/falcon/world 2007-10-08 08:56:57 UTC (rev 1159) @@ -6,6 +6,17 @@ </plugins> <shaders> <shader><file>/shader/stat_dyn_reflect.xml</file></shader> + + <shader> + <file>/shader/parallaxAtt/parallaxAtt.xml</file> + </shader> + <shader> + <file>/shader/ambient.xml</file> + </shader> + <shader> + <file>/shader/std_lighting.xml</file> + </shader> + </shaders> <textures> <texture name='blank-reflect-mask-shiny.png'> @@ -36,6 +47,8 @@ <shader type="standard">stat_dyn_reflect</shader> <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> <shadervar name="tex mask" type="texture">blank-reflect-mask-shiny.png</shadervar> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="otherparts.png"> <texture>otherparts.png</texture> @@ -45,6 +58,8 @@ <shader type="standard">stat_dyn_reflect</shader> <shadervar name="tex reflection" type="texture">desert-reflect.jpg</shadervar> <shadervar name="tex mask" type="texture">blank-reflect-mask.png</shadervar> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> </material> </materials> <sounds/> Modified: trunk/ioData/vehicles/fedex/entities_world =================================================================== --- trunk/ioData/vehicles/fedex/entities_world 2007-10-02 17:00:12 UTC (rev 1158) +++ trunk/ioData/vehicles/fedex/entities_world 2007-10-08 08:56:57 UTC (rev 1159) @@ -45,8 +45,8 @@ <!--Front Left Wheel--> <action name="AddWheel"> <par vector="0.45, 0.05, -0.75" name="position"/> - <par float="2.0" name="turnspeed"/> - <par float="2.0" name="returnspeed"/> + <par float="4.0" name="turnspeed"/> + <par float="4.0" name="returnspeed"/> <par float="0.00015" name="suspensionsoftness"/> <par float="0.15" name="suspensiondamping"/> <par float="0.7" name="brakepower"/> @@ -64,8 +64,8 @@ <!--Front Right Wheel--> <action name="AddWheel"> <par vector="-0.45, 0.05, -0.75" name="position"/> - <par float="2.0" name="turnspeed"/> - <par float="2.0" name="returnspeed"/> + <par float="4.0" name="turnspeed"/> + <par float="4.0" name="returnspeed"/> <par float="0.00015" name="suspensionsoftness"/> <par float="0.15" name="suspensiondamping"/> <par float="0.7" name="brakepower"/> @@ -83,8 +83,8 @@ <!--Rear Left Wheel--> <action name="AddWheel"> <par vector="0.45, 0.0, 0.98" name="position"/> - <par float="2.0" name="turnspeed"/> - <par float="2.0" name="returnspeed"/> + <par float="4.0" name="turnspeed"/> + <par float="4.0" name="returnspeed"/> <par float="0.000225" name="suspensionsoftness"/> <par float="0.15" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> @@ -102,8 +102,8 @@ <!--Rear Right Wheel--> <action name="AddWheel"> <par vector="-0.45, 0.0, 0.98" name="position"/> - <par float="2.0" name="turnspeed"/> - <par float="2.0" name="returnspeed"/> + <par float="4.0" name="turnspeed"/> + <par float="4.0" name="returnspeed"/> <par float="0.000225" name="suspensionsoftness"/> <par float="0.15" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> Modified: trunk/ioData/vehicles/fedex/world =================================================================== --- trunk/ioData/vehicles/fedex/world 2007-10-02 17:00:12 UTC (rev 1158) +++ trunk/ioData/vehicles/fedex/world 2007-10-08 08:56:57 UTC (rev 1159) @@ -4,7 +4,17 @@ <plugin name="genmesh">crystalspace.mesh.loader.genmesh</plugin> <plugin name="genmeshfact">crystalspace.mesh.loader.factory.genmesh</plugin> </plugins> - <shaders/> + <shaders> + <shader> + <file>/shader/parallaxAtt/parallaxAtt.xml</file> + </shader> + <shader> + <file>/shader/ambient.xml</file> + </shader> + <shader> + <file>/shader/std_lighting.xml</file> + </shader> + </shaders> <textures> <texture name="fedexwheel.jpg"> <file>textures/fedexwheel.jpg</file> @@ -25,24 +35,38 @@ <materials> <material name="Color_F16fedexwheel.jpg"> <texture>fedexwheel.jpg</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="Translucent_Glass_Blufedexglass.jpg"> <texture>fedexglass.jpg</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="Color_006fedexbumpers.jpg"> <texture>fedexbumpers.jpg</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="Color_A01fedexbumpers.jpg"> <texture>fedexbumpers.jpg</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="Color_B02fedexbumpers.jpg"> <texture>fedexbumpers.jpg</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="fedexmirrors.jpg"> <texture>fedexmirrors.jpg</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> </material> <material name="fedexbody.jpg"> <texture>fedexbody.jpg</texture> + <shader type="ambient">ambient</shader> + <shader type="diffuse">light_spec_bumpmap</shader> </material> </materials> <sounds/> Modified: trunk/ioData/vehicles/strider/entities_world =================================================================== --- trunk/ioData/vehicles/strider/entities_world 2007-10-02 17:00:12 UTC (rev 1158) +++ trunk/ioData/vehicles/strider/entities_world 2007-10-08 08:56:57 UTC (rev 1159) @@ -38,19 +38,19 @@ <property name="brakeforce" float="1200.0"/> <property name="abs" bool="false"/> <property name="antisway" bool="true" /> - <property name="steeramount" float="0.7"/> + <property name="steeramount" float="1.0"/> <!--Front Left Wheel--> <action name="AddWheel"> - <par vector="0.45,0.1,-1.0" name="position"/> + <par vector="0.45,-0.05,-1.0" name="position"/> <par float="2.0" name="turnspeed"/> <par float="2.0" name="returnspeed"/> - <par float="0.0005" name="suspensionsoftness"/> - <par float="0.2" name="suspensiondamping"/> + <par float="0.00025" name="suspensionsoftness"/> + <par float="0.1" name="suspensiondamping"/> <par float="0.7" name="brakepower"/> - <par float="0.4" name="enginepower"/> + <par float="0.5" name="enginepower"/> <par float="1.0" name="leftsteersensitivity"/> <par float="0.8" name="rightsteersensitivity"/> - <par float="2.0" name="friction"/> + <par float="1.3" name="friction"/> <par float="0.0000345" name="slip"/> <par float="8.0" name="mass"/> <par bool="false" name="handbrakeaffected"/> @@ -60,16 +60,16 @@ </action> <!--Front Right Wheel--> <action name="AddWheel"> - <par vector="-0.45,0.1,-1.0" name="position"/> + <par vector="-0.45,-0.05,-1.0" name="position"/> <par float="2.0" name="turnspeed"/> <par float="2.0" name="returnspeed"/> - <par float="0.0005" name="suspensionsoftness"/> - <par float="0.2" name="suspensiondamping"/> + <par float="0.00025" name="suspensionsoftness"/> + <par float="0.1" name="suspensiondamping"/> <par float="0.7" name="brakepower"/> - <par float="0.4" name="enginepower"/> + <par float="0.5" name="enginepower"/> <par float="0.8" name="leftsteersensitivity"/> <par float="1.0" name="rightsteersensitivity"/> - <par float="2.0" name="friction"/> + <par float="1.3" name="friction"/> <par float="0.0000345" name="slip"/> <par float="8.0" name="mass"/> <par bool="false" name="handbrakeaffected"/> @@ -79,16 +79,16 @@ </action> <!--Rear Left Wheel--> <action name="AddWheel"> - <par vector="0.55,0.15,0.9" name="position"/> + <par vector="0.55,-0.05,0.9" name="position"/> <par float="2.0" name="turnspeed"/> <par float="2.0" name="returnspeed"/> - <par float="0.0005" name="suspensionsoftness"/> - <par float="0.2" name="suspensiondamping"/> + <par float="0.00025" name="suspensionsoftness"/> + <par float="0.1" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> - <par float="0.6" name="enginepower"/> + <par float="0.5" name="enginepower"/> <par float="0.0" name="leftsteersensitivity"/> <par float="0.0" name="rightsteersensitivity"/> - <par float="2.0" name="friction"/> + <par float="1.3" name="friction"/> <par float="0.0000145" name="slip"/> <par float="12.0" name="mass"/> <par bool="true" name="handbrakeaffected"/> @@ -98,16 +98,16 @@ </action> <!--Rear Right Wheel--> <action name="AddWheel"> - <par vector="-0.55,0.15,0.9" name="position"/> + <par vector="-0.55,-0.05,0.9" name="position"/> <par float="2.0" name="turnspeed"/> <par float="2.0" name="returnspeed"/> - <par float="0.0005" name="suspensionsoftness"/> - <par float="0.2" name="suspensiondamping"/> + <par float="0.00025" name="suspensionsoftness"/> + <par float="0.1" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> - <par float="0.6" name="enginepower"/> + <par float="0.5" name="enginepower"/> <par float="0.0" name="leftsteersensitivity"/> <par float="0.0" name="rightsteersensitivity"/> - <par float="2.0" name="friction"/> + <par float="1.3" name="friction"/> <par float="0.0000145" name="slip"/> <par float="12.0" name="mass"/> <par bool="true" name="handbrakeaffected"/> @@ -122,22 +122,22 @@ </action> <action name="SetGearSettings"> <par float="1" name="gear"/> - <par float="1200.0" name="force"/> + <par float="1500.0" name="force"/> <par float="40.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="2" name="gear"/> - <par float="600.0" name="force"/> - <par float="84.0" name="velocity"/> + <par float="750.0" name="force"/> + <par float="80.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="3" name="gear"/> - <par float="400.0" name="force"/> + <par float="500.0" name="force"/> <par float="120.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="4" name="gear"/> - <par float="200.0" name="force"/> + <par float="300.0" name="force"/> <par float="162.0" name="velocity"/> </action> <action name="SetGearSettings"> Modified: trunk/ioData/vehicles/strider/factories/genStriderBody =================================================================== --- trunk/ioData/vehicles/strider/factories/genStriderBody 2007-10-02 17:00:12 UTC (rev 1158) +++ trunk/ioData/vehicles/strider/factories/genStriderBody 2007-10-08 08:56:57 UTC (rev 1159) @@ -3,707 +3,707 @@ <plugin>genmeshfact</plugin> <zuse/> <params> -<material>str01.png</material> +<material>mat1STRIDE~3.BMP.001</material> <manualcolors/> -<v x="-0.398606" y="0.183171" z="0.97203" u="0.963217" v="-0.241795" nx="3.14555e-07" ny="-1" nz="9.99167e-06" red="1" green="1" blue="1"/> -<v x="0.406728" y="0.183171" z="0.972029" u="0.858858" v="-0.241795" nx="3.14555e-07" ny="-1" nz="9.99167e-06" red="1" green="1" blue="1"/> -<v x="-0.398606" y="0.183167" z="0.569363" u="0.963217" v="-0.344410" nx="3.14555e-07" ny="-1" nz="9.99167e-06" red="1" green="1" blue="1"/> +<v x="-0.398606" y="0.0381779" z="0.97203" u="0.963217" v="-0.241795" nx="3.14555e-07" ny="-1" nz="9.99167e-06" red="1" green="1" blue="1"/> +<v x="0.406728" y="0.0381782" z="0.972029" u="0.858858" v="-0.241795" nx="3.14555e-07" ny="-1" nz="9.99167e-06" red="1" green="1" blue="1"/> +<v x="-0.398606" y="0.0381739" z="0.569363" u="0.963217" v="-0.344410" nx="3.14555e-07" ny="-1" nz="9.99167e-06" red="1" green="1" blue="1"/> <t v1="2" v2="1" v3="0"/> -<v x="-0.633495" y="0.183167" z="0.569363" u="0.993656" v="-0.344410" nx="3.40873e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> -<v x="-0.398606" y="0.183167" z="0.569363" u="0.963217" v="-0.344410" nx="3.40873e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> -<v x="-0.516058" y="0.149608" z="0.233807" u="0.978437" v="-0.429922" nx="3.40873e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> +<v x="-0.633495" y="0.0381738" z="0.569363" u="0.993656" v="-0.344410" nx="3.40873e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> +<v x="-0.398606" y="0.0381739" z="0.569363" u="0.963217" v="-0.344410" nx="3.40873e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> +<v x="-0.516058" y="0.00461495" z="0.233807" u="0.978437" v="-0.429922" nx="3.40873e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> <t v1="5" v2="4" v3="3"/> -<v x="-0.516058" y="0.149604" z="-0.168859" u="0.423550" v="-0.753524" nx="0.799959" ny="-0.600055" nz="5.92154e-06" red="1" green="1" blue="1"/> -<v x="-0.516058" y="0.149608" z="0.233807" u="0.295142" v="-0.753524" nx="0.799959" ny="-0.600055" nz="5.92154e-06" red="1" green="1" blue="1"/> -<v x="-0.465717" y="0.216715" z="-0.16886" u="0.423550" v="-0.778384" nx="0.799959" ny="-0.600055" nz="5.92154e-06" red="1" green="1" blue="1"/> +<v x="-0.516058" y="0.0046109" z="-0.168859" u="0.423550" v="-0.753524" nx="0.799959" ny="-0.600055" nz="5.92154e-06" red="1" green="1" blue="1"/> +<v x="-0.516058" y="0.00461495" z="0.233807" u="0.295142" v="-0.753524" nx="0.799959" ny="-0.600055" nz="5.92154e-06" red="1" green="1" blue="1"/> +<v x="-0.465717" y="0.071722" z="-0.16886" u="0.423550" v="-0.778384" nx="0.799959" ny="-0.600055" nz="5.92154e-06" red="1" green="1" blue="1"/> <t v1="8" v2="7" v3="6"/> -<v x="-0.230828" y="0.183149" z="-1.24264" u="0.941476" v="-0.806175" nx="3.07135e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> -<v x="-0.465717" y="0.216715" z="-0.16886" u="0.971914" v="-0.532536" nx="3.07135e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> -<v x="0.473839" y="0.216715" z="-0.16886" u="0.850161" v="-0.532536" nx="3.07135e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> +<v x="-0.230828" y="0.0381558" z="-1.24264" u="0.941476" v="-0.806175" nx="3.07135e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> +<v x="-0.465717" y="0.071722" z="-0.16886" u="0.971914" v="-0.532536" nx="3.07135e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.0717223" z="-0.16886" u="0.850161" v="-0.532536" nx="3.07135e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> <t v1="11" v2="10" v3="9"/> -<v x="0.23895" y="0.183149" z="-1.24264" u="0.880600" v="-0.806175" nx="2.93265e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> -<v x="-0.230828" y="0.183149" z="-1.24264" u="0.941476" v="-0.806175" nx="2.93265e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> -<v x="0.473839" y="0.216715" z="-0.16886" u="0.850161" v="-0.532536" nx="2.93265e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> +<v x="0.23895" y="0.0381559" z="-1.24264" u="0.880600" v="-0.806175" nx="2.93265e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> +<v x="-0.230828" y="0.0381558" z="-1.24264" u="0.941476" v="-0.806175" nx="2.93265e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.0717223" z="-0.16886" u="0.850161" v="-0.532536" nx="2.93265e-07" ny="-0.999512" nz="0.0312448" red="1" green="1" blue="1"/> <t v1="14" v2="13" v3="12"/> -<v x="0.525701" y="0.149604" z="-0.16886" u="0.440550" v="-0.286242" nx="-0.791263" ny="-0.611476" nz="6.22679e-06" red="1" green="1" blue="1"/> -<v x="0.473839" y="0.216715" z="-0.16886" u="0.440550" v="-0.256643" nx="-0.791263" ny="-0.611476" nz="6.22679e-06" red="1" green="1" blue="1"/> -<v x="0.525701" y="0.149608" z="0.233807" u="0.306174" v="-0.286242" nx="-0.791263" ny="-0.611476" nz="6.22679e-06" red="1" green="1" blue="1"/> +<v x="0.525701" y="0.00461122" z="-0.16886" u="0.440550" v="-0.286242" nx="-0.791263" ny="-0.611476" nz="6.22679e-06" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.0717223" z="-0.16886" u="0.440550" v="-0.256643" nx="-0.791263" ny="-0.611476" nz="6.22679e-06" red="1" green="1" blue="1"/> +<v x="0.525701" y="0.00461525" z="0.233807" u="0.306174" v="-0.286242" nx="-0.791263" ny="-0.611476" nz="6.22679e-06" red="1" green="1" blue="1"/> <t v1="17" v2="16" v3="15"/> -<v x="0.641617" y="0.183167" z="0.569363" u="0.828420" v="-0.344410" nx="3.15621e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> -<v x="0.525701" y="0.149608" z="0.233807" u="0.843441" v="-0.429922" nx="3.15621e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> -<v x="0.406728" y="0.183167" z="0.569363" u="0.858858" v="-0.344410" nx="3.15621e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> +<v x="0.641617" y="0.0381742" z="0.569363" u="0.828420" v="-0.344410" nx="3.15621e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> +<v x="0.525701" y="0.00461525" z="0.233807" u="0.843441" v="-0.429922" nx="3.15621e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> +<v x="0.406728" y="0.0381741" z="0.569363" u="0.858858" v="-0.344410" nx="3.15621e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> <t v1="20" v2="19" v3="18"/> -<v x="0.406728" y="0.183171" z="0.972029" u="0.858858" v="-0.241795" nx="2.96051e-07" ny="-1" nz="1.00287e-05" red="1" green="1" blue="1"/> -<v x="0.406728" y="0.183167" z="0.569363" u="0.858858" v="-0.344410" nx="2.96051e-07" ny="-1" nz="1.00287e-05" red="1" green="1" blue="1"/> -<v x="-0.398606" y="0.183167" z="0.569363" u="0.963217" v="-0.344410" nx="2.96051e-07" ny="-1" nz="1.00287e-05" red="1" green="1" blue="1"/> +<v x="0.406728" y="0.0381782" z="0.972029" u="0.858858" v="-0.241795" nx="2.96051e-07" ny="-1" nz="1.00287e-05" red="1" green="1" blue="1"/> +<v x="0.406728" y="0.0381741" z="0.569363" u="0.858858" v="-0.344410" nx="2.96051e-07" ny="-1" nz="1.00287e-05" red="1" green="1" blue="1"/> +<v x="-0.398606" y="0.0381739" z="0.569363" u="0.963217" v="-0.344410" nx="2.96051e-07" ny="-1" nz="1.00287e-05" red="1" green="1" blue="1"/> <t v1="23" v2="22" v3="21"/> -<v x="-0.516058" y="0.149608" z="0.233807" u="0.978437" v="-0.429922" nx="3.0931e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> -<v x="-0.398606" y="0.183167" z="0.569363" u="0.963217" v="-0.344410" nx="3.0931e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> -<v x="0.406728" y="0.183167" z="0.569363" u="0.858858" v="-0.344410" nx="3.0931e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> +<v x="-0.516058" y="0.00461495" z="0.233807" u="0.978437" v="-0.429922" nx="3.0931e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> +<v x="-0.398606" y="0.0381739" z="0.569363" u="0.963217" v="-0.344410" nx="3.0931e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> +<v x="0.406728" y="0.0381741" z="0.569363" u="0.858858" v="-0.344410" nx="3.0931e-07" ny="-0.995036" nz="0.0995136" red="1" green="1" blue="1"/> <t v1="26" v2="25" v3="24"/> -<v x="-0.465717" y="0.216715" z="-0.16886" u="0.971914" v="-0.532536" nx="2.6595e-07" ny="-0.986396" nz="-0.164389" red="1" green="1" blue="1"/> -<v x="-0.516058" y="0.149608" z="0.233807" u="0.978437" v="-0.429922" nx="2.6595e-07" ny="-0.986396" nz="-0.164389" red="1" green="1" blue="1"/> -<v x="0.473839" y="0.216715" z="-0.16886" u="0.850161" v="-0.532536" nx="2.6595e-07" ny="-0.986396" nz="-0.164389" red="1" green="1" blue="1"/> +<v x="-0.465717" y="0.071722" z="-0.16886" u="0.971914" v="-0.532536" nx="2.6595e-07" ny="-0.986396" nz="-0.164389" red="1" green="1" blue="1"/> +<v x="-0.516058" y="0.00461495" z="0.233807" u="0.978437" v="-0.429922" nx="2.6595e-07" ny="-0.986396" nz="-0.164389" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.0717223" z="-0.16886" u="0.850161" v="-0.532536" nx="2.6595e-07" ny="-0.986396" nz="-0.164389" red="1" green="1" blue="1"/> <t v1="29" v2="28" v3="27"/> -<v x="0.525701" y="0.149608" z="0.233807" u="0.843441" v="-0.429922" nx="-0.481377" ny="-0.872536" nz="-0.0834134" red="1" green="1" blue="1"/> -<v x="0.473839" y="0.216715" z="-0.16886" u="0.850161" v="-0.532536" nx="-0.481377" ny="-0.872536" nz="-0.0834134" red="1" green="1" blue="1"/> -<v x="0.406728" y="0.183167" z="0.569363" u="0.858858" v="-0.344410" nx="-0.481377" ny="-0.872536" nz="-0.0834134" red="1" green="1" blue="1"/> +<v x="0.525701" y="0.00461525" z="0.233807" u="0.843441" v="-0.429922" nx="-0.481377" ny="-0.872536" nz="-0.0834134" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.0717223" z="-0.16886" u="0.850161" v="-0.532536" nx="-0.481377" ny="-0.872536" nz="-0.0834134" red="1" green="1" blue="1"/> +<v x="0.406728" y="0.0381741" z="0.569363" u="0.858858" v="-0.344410" nx="-0.481377" ny="-0.872536" nz="-0.0834134" red="1" green="1" blue="1"/> <t v1="32" v2="31" v3="30"/> -<v x="0.406728" y="0.183167" z="0.569363" u="0.858858" v="-0.344410" nx="0.0510905" ny="-0.997864" nz="-0.0407029" red="1" green="1" blue="1"/> -<v x="0.473839" y="0.216715" z="-0.16886" u="0.850161" v="-0.532536" nx="0.0510905" ny="-0.997864" nz="-0.0407029" red="1" green="1" blue="1"/> -<v x="-0.516058" y="0.149608" z="0.233807" u="0.978437" v="-0.429922" nx="0.0510905" ny="-0.997864" nz="-0.0407029" red="1" green="1" blue="1"/> +<v x="0.406728" y="0.0381741" z="0.569363" u="0.858858" v="-0.344410" nx="0.0510905" ny="-0.997864" nz="-0.0407029" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.0717223" z="-0.16886" u="0.850161" v="-0.532536" nx="0.0510905" ny="-0.997864" nz="-0.0407029" red="1" green="1" blue="1"/> +<v x="-0.516058" y="0.00461495" z="0.233807" u="0.978437" v="-0.429922" nx="0.0510905" ny="-0.997864" nz="-0.0407029" red="1" green="1" blue="1"/> <t v1="35" v2="34" v3="33"/> -<v x="0.0384768" y="0.433265" z="1.42681" u="0.887551" v="-0.176219" nx="0.673041" ny="-0.705576" nz="0.22176" red="1" green="1" blue="1"/> -<v x="0.00406083" y="0.253907" z="0.960596" u="0.890995" v="-0.222178" nx="0.673041" ny="-0.705576" nz="0.22176" red="1" green="1" blue="1"/> -<v x="0.00406085" y="0.403387" z="1.4362" u="0.890995" v="-0.175293" nx="0.673041" ny="-0.705576" nz="0.22176" red="1" green="1" blue="1"/> +<v x="0.0384768" y="0.288272" z="1.42681" u="0.887551" v="-0.176219" nx="0.673041" ny="-0.705577" nz="0.22176" red="1" green="1" blue="1"/> +<v x="0.00406083" y="0.108914" z="0.960596" u="0.890995" v="-0.222178" nx="0.673041" ny="-0.705577" nz="0.22176" red="1" green="1" blue="1"/> +<v x="0.00406085" y="0.258394" z="1.4362" u="0.890995" v="-0.175293" nx="0.673041" ny="-0.705577" nz="0.22176" red="1" green="1" blue="1"/> <t v1="38" v2="37" v3="36"/> -<v x="0.0384768" y="0.433265" z="1.42681" u="0.949435" v="-0.222444" nx="-0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> -<v x="-0.0303551" y="0.433265" z="1.42681" u="0.935799" v="-0.222444" nx="-0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> -<v x="-0.0131472" y="0.463142" z="1.41742" u="0.939208" v="-0.228632" nx="-0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> +<v x="0.0384768" y="0.288272" z="1.42681" u="0.949435" v="-0.222444" nx="-0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> +<v x="-0.0303551" y="0.288272" z="1.42681" u="0.935799" v="-0.222444" nx="-0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> +<v x="-0.0131472" y="0.318149" z="1.41742" u="0.939208" v="-0.228632" nx="-0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> <t v1="41" v2="40" v3="39"/> -<v x="0.0384768" y="0.433265" z="1.42681" u="0.949435" v="-0.222444" nx="0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> -<v x="-0.0131472" y="0.463142" z="1.41742" u="0.939208" v="-0.228632" nx="0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> -<v x="0.0212688" y="0.463142" z="1.41742" u="0.946026" v="-0.228632" nx="0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> +<v x="0.0384768" y="0.288272" z="1.42681" u="0.949435" v="-0.222444" nx="0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> +<v x="-0.0131472" y="0.318149" z="1.41742" u="0.939208" v="-0.228632" nx="0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> +<v x="0.0212688" y="0.318149" z="1.41742" u="0.946026" v="-0.228632" nx="0" ny="0.299834" nz="0.953991" red="1" green="1" blue="1"/> <t v1="44" v2="43" v3="42"/> -<v x="-0.0303551" y="0.433265" z="1.42681" u="0.935799" v="-0.222444" nx="0" ny="0.299841" nz="0.953989" red="1" green="1" blue="1"/> -<v x="0.0384768" y="0.433265" z="1.42681" u="0.949435" v="-0.222444" nx="0" ny="0.299841" nz="0.953989" red="1" green="1" blue="1"/> -<v x="0.00406085" y="0.403387" z="1.4362" u="0.942617" v="-0.216256" nx="0" ny="0.299841" nz="0.953989" red="1" green="1" blue="1"/> +<v x="-0.0303551" y="0.288272" z="1.42681" u="0.935799" v="-0.222444" nx="0" ny="0.299841" nz="0.953989" red="1" green="1" blue="1"/> +<v x="0.0384768" y="0.288272" z="1.42681" u="0.949435" v="-0.222444" nx="0" ny="0.299841" nz="0.953989" red="1" green="1" blue="1"/> +<v x="0.00406085" y="0.258394" z="1.4362" u="0.942617" v="-0.216256" nx="0" ny="0.299841" nz="0.953989" red="1" green="1" blue="1"/> <t v1="47" v2="46" v3="45"/> -<v x="-0.0131472" y="0.463142" z="1.41742" u="0.905320" v="-0.221221" nx="0" ny="0.909171" nz="-0.416423" red="1" green="1" blue="1"/> -<v x="0.00406083" y="0.253907" z="0.960596" u="0.903654" v="-0.178643" nx="0" ny="0.909171" nz="-0.416423" red="1" green="1" blue="1"/> -<v x="0.0212688" y="0.463142" z="1.41742" u="0.901988" v="-0.221221" nx="0" ny="0.909171" nz="-0.416423" red="1" green="1" blue="1"/> +<v x="-0.0131472" y="0.318149" z="1.41742" u="0.905320" v="-0.221221" nx="0" ny="0.909171" nz="-0.416423" red="1" green="1" blue="1"/> +<v x="0.00406083" y="0.108914" z="0.960596" u="0.903654" v="-0.178643" nx="0" ny="0.909171" nz="-0.416423" red="1" green="1" blue="1"/> +<v x="0.0212688" y="0.318149" z="1.41742" u="0.901988" v="-0.221221" nx="0" ny="0.909171" nz="-0.416423" red="1" green="1" blue="1"/> <t v1="50" v2="49" v3="48"/> -<v x="0.0212688" y="0.463142" z="1.41742" u="0.927756" v="-0.206972" nx="0.872832" ny="0.430414" nz="-0.230019" red="1" green="1" blue="1"/> -<v x="0.00406083" y="0.253907" z="0.960596" u="0.973464" v="-0.186346" nx="0.872832" ny="0.430414" nz="-0.230019" red="1" green="1" blue="1"/> -<v x="0.0384768" y="0.433265" z="1.42681" u="0.926816" v="-0.204027" nx="0.872832" ny="0.430414" nz="-0.230019" red="1" green="1" blue="1"/> +<v x="0.0212688" y="0.318149" z="1.41742" u="0.927756" v="-0.206972" nx="0.872832" ny="0.430414" nz="-0.230019" red="1" green="1" blue="1"/> +<v x="0.00406083" y="0.108914" z="0.960596" u="0.973464" v="-0.186346" nx="0.872832" ny="0.430414" nz="-0.230019" red="1" green="1" blue="1"/> +<v x="0.0384768" y="0.288272" z="1.42681" u="0.926816" v="-0.204027" nx="0.872832" ny="0.430414" nz="-0.230019" red="1" green="1" blue="1"/> <t v1="53" v2="52" v3="51"/> -<v x="0.00406085" y="0.403387" z="1.4362" u="0.890995" v="-0.175293" nx="-0.673041" ny="-0.705576" nz="0.22176" red="1" green="1" blue="1"/> -<v x="0.00406083" y="0.253907" z="0.960596" u="0.890995" v="-0.222178" nx="-0.673041" ny="-0.705576" nz="0.22176" red="1" green="1" blue="1"/> -<v x="-0.0303551" y="0.433265" z="1.42681" u="0.894438" v="-0.176219" nx="-0.673041" ny="-0.705576" nz="0.22176" red="1" green="1" blue="1"/> +<v x="0.00406085" y="0.258394" z="1.4362" u="0.890995" v="-0.175293" nx="-0.673041" ny="-0.705577" nz="0.22176" red="1" green="1" blue="1"/> +<v x="0.00406083" y="0.108914" z="0.960596" u="0.890995" v="-0.222178" nx="-0.673041" ny="-0.705577" nz="0.22176" red="1" green="1" blue="1"/> +<v x="-0.0303551" y="0.288272" z="1.42681" u="0.894438" v="-0.176219" nx="-0.673041" ny="-0.705577" nz="0.22176" red="1" green="1" blue="1"/> <t v1="56" v2="55" v3="54"/> -<v x="-0.0303551" y="0.433265" z="1.42681" u="0.913939" v="-0.236363" nx="-0.872832" ny="0.430413" nz="-0.230018" red="1" green="1" blue="1"/> -<v x="0.00406083" y="0.253907" z="0.960596" u="0.867291" v="-0.218682" nx="-0.872832" ny="0.430413" nz="-0.230018" red="1" green="1" blue="1"/> -<v x="-0.0131472" y="0.463142" z="1.41742" u="0.913000" v="-0.239308" nx="-0.872832" ny="0.430413" nz="-0.230018" red="1" green="1" blue="1"/> +<v x="-0.0303551" y="0.288272" z="1.42681" u="0.913939" v="-0.236363" nx="-0.872832" ny="0.430413" nz="-0.230018" red="1" green="1" blue="1"/> +<v x="0.00406083" y="0.108914" z="0.960596" u="0.867291" v="-0.218682" nx="-0.872832" ny="0.430413" nz="-0.230018" red="1" green="1" blue="1"/> +<v x="-0.0131472" y="0.318149" z="1.41742" u="0.913000" v="-0.239308" nx="-0.872832" ny="0.430413" nz="-0.230018" red="1" green="1" blue="1"/> <t v1="59" v2="58" v3="57"/> -<v x="0.525701" y="0.149604" z="-0.16886" u="0.423550" v="-0.753524" nx="0.853728" ny="0.465771" nz="0.232819" red="1" green="1" blue="1"/> -<v x="0.507394" y="0.18316" z="-0.16886" u="0.423550" v="-0.765954" nx="0.853728" ny="0.465771" nz="0.232819" red="1" green="1" blue="1"/> -<v x="0.608061" y="0.149601" z="-0.47086" u="0.519856" v="-0.753524" nx="0.853728" ny="0.465771" nz="0.232819" red="1" green="1" blue="1"/> +<v x="0.525701" y="0.00461122" z="-0.16886" u="0.423550" v="-0.753524" nx="0.853728" ny="0.465771" nz="0.232819" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.0381668" z="-0.16886" u="0.423550" v="-0.765954" nx="0.853728" ny="0.465771" nz="0.232819" red="1" green="1" blue="1"/> +<v x="0.608061" y="0.00460821" z="-0.47086" u="0.519856" v="-0.753524" nx="0.853728" ny="0.465771" nz="0.232819" red="1" green="1" blue="1"/> <t v1="62" v2="61" v3="60"/> -<v x="0.54095" y="0.250266" z="-0.638639" u="0.603567" v="-0.316452" nx="0.688211" ny="0.70972" nz="0.150539" red="1" green="1" blue="1"/> -<v x="0.608061" y="0.149601" z="-0.47086" u="0.546431" v="-0.290508" nx="0.688211" ny="0.70972" nz="0.150539" red="1" green="1" blue="1"/> -<v x="0.507394" y="0.18316" z="-0.16886" u="0.443587" v="-0.329425" nx="0.688211" ny="0.70972" nz="0.150539" red="1" green="1" blue="1"/> +<v x="0.54095" y="0.105273" z="-0.638639" u="0.603567" v="-0.316452" nx="0.688211" ny="0.70972" nz="0.150539" red="1" green="1" blue="1"/> +<v x="0.608061" y="0.00460821" z="-0.47086" u="0.546431" v="-0.290508" nx="0.688211" ny="0.70972" nz="0.150539" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.0381668" z="-0.16886" u="0.443587" v="-0.329425" nx="0.688211" ny="0.70972" nz="0.150539" red="1" green="1" blue="1"/> <t v1="65" v2="64" v3="63"/> -<v x="0.507394" y="0.350931" z="-0.806418" u="0.626863" v="-0.828105" nx="0.820763" ny="0.547178" nz="0.164147" red="1" green="1" blue="1"/> -<v x="0.54095" y="0.250266" z="-0.638639" u="0.573360" v="-0.790815" nx="0.820763" ny="0.547178" nz="0.164147" red="1" green="1" blue="1"/> -<v x="0.440283" y="0.451598" z="-0.806419" u="0.626863" v="-0.865396" nx="0.820763" ny="0.547178" nz="0.164147" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.205938" z="-0.806418" u="0.626863" v="-0.828105" nx="0.820763" ny="0.547178" nz="0.164147" red="1" green="1" blue="1"/> +<v x="0.54095" y="0.105273" z="-0.638639" u="0.573360" v="-0.790815" nx="0.820763" ny="0.547178" nz="0.164147" red="1" green="1" blue="1"/> +<v x="0.440283" y="0.306605" z="-0.806419" u="0.626863" v="-0.865396" nx="0.820763" ny="0.547178" nz="0.164147" red="1" green="1" blue="1"/> <t v1="68" v2="67" v3="66"/> -<v x="0.440283" y="0.451598" z="-0.806419" u="0.626863" v="-0.865396" nx="0.836332" ny="0.531185" nz="0.135616" red="1" green="1" blue="1"/> -<v x="0.54095" y="0.250266" z="-0.638639" u="0.573360" v="-0.790815" nx="0.836332" ny="0.531185" nz="0.135616" red="1" green="1" blue="1"/> -<v x="0.507394" y="0.18316" z="-0.16886" u="0.423550" v="-0.765954" nx="0.836332" ny="0.531185" nz="0.135616" red="1" green="1" blue="1"/> +<v x="0.440283" y="0.306605" z="-0.806419" u="0.626863" v="-0.865396" nx="0.836332" ny="0.531185" nz="0.135616" red="1" green="1" blue="1"/> +<v x="0.54095" y="0.105273" z="-0.638639" u="0.573360" v="-0.790815" nx="0.836332" ny="0.531185" nz="0.135616" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.0381668" z="-0.16886" u="0.423550" v="-0.765954" nx="0.836332" ny="0.531185" nz="0.135616" red="1" green="1" blue="1"/> <t v1="71" v2="70" v3="69"/> -<v x="0.507394" y="0.18316" z="-0.16886" u="0.423550" v="-0.765954" nx="0.690111" ny="0.690113" nz="0.217923" red="1" green="1" blue="1"/> -<v x="0.473839" y="0.216715" z="-0.16886" u="0.423550" v="-0.778384" nx="0.690111" ny="0.690113" nz="0.217923" red="1" green="1" blue="1"/> -<v x="0.440283" y="0.451598" z="-0.806419" u="0.626863" v="-0.865396" nx="0.690111" ny="0.690113" nz="0.217923" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.0381668" z="-0.16886" u="0.423550" v="-0.765954" nx="0.690111" ny="0.690113" nz="0.217923" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.0717223" z="-0.16886" u="0.423550" v="-0.778384" nx="0.690111" ny="0.690113" nz="0.217923" red="1" green="1" blue="1"/> +<v x="0.440283" y="0.306605" z="-0.806419" u="0.626863" v="-0.865396" nx="0.690111" ny="0.690113" nz="0.217923" red="1" green="1" blue="1"/> <t v1="74" v2="73" v3="72"/> -<v x="0.440283" y="0.451598" z="-0.806419" u="0.660703" v="-0.355369" nx="-4.16695e-07" ny="0.938347" nz="0.345696" red="1" green="1" blue="1"/> -<v x="0.473839" y="0.216715" z="-0.16886" u="0.443587" v="-0.342397" nx="-4.16695e-07" ny="0.938347" nz="0.345696" red="1" green="1" blue="1"/> -<v x="0.373172" y="0.451598" z="-0.806419" u="0.660703" v="-0.381313" nx="-4.16695e-07" ny="0.938347" nz="0.345696" red="1" green="1" blue="1"/> +<v x="0.440283" y="0.306605" z="-0.806419" u="0.660703" v="-0.355369" nx="-8.33391e-07" ny="0.938347" nz="0.345696" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.0717223" z="-0.16886" u="0.443587" v="-0.342397" nx="-8.33391e-07" ny="0.938347" nz="0.345696" red="1" green="1" blue="1"/> +<v x="0.373172" y="0.306605" z="-0.806419" u="0.660703" v="-0.381313" nx="-8.33391e-07" ny="0.938347" nz="0.345696" red="1" green="1" blue="1"/> <t v1="77" v2="76" v3="75"/> -<v x="0.525701" y="0.149604" z="-0.16886" u="0.423550" v="-0.753524" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> -<v x="0.525701" y="0.149608" z="0.233807" u="0.295142" v="-0.753524" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> -<v x="0.507394" y="0.18316" z="-0.16886" u="0.423550" v="-0.765954" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> +<v x="0.525701" y="0.00461122" z="-0.16886" u="0.423550" v="-0.753524" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> +<v x="0.525701" y="0.00461525" z="0.233807" u="0.295142" v="-0.753524" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.0381668" z="-0.16886" u="0.423550" v="-0.765954" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> <t v1="80" v2="79" v3="78"/> -<v x="0.507394" y="0.18316" z="-0.16886" u="0.423550" v="-0.765954" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> -<v x="0.525701" y="0.149608" z="0.233807" u="0.295142" v="-0.753524" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> -<v x="0.507394" y="0.183164" z="0.233807" u="0.295142" v="-0.765954" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.0381668" z="-0.16886" u="0.423550" v="-0.765954" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> +<v x="0.525701" y="0.00461525" z="0.233807" u="0.295142" v="-0.753524" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.0381708" z="0.233807" u="0.295142" v="-0.765954" nx="0.877853" ny="0.478931" nz="-4.91526e-06" red="1" green="1" blue="1"/> <t v1="83" v2="82" v3="81"/> -<v x="0.507394" y="0.18316" z="-0.16886" u="0.423550" v="-0.765954" nx="0.707107" ny="0.707106" nz="-7.16984e-06" red="1" green="1" blue="1"/> -<v x="0.507394" y="0.183164" z="0.233807" u="0.295142" v="-0.765954" nx="0.707107" ny="0.707106" nz="-7.16984e-06" red="1" green="1" blue="1"/> -<v x="0.473839" y="0.216715" z="-0.16886" u="0.423550" v="-0.778384" nx="0.707107" ny="0.707106" nz="-7.16984e-06" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.0381668" z="-0.16886" u="0.423550" v="-0.765954" nx="0.707107" ny="0.707106" nz="-7.16984e-06" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.0381708" z="0.233807" u="0.295142" v="-0.765954" nx="0.707107" ny="0.707106" nz="-7.16984e-06" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.0717223" z="-0.16886" u="0.423550" v="-0.778384" nx="0.707107" ny="0.707106" nz="-7.16984e-06" red="1" green="1" blue="1"/> <t v1="86" v2="85" v3="84"/> -<v x="0.473839" y="0.216715" z="-0.16886" u="0.423550" v="-0.778384" nx="0.707107" ny="0.707106" nz="-7.19601e-06" red="1" green="1" blue="1"/> -<v x="0.507394" y="0.183164" z="0.233807" u="0.295142" v="-0.765954" nx="0.707107" ny="0.707106" nz="-7.19601e-06" red="1" green="1" blue="1"/> -<v x="0.473839" y="0.216719" z="0.233807" u="0.295142" v="-0.778384" nx="0.707107" ny="0.707106" nz="-7.19601e-06" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.0717223" z="-0.16886" u="0.423550" v="-0.778384" nx="0.707107" ny="0.707106" nz="-7.19601e-06" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.0381708" z="0.233807" u="0.295142" v="-0.765954" nx="0.707107" ny="0.707106" nz="-7.19601e-06" red="1" green="1" blue="1"/> +<v x="0.473839" y="0.0717264" z="0.233807" u="0.295142" v="-0.778384" nx="0.707107" ny="0.707106" nz="-7.19601e-06" red="1" green="1" blue="1"/> <t v1="89" v2="88" v3="87"/> -<v x="-0.59994" y="0.418055" z="0.535805" u="0.205391" v="-0.167845" nx="-1" ny="-5.92099e-07" nz="6.04752e-12" red="1" green="1" blue="1"/> -<v x="-0.59994" y="0.418057" z="0.670027" u="0.160599" v="-0.167845" nx="-1" ny="-5.92099e-07" nz="6.04752e-12" red="1" green="1" blue="1"/> -<v x="-0.59994" y="0.317389" z="0.535806" u="0.205391" v="-0.212244" nx="-1" ny="-5.92099e-07" nz="6.04752e-12" red="1" green="1" blue="1"/> +<v x="-0.59994" y="0.273063" z="0.535805" u="0.205391" v="-0.167845" nx="-1" ny="-5.92099e-07" nz="6.04752e-12" red="1" green="1" blue="1"/> +<v x="-0.59994" y="0.273064" z="0.670027" u="0.160599" v="-0.167845" nx="-1" ny="-5.92099e-07" nz="6.04752e-12" red="1" green="1" blue="1"/> +<v x="-0.59994" y="0.172396" z="0.535806" u="0.205391" v="-0.212244" nx="-1" ny="-5.92099e-07" nz="6.04752e-12" red="1" green="1" blue="1"/> <t v1="92" v2="91" v3="90"/> -<v x="0.608061" y="0.418061" z="1.07269" u="0.027624" v="-0.852966" nx="0.639603" ny="0.426407" nz="0.639597" red="1" green="1" blue="1"/> -<v x="0.54095" y="0.418062" z="1.13981" u="0.006223" v="-0.852966" nx="0.639603" ny="0.426407" nz="0.639597" red="1" green="1" blue="1"/> -<v x="0.574506" y="0.518727" z="1.03914" u="0.038325" v="-0.890257" nx="0.639603" ny="0.426407" nz="0.639597" red="1" green="1" blue="1"/> +<v x="0.608061" y="0.273068" z="1.07269" u="0.027624" v="-0.852966" nx="0.639603" ny="0.426407" nz="0.639597" red="1" green="1" blue="1"/> +<v x="0.54095" y="0.273069" z="1.13981" u="0.006223" v="-0.852966" nx="0.639603" ny="0.426407" nz="0.639597" red="1" green="1" blue="1"/> +<v x="0.574506" y="0.373735" z="1.03914" u="0.038325" v="-0.890257" nx="0.639603" ny="0.426407" nz="0.639597" red="1" green="1" blue="1"/> <t v1="95" v2="94" v3="93"/> -<v x="0.574506" y="0.518727" z="1.03914" u="0.038325" v="-0.890257" nx="0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> -<v x="0.54095" y="0.418062" z="1.13981" u="0.006223" v="-0.852966" nx="0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> -<v x="0.507394" y="0.518728" z="1.10625" u="0.016923" v="-0.890257" nx="0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> +<v x="0.574506" y="0.373735" z="1.03914" u="0.038325" v="-0.890257" nx="0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> +<v x="0.54095" y="0.273069" z="1.13981" u="0.006223" v="-0.852966" nx="0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> +<v x="0.507394" y="0.373735" z="1.10625" u="0.016923" v="-0.890257" nx="0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> <t v1="98" v2="97" v3="96"/> -<v x="-0.59994" y="0.418061" z="1.07269" u="0.026222" v="-0.167845" nx="-0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> -<v x="-0.566384" y="0.518727" z="1.03914" u="0.037420" v="-0.123446" nx="-0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> -<v x="-0.532828" y="0.418061" z="1.13981" u="0.003826" v="-0.167844" nx="-0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> +<v x="-0.59994" y="0.273068" z="1.07269" u="0.026222" v="-0.167845" nx="-0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> +<v x="-0.566384" y="0.373734" z="1.03914" u="0.037420" v="-0.123446" nx="-0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> +<v x="-0.532828" y="0.273069" z="1.13981" u="0.003826" v="-0.167844" nx="-0.639601" ny="0.426409" nz="0.639598" red="1" green="1" blue="1"/> <t v1="101" v2="100" v3="99"/> -<v x="-0.532828" y="0.4180... [truncated message content] |
From: <cf...@us...> - 2007-10-02 17:00:11
|
Revision: 1158 http://automanic.svn.sourceforge.net/automanic/?rev=1158&view=rev Author: cfraz89 Date: 2007-10-02 10:00:12 -0700 (Tue, 02 Oct 2007) Log Message: ----------- tweaking Modified Paths: -------------- trunk/ioData/client/ioEntityManagerClient.py trunk/ioData/vehicles/falcon/entities_world trunk/ioData/vehicles/voyager/entities_world Modified: trunk/ioData/client/ioEntityManagerClient.py =================================================================== --- trunk/ioData/client/ioEntityManagerClient.py 2007-10-01 16:30:14 UTC (rev 1157) +++ trunk/ioData/client/ioEntityManagerClient.py 2007-10-02 17:00:12 UTC (rev 1158) @@ -14,7 +14,7 @@ def __init__(self, celEntity): self.entity = celEntity self.entities = [] - self.numbots = 2 + self.numbots = 0 self.net = ioNetHelper.ioNetHelper() Modified: trunk/ioData/vehicles/falcon/entities_world =================================================================== --- trunk/ioData/vehicles/falcon/entities_world 2007-10-01 16:30:14 UTC (rev 1157) +++ trunk/ioData/vehicles/falcon/entities_world 2007-10-02 17:00:12 UTC (rev 1158) @@ -53,7 +53,7 @@ <par float="0.0" name="enginepower"/> <par float="1.0" name="leftsteersensitivity"/> <par float="0.8" name="rightsteersensitivity"/> - <par float="2.0" name="friction"/> + <par float="1.4" name="friction"/> <par float="0.0000215" name="slip"/> <par float="10.0" name="mass"/> <par bool="false" name="handbrakeaffected"/> @@ -72,7 +72,7 @@ <par float="0.0" name="enginepower"/> <par float="0.8" name="leftsteersensitivity"/> <par float="1.0" name="rightsteersensitivity"/> - <par float="2.0" name="friction"/> + <par float="1.4" name="friction"/> <par float="0.0000215" name="slip"/> <par float="10.0" name="mass"/> <par bool="false" name="handbrakeaffected"/> @@ -91,7 +91,7 @@ <par float="1.0" name="enginepower"/> <par float="0.0" name="leftsteersensitivity"/> <par float="0.0" name="rightsteersensitivity"/> - <par float="3.0" name="friction"/> + <par float="1.7" name="friction"/> <par float="0.0000085" name="slip"/> <par float="10.0" name="mass"/> <par bool="true" name="handbrakeaffected"/> @@ -107,10 +107,10 @@ <par float="0.00025" name="suspensionsoftness"/> <par float="0.125" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> - <par float="0.0" name="enginepower"/> + <par float="1.0" name="enginepower"/> <par float="0.0" name="leftsteersensitivity"/> <par float="0.0" name="rightsteersensitivity"/> - <par float="3.0" name="friction"/> + <par float="1.7" name="friction"/> <par float="0.0000085" name="slip"/> <par float="10.0" name="mass"/> <par bool="true" name="handbrakeaffected"/> @@ -120,32 +120,32 @@ </action> <action name="SetGearSettings"> <par float="-1" name="gear"/> - <par float="3200.0" name="force"/> + <par float="1100.0" name="force"/> <par float="-50.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="1" name="gear"/> - <par float="3300.0" name="force"/> + <par float="1600.0" name="force"/> <par float="40.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="2" name="gear"/> - <par float="2800.0" name="force"/> + <par float="1200.0" name="force"/> <par float="85.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="3" name="gear"/> - <par float="2350.0" name="force"/> + <par float="800.0" name="force"/> <par float="125.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="4" name="gear"/> - <par float="2100.0" name="force"/> + <par float="500.0" name="force"/> <par float="190.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="5" name="gear"/> - <par float="1900.0" name="force"/> + <par float="300.0" name="force"/> <par float="250.0" name="velocity"/> </action> </propclass> Modified: trunk/ioData/vehicles/voyager/entities_world =================================================================== --- trunk/ioData/vehicles/voyager/entities_world 2007-10-01 16:30:14 UTC (rev 1157) +++ trunk/ioData/vehicles/voyager/entities_world 2007-10-02 17:00:12 UTC (rev 1158) @@ -38,7 +38,7 @@ <property name="tankmode" bool="false"/> <property name="autotransmission" bool="true"/> <property name="autoreverse" bool="true"/> - <property name="brakeforce" float="2000.0"/> + <property name="brakeforce" float="5000.0"/> <property name="abs" bool="false"/> <property name="antisway" bool="true" /> <property name="steeramount" float="0.7"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cf...@us...> - 2007-10-01 16:32:00
|
Revision: 1157 http://automanic.svn.sourceforge.net/automanic/?rev=1157&view=rev Author: cfraz89 Date: 2007-10-01 09:30:14 -0700 (Mon, 01 Oct 2007) Log Message: ----------- done for nite Modified Paths: -------------- trunk/ioData/client/ioEntityManagerClient.py trunk/ioData/vehicles/ioVehicleBase.py Modified: trunk/ioData/client/ioEntityManagerClient.py =================================================================== --- trunk/ioData/client/ioEntityManagerClient.py 2007-10-01 16:04:52 UTC (rev 1156) +++ trunk/ioData/client/ioEntityManagerClient.py 2007-10-01 16:30:14 UTC (rev 1157) @@ -14,7 +14,7 @@ def __init__(self, celEntity): self.entity = celEntity self.entities = [] - self.numbots = 0 + self.numbots = 2 self.net = ioNetHelper.ioNetHelper() Modified: trunk/ioData/vehicles/ioVehicleBase.py =================================================================== --- trunk/ioData/vehicles/ioVehicleBase.py 2007-10-01 16:04:52 UTC (rev 1156) +++ trunk/ioData/vehicles/ioVehicleBase.py 2007-10-01 16:30:14 UTC (rev 1157) @@ -603,22 +603,22 @@ #Temporarily broken #Detach the weapons and give them explosion physics :) - #for part in self.weapons.itervalues(): - #if part: - #partmesh = celMesh(part) - #mesh = partmesh.Mesh - #movable = mesh.GetMovable() - #pos = movable.GetFullPosition() - #movable.GetSceneNode().SetParent(None) - #movable.SetSector(self.scene) - #movable.SetPosition(pos) - #movable.UpdateMove() - #partmech = celMechanicsObject(part) - #partmech.SetMass(10.0) - #partmech.SetFriction(0.4) - #partmech.AddToGroup('weaponsgroup') - #partmech.AttachColliderBoundingBox() - #self.randomThrow(partmech.GetBody()) + for part in self.weapons.itervalues(): + if part: + partmesh = celMesh(part) + mesh = partmesh.Mesh + movable = mesh.GetMovable() + pos = movable.GetFullPosition() + movable.GetSceneNode().SetParent(None) + movable.SetSector(self.scene) + movable.SetPosition(pos) + movable.UpdateMove() + partmech = celMechanicsObject(part) + partmech.SetMass(10.0) + partmech.SetFriction(0.4) + partmech.AddToGroup('weaponsgroup') + partmech.AttachColliderBoundingBox() + self.randomThrow(partmech.GetBody()) dmgfname = 'gen' + self.codename + 'Body-exp' self.changeBodyMesh(dmgfname, False) explosionfact = Engine.FindMeshFactory('carExplosion') @@ -907,7 +907,7 @@ self.unstuck(True) def unstuck(self, resetorientation): - self.mech.AddForceDuration(csVector3(0, 25.0 * self.mech.GetMass() ,0), False, csVector3(0), 0.1) + self.mech.AddForceDuration(csVector3(0, 50.0 * self.mech.GetMass() ,0), False, csVector3(0), 0.1) if resetorientation: self.mech.Body.SetTransform(csOrthoTransform(csMatrix3(), self.mech.Body.GetPosition())) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cf...@us...> - 2007-10-01 16:06:47
|
Revision: 1156 http://automanic.svn.sourceforge.net/automanic/?rev=1156&view=rev Author: cfraz89 Date: 2007-10-01 09:04:52 -0700 (Mon, 01 Oct 2007) Log Message: ----------- done for nite Modified Paths: -------------- trunk/ioData/client/ioClient.py trunk/ioData/client/ioNetClient.py trunk/ioData/menus/ioGarage.py trunk/ioData/scripts/ioNetworkEntCl.py trunk/ioData/server/ioServerBase.py trunk/ioData/vehicles/Van/entities_world trunk/ioData/vehicles/falcon/entities_world trunk/ioData/vehicles/fedex/entities_world trunk/ioData/vehicles/strider/entities_world trunk/ioData/vehicles/trekker/entities_world trunk/ioData/vehicles/voyager/entities_world trunk/ioData/vehicles/voyager/factories/genVoyagerBody Modified: trunk/ioData/client/ioClient.py =================================================================== --- trunk/ioData/client/ioClient.py 2007-10-01 12:45:38 UTC (rev 1155) +++ trunk/ioData/client/ioClient.py 2007-10-01 16:04:52 UTC (rev 1156) @@ -62,10 +62,9 @@ self.net.sendData('ioGSrv', msg, data, self.gameserver) def r_resp(self, pc, args): - if self.servertime >= 2: - hud = Entities['ioHUD'] - if hud: - hud.Behaviour.SendMessage('unlag', None, celGenericParameterBlock(0)) + hud = Entities['ioHUD'] + if hud: + hud.Behaviour.SendMessage('unlag', None, celGenericParameterBlock(0)) self.servertime = 0 #Get the servers sending info to us Modified: trunk/ioData/client/ioNetClient.py =================================================================== --- trunk/ioData/client/ioNetClient.py 2007-10-01 12:45:38 UTC (rev 1155) +++ trunk/ioData/client/ioNetClient.py 2007-10-01 16:04:52 UTC (rev 1156) @@ -49,7 +49,7 @@ def pctimer_wakeup(self, pc, args): self.dispatcher.packethandler.checkStored() - asyncore.loop(0, True, asyncore.socket_map, 1) + if self.fakelag: for data in self.lagsend[:]: packet, mtime = data @@ -57,8 +57,8 @@ self.dispatcher.sendData(packet) self.lagsend.remove(data) - # def pctimer_wakeup(self, pc, args): - + def pctimer_wakeupframe(self, pc, args): + asyncore.loop(0, True, asyncore.socket_map, 1) #A child entity needs to add more network client messages def addexceptions(self, pc, args): Modified: trunk/ioData/menus/ioGarage.py =================================================================== --- trunk/ioData/menus/ioGarage.py 2007-10-01 12:45:38 UTC (rev 1155) +++ trunk/ioData/menus/ioGarage.py 2007-10-01 16:04:52 UTC (rev 1156) @@ -79,8 +79,8 @@ modellabel.SetTextFgColor(csColor(1, 1, 1)) modellabel.SetText('Model Preset') - self.vehiclescroller = ioScroller.ioScroller(self.entity, [00000, 65000], [80000, 50000]) - self.modelscroller = ioScroller.ioScroller(self.entity, [00000, 140000], [80000, 50000]) + self.vehiclescroller = ioScroller.ioScroller(self.entity, [00000, 65000], [80000, 50000], '_vehicles') + self.modelscroller = ioScroller.ioScroller(self.entity, [00000, 140000], [80000, 50000], 'models') self.buttons = Menu.ioMenu(self.entity) self.buttons.addElement('Continue','Continue_click', [280000, 0], [30000,10000], self.fconst,'half-black') @@ -156,6 +156,18 @@ pcinput.Bind('Up', 'camup') pcinput.Bind('Down', 'camdown') + def scroller_up_vehicles(self, pc, args): + self.vehiclescroller.scrollup() + + def scroller_down_vehicles(self, pc, args): + self.vehiclescroller.scrolldown() + + def scroller_up_models(self, pc, args): + self.modelscroller.scrollup() + + def scroller_down_models(self, pc, args): + self.modelscroller.scrolldown() + def pccommandinput_camleft1(self, pc, args): self.camera.SetYawVelocity(0.6) Modified: trunk/ioData/scripts/ioNetworkEntCl.py =================================================================== --- trunk/ioData/scripts/ioNetworkEntCl.py 2007-10-01 12:45:38 UTC (rev 1155) +++ trunk/ioData/scripts/ioNetworkEntCl.py 2007-10-01 16:04:52 UTC (rev 1156) @@ -26,8 +26,8 @@ def __init__(self, celEntity): ioNetworkEntBase.__init__(self, celEntity) - self.timer.WakeUp(12, True, 'send_rot') - self.timer.WakeUp(25, True, 'send_pos') + self.timer.WakeUp(33, True, 'send_rot') + self.timer.WakeUp(66, True, 'send_pos') #Register or unregister from the network. def setregistered(self, pc, args): Modified: trunk/ioData/server/ioServerBase.py =================================================================== --- trunk/ioData/server/ioServerBase.py 2007-10-01 12:45:38 UTC (rev 1155) +++ trunk/ioData/server/ioServerBase.py 2007-10-01 16:04:52 UTC (rev 1156) @@ -51,7 +51,7 @@ #Every 10 secs we check for dead clients, and send a ping to all. timer = celTimer(self.entity) timer.WakeUp(500, True, 'packethandle') - timer.WakeUp(5000, True, 'ping') + timer.WakeUp(3000, True, 'ping') ioDataBin.Store('socketent', self.entity.Name) Modified: trunk/ioData/vehicles/Van/entities_world =================================================================== --- trunk/ioData/vehicles/Van/entities_world 2007-10-01 12:45:38 UTC (rev 1155) +++ trunk/ioData/vehicles/Van/entities_world 2007-10-01 16:04:52 UTC (rev 1156) @@ -40,6 +40,7 @@ <property name="autoreverse" bool="true"/> <property name="brakeforce" float="1400.0"/> <property name="abs" bool="false"/> + <property name="antisway" bool="true" /> <property name="steeramount" float="0.7"/> <!--Front Left Wheel--> <action name="AddWheel"> @@ -82,8 +83,8 @@ <!--Rear Left Wheel--> <action name="AddWheel"> <par vector="0.55,0,1.1" name="position"/> - <par float="0.0" name="turnspeed"/> - <par float="0.0" name="returnspeed"/> + <par float="2.0" name="turnspeed"/> + <par float="2.0" name="returnspeed"/> <par float="0.00025" name="suspensionsoftness"/> <par float="0.2" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> Modified: trunk/ioData/vehicles/falcon/entities_world =================================================================== --- trunk/ioData/vehicles/falcon/entities_world 2007-10-01 12:45:38 UTC (rev 1155) +++ trunk/ioData/vehicles/falcon/entities_world 2007-10-01 16:04:52 UTC (rev 1156) @@ -40,6 +40,7 @@ <property name="autoreverse" bool="true"/> <property name="brakeforce" float="1500.0"/> <property name="abs" bool="false"/> + <property name="antisway" bool="true" /> <property name="steeramount" float="0.7"/> <!--Front Left Wheel--> <action name="AddWheel"> @@ -52,7 +53,7 @@ <par float="0.0" name="enginepower"/> <par float="1.0" name="leftsteersensitivity"/> <par float="0.8" name="rightsteersensitivity"/> - <par float="1.325" name="friction"/> + <par float="2.0" name="friction"/> <par float="0.0000215" name="slip"/> <par float="10.0" name="mass"/> <par bool="false" name="handbrakeaffected"/> @@ -71,7 +72,7 @@ <par float="0.0" name="enginepower"/> <par float="0.8" name="leftsteersensitivity"/> <par float="1.0" name="rightsteersensitivity"/> - <par float="1.325" name="friction"/> + <par float="2.0" name="friction"/> <par float="0.0000215" name="slip"/> <par float="10.0" name="mass"/> <par bool="false" name="handbrakeaffected"/> @@ -90,7 +91,7 @@ <par float="1.0" name="enginepower"/> <par float="0.0" name="leftsteersensitivity"/> <par float="0.0" name="rightsteersensitivity"/> - <par float="1.4" name="friction"/> + <par float="3.0" name="friction"/> <par float="0.0000085" name="slip"/> <par float="10.0" name="mass"/> <par bool="true" name="handbrakeaffected"/> @@ -108,8 +109,8 @@ <par float="0.3" name="brakepower"/> <par float="0.0" name="enginepower"/> <par float="0.0" name="leftsteersensitivity"/> - <par float="1.0" name="rightsteersensitivity"/> - <par float="1.4" name="friction"/> + <par float="0.0" name="rightsteersensitivity"/> + <par float="3.0" name="friction"/> <par float="0.0000085" name="slip"/> <par float="10.0" name="mass"/> <par bool="true" name="handbrakeaffected"/> @@ -119,32 +120,32 @@ </action> <action name="SetGearSettings"> <par float="-1" name="gear"/> - <par float="2200.0" name="force"/> + <par float="3200.0" name="force"/> <par float="-50.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="1" name="gear"/> - <par float="2300.0" name="force"/> + <par float="3300.0" name="force"/> <par float="40.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="2" name="gear"/> - <par float="1800.0" name="force"/> + <par float="2800.0" name="force"/> <par float="85.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="3" name="gear"/> - <par float="1350.0" name="force"/> + <par float="2350.0" name="force"/> <par float="125.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="4" name="gear"/> - <par float="1100.0" name="force"/> + <par float="2100.0" name="force"/> <par float="190.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="5" name="gear"/> - <par float="900.0" name="force"/> + <par float="1900.0" name="force"/> <par float="250.0" name="velocity"/> </action> </propclass> Modified: trunk/ioData/vehicles/fedex/entities_world =================================================================== --- trunk/ioData/vehicles/fedex/entities_world 2007-10-01 12:45:38 UTC (rev 1155) +++ trunk/ioData/vehicles/fedex/entities_world 2007-10-01 16:04:52 UTC (rev 1156) @@ -40,6 +40,7 @@ <property name="autoreverse" bool="true"/> <property name="brakeforce" float="800.0"/> <property name="abs" bool="false"/> + <property name="antisway" bool="true" /> <property name="steeramount" float="0.7"/> <!--Front Left Wheel--> <action name="AddWheel"> Modified: trunk/ioData/vehicles/strider/entities_world =================================================================== --- trunk/ioData/vehicles/strider/entities_world 2007-10-01 12:45:38 UTC (rev 1155) +++ trunk/ioData/vehicles/strider/entities_world 2007-10-01 16:04:52 UTC (rev 1156) @@ -37,6 +37,7 @@ <property name="autoreverse" bool="true"/> <property name="brakeforce" float="1200.0"/> <property name="abs" bool="false"/> + <property name="antisway" bool="true" /> <property name="steeramount" float="0.7"/> <!--Front Left Wheel--> <action name="AddWheel"> @@ -49,7 +50,7 @@ <par float="0.4" name="enginepower"/> <par float="1.0" name="leftsteersensitivity"/> <par float="0.8" name="rightsteersensitivity"/> - <par float="1.0" name="friction"/> + <par float="2.0" name="friction"/> <par float="0.0000345" name="slip"/> <par float="8.0" name="mass"/> <par bool="false" name="handbrakeaffected"/> @@ -68,7 +69,7 @@ <par float="0.4" name="enginepower"/> <par float="0.8" name="leftsteersensitivity"/> <par float="1.0" name="rightsteersensitivity"/> - <par float="1.0" name="friction"/> + <par float="2.0" name="friction"/> <par float="0.0000345" name="slip"/> <par float="8.0" name="mass"/> <par bool="false" name="handbrakeaffected"/> @@ -87,7 +88,7 @@ <par float="0.6" name="enginepower"/> <par float="0.0" name="leftsteersensitivity"/> <par float="0.0" name="rightsteersensitivity"/> - <par float="1.0" name="friction"/> + <par float="2.0" name="friction"/> <par float="0.0000145" name="slip"/> <par float="12.0" name="mass"/> <par bool="true" name="handbrakeaffected"/> @@ -106,7 +107,7 @@ <par float="0.6" name="enginepower"/> <par float="0.0" name="leftsteersensitivity"/> <par float="0.0" name="rightsteersensitivity"/> - <par float="0.0" name="friction"/> + <par float="2.0" name="friction"/> <par float="0.0000145" name="slip"/> <par float="12.0" name="mass"/> <par bool="true" name="handbrakeaffected"/> @@ -121,27 +122,27 @@ </action> <action name="SetGearSettings"> <par float="1" name="gear"/> - <par float="1700.0" name="force"/> + <par float="1200.0" name="force"/> <par float="40.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="2" name="gear"/> - <par float="1000.0" name="force"/> + <par float="600.0" name="force"/> <par float="84.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="3" name="gear"/> - <par float="800.0" name="force"/> + <par float="400.0" name="force"/> <par float="120.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="4" name="gear"/> - <par float="400.0" name="force"/> + <par float="200.0" name="force"/> <par float="162.0" name="velocity"/> </action> <action name="SetGearSettings"> <par float="5" name="gear"/> - <par float="200.0" name="force"/> + <par float="150.0" name="force"/> <par float="205.0" name="velocity"/> </action> </propclass> Modified: trunk/ioData/vehicles/trekker/entities_world =================================================================== --- trunk/ioData/vehicles/trekker/entities_world 2007-10-01 12:45:38 UTC (rev 1155) +++ trunk/ioData/vehicles/trekker/entities_world 2007-10-01 16:04:52 UTC (rev 1156) @@ -40,6 +40,7 @@ <property name="autoreverse" bool="true"/> <property name="brakeforce" float="2000.0"/> <property name="abs" bool="false"/> + <property name="antisway" bool="true" /> <property name="steeramount" float="0.7"/> <!--Front Left Wheel--> <action name="AddWheel"> Modified: trunk/ioData/vehicles/voyager/entities_world =================================================================== --- trunk/ioData/vehicles/voyager/entities_world 2007-10-01 12:45:38 UTC (rev 1155) +++ trunk/ioData/vehicles/voyager/entities_world 2007-10-01 16:04:52 UTC (rev 1156) @@ -40,10 +40,11 @@ <property name="autoreverse" bool="true"/> <property name="brakeforce" float="2000.0"/> <property name="abs" bool="false"/> + <property name="antisway" bool="true" /> <property name="steeramount" float="0.7"/> <!--Front Left Wheel--> <action name="AddWheel"> - <par vector="0.55, -0.1, -1.2" name="position"/> + <par vector="0.55, 0.0, -1.225" name="position"/> <par float="2.0" name="turnspeed"/> <par float="2.0" name="returnspeed"/> <par float="0.0002" name="suspensionsoftness"/> @@ -62,7 +63,7 @@ </action> <!--Front Right Wheel--> <action name="AddWheel"> - <par vector="-0.55, -0.1, -1.2" name="position"/> + <par vector="-0.55, 0.0, -1.25" name="position"/> <par float="2.0" name="turnspeed"/> <par float="2.0" name="returnspeed"/> <par float="0.0002" name="suspensionsoftness"/> @@ -81,7 +82,7 @@ </action> <!--Rear Left Wheel--> <action name="AddWheel"> - <par vector="0.55,-0.1, 0.9" name="position"/> + <par vector="0.55, 0.0, 0.95" name="position"/> <par float="2.0" name="turnspeed"/> <par float="2.0" name="returnspeed"/> <par float="0.0002" name="suspensionsoftness"/> @@ -100,7 +101,7 @@ </action> <!--Rear Right Wheel--> <action name="AddWheel"> - <par vector="-0.55, -0.1, 0.9" name="position"/> + <par vector="-0.55, 0.0, 0.95" name="position"/> <par float="2.0" name="turnspeed"/> <par float="2.0" name="returnspeed"/> <par float="0.0002" name="suspensionsoftness"/> Modified: trunk/ioData/vehicles/voyager/factories/genVoyagerBody =================================================================== --- trunk/ioData/vehicles/voyager/factories/genVoyagerBody 2007-10-01 12:45:38 UTC (rev 1155) +++ trunk/ioData/vehicles/voyager/factories/genVoyagerBody 2007-10-01 16:04:52 UTC (rev 1156) @@ -4,135 +4,135 @@ <zuse/> <params> <material>RF_Spring01SGno</material> -<v x="0.481016" y="-0.0271965" z="0.934664" nx="-0.996185" ny="-0.0871303" nz="0"/> -<v x="0.485201" y="-0.0268302" z="0.924522" nx="-0.704398" ny="-0.0616169" nz="-0.707083"/> -<v x="0.469775" y="0.149492" z="0.924521" nx="-0.704398" ny="-0.0616169" nz="-0.707083"/> -<v x="0.46559" y="0.149126" z="0.934663" nx="-0.996185" ny="-0.0871303" nz="0"/> +<v x="0.481016" y="0.155954" z="0.934664" nx="-0.996185" ny="-0.0871303" nz="0"/> +<v x="0.485201" y="0.156321" z="0.924522" nx="-0.704398" ny="-0.0616169" nz="-0.707083"/> +<v x="0.469775" y="0.332643" z="0.924521" nx="-0.704398" ny="-0.0616169" nz="-0.707083"/> +<v x="0.46559" y="0.332277" z="0.934663" nx="-0.996185" ny="-0.0871303" nz="0"/> <t v1="3" v2="2" v3="1"/> <t v1="3" v2="1" v3="0"/> -<v x="0.495304" y="-0.0259462" z="0.920321" nx="0" ny="0" nz="-1"/> -<v x="0.479879" y="0.150376" z="0.920319" nx="0" ny="0" nz="-1"/> +<v x="0.495304" y="0.157205" z="0.920321" nx="0" ny="0" nz="-1"/> +<v x="0.479879" y="0.333527" z="0.920319" nx="0" ny="0" nz="-1"/> <t v1="2" v2="5" v3="4"/> <t v1="2" v2="4" v3="1"/> -<v x="0.505408" y="-0.0250621" z="0.924522" nx="0.704398" ny="0.0616169" nz="-0.707083"/> -<v x="0.489982" y="0.15126" z="0.924521" nx="0.704398" ny="0.0616169" nz="-0.707083"/> +<v x="0.505408" y="0.158089" z="0.924522" nx="0.704398" ny="0.0616169" nz="-0.707083"/> +<v x="0.489982" y="0.334411" z="0.924521" nx="0.704398" ny="0.0616169" nz="-0.707083"/> <t v1="5" v2="7" v3="6"/> <t v1="5" v2="6" v3="4"/> -<v x="0.509593" y="-0.0246965" z="0.934664" nx="0.996185" ny="0.0871303" nz="0"/> -<v x="0.494167" y="0.151626" z="0.934663" nx="0.996185" ny="0.0871303" nz="0"/> +<v x="0.509593" y="0.158454" z="0.934664" nx="0.996185" ny="0.0871303" nz="0"/> +<v x="0.494167" y="0.334777" z="0.934663" nx="0.996185" ny="0.0871303" nz="0"/> <t v1="7" v2="9" v3="8"/> <t v1="7" v2="8" v3="6"/> -<v x="0.505408" y="-0.0250619" z="0.944806" nx="0.704398" ny="0.0616169" nz="0.707083"/> -<v x="0.489982" y="0.151261" z="0.944805" nx="0.704398" ny="0.0616169" nz="0.707083"/> +<v x="0.505408" y="0.158089" z="0.944806" nx="0.704398" ny="0.0616169" nz="0.707083"/> +<v x="0.489982" y="0.334411" z="0.944805" nx="0.704398" ny="0.0616169" nz="0.707083"/> <t v1="9" v2="11" v3="10"/> <t v1="9" v2="10" v3="8"/> -<v x="0.495304" y="-0.0259459" z="0.949007" nx="0" ny="0" nz="1"/> -<v x="0.479879" y="0.150377" z="0.949006" nx="0" ny="0" nz="1"/> +<v x="0.495304" y="0.157205" z="0.949007" nx="0" ny="0" nz="1"/> +<v x="0.479879" y="0.333527" z="0.949006" nx="0" ny="0" nz="1"/> <t v1="11" v2="13" v3="12"/> <t v1="11" v2="12" v3="10"/> -<v x="0.485201" y="-0.02683" z="0.944806" nx="-0.704398" ny="-0.0616169" nz="0.707083"/> -<v x="0.469775" y="0.149492" z="0.944805" nx="-0.704398" ny="-0.0616169" nz="0.707083"/> +<v x="0.485201" y="0.156321" z="0.944806" nx="-0.704398" ny="-0.0616169" nz="0.707083"/> +<v x="0.469775" y="0.332643" z="0.944805" nx="-0.704398" ny="-0.0616169" nz="0.707083"/> <t v1="13" v2="15" v3="14"/> <t v1="13" v2="14" v3="12"/> <t v1="15" v2="3" v3="0"/> <t v1="15" v2="0" v3="14"/> -<v x="0.423889" y="0.128789" z="-1.24452" nx="-0.286172" ny="-0.958159" nz="0"/> -<v x="0.429834" y="0.130382" z="-1.25938" nx="-0.137791" ny="-0.918424" nz="-0.3708"/> -<v x="0.386279" y="0.292933" z="-1.25938" nx="-0.683004" ny="-0.182989" nz="-0.707083"/> -<v x="0.380335" y="0.29134" z="-1.24452" nx="-0.965911" ny="-0.258797" nz="0"/> +<v x="0.423889" y="0.31194" z="-1.24452" nx="-0.286172" ny="-0.958159" nz="0"/> +<v x="0.429834" y="0.313533" z="-1.25938" nx="-0.137791" ny="-0.918424" nz="-0.3708"/> +<v x="0.386279" y="0.476084" z="-1.25938" nx="-0.683004" ny="-0.182989" nz="-0.707083"/> +<v x="0.380335" y="0.474491" z="-1.24452" nx="-0.965911" ny="-0.258797" nz="0"/> <t v1="19" v2="18" v3="17"/> <t v1="19" v2="17" v3="16"/> -<v x="0.444187" y="0.134227" z="-1.26553" nx="0.123173" ny="-0.459731" nz="-0.879452"/> -<v x="0.400631" y="0.296779" z="-1.26553" nx="0" ny="0" nz="-1"/> +<v x="0.444187" y="0.317378" z="-1.26553" nx="0.123173" ny="-0.459731" nz="-0.879452"/> +<v x="0.400631" y="0.47993" z="-1.26553" nx="0" ny="0" nz="-1"/> <t v1="18" v2="21" v3="20"/> <t v1="18" v2="20" v3="17"/> -<v x="0.458539" y="0.138074" z="-1.25938" nx="0.653584" ny="-0.585284" nz="-0.479812"/> -<v x="0.414983" y="0.300625" z="-1.25938" nx="0.683004" ny="0.182989" nz="-0.707083"/> +<v x="0.458539" y="0.321225" z="-1.25938" nx="0.653584" ny="-0.585284" nz="-0.479812"/> +<v x="0.414983" y="0.483775" z="-1.25938" nx="0.683004" ny="0.182989" nz="-0.707083"/> <t v1="21" v2="23" v3="22"/> <t v1="21" v2="22" v3="20"/> -<v x="0.464483" y="0.139667" z="-1.24452" nx="0.72692" ny="-0.686697" nz="0"/> -<v x="0.420929" y="0.302217" z="-1.24452" nx="0.965911" ny="0.258797" nz="0"/> +<v x="0.464483" y="0.322818" z="-1.24452" nx="0.72692" ny="-0.686697" nz="0"/> +<v x="0.420929" y="0.485368" z="-1.24452" nx="0.965911" ny="0.258797" nz="0"/> <t v1="23" v2="25" v3="24"/> <t v1="23" v2="24" v3="22"/> -<v x="0.458539" y="0.138074" z="-1.22966" nx="0.57857" ny="-0.726463" nz="0.3708"/> -<v x="0.414983" y="0.300625" z="-1.22966" nx="0.683004" ny="0.182989" nz="0.707083"/> +<v x="0.458539" y="0.321225" z="-1.22966" nx="0.57857" ny="-0.726463" nz="0.3708"/> +<v x="0.414983" y="0.483776" z="-1.22966" nx="0.683004" ny="0.182989" nz="0.707083"/> <t v1="25" v2="27" v3="26"/> <t v1="25" v2="26" v3="24"/> -<v x="0.444187" y="0.134228" z="-1.2235" nx="0.123173" ny="-0.459731" nz="0.879452"/> -<v x="0.400631" y="0.296779" z="-1.22351" nx="0" ny="0" nz="1"/> +<v x="0.444187" y="0.317379" z="-1.2235" nx="0.123173" ny="-0.459731" nz="0.879452"/> +<v x="0.400631" y="0.47993" z="-1.22351" nx="0" ny="0" nz="1"/> <t v1="27" v2="29" v3="28"/> <t v1="27" v2="28" v3="26"/> -<v x="0.429834" y="0.130382" z="-1.22966" nx="-0.273354" ny="-0.833674" nz="0.479812"/> -<v x="0.386279" y="0.292933" z="-1.22966" nx="-0.683004" ny="-0.182989" nz="0.707083"/> +<v x="0.429834" y="0.313533" z="-1.22966" nx="-0.273354" ny="-0.833674" nz="0.479812"/> +<v x="0.386279" y="0.476084" z="-1.22966" nx="-0.683004" ny="-0.182989" nz="0.707083"/> <t v1="29" v2="31" v3="30"/> <t v1="29" v2="30" v3="28"/> <t v1="31" v2="19" v3="16"/> <t v1="31" v2="16" v3="30"/> -<v x="0.417865" y="0.329975" z="-1.68252" nx="-0.212989" ny="0.0891751" nz="-0.972961"/> -<v x="0.411558" y="0.298776" z="-1.68252" nx="-0.23072" ny="0" nz="-0.972991"/> -<v x="0.443612" y="0.298776" z="-1.69012" nx="-0.159459" ny="0" nz="-0.987182"/> -<v x="0.44743" y="0.317659" z="-1.69012" nx="-0.14716" ny="0.0615864" nz="-0.987182"/> +<v x="0.417865" y="0.513126" z="-1.68252" nx="-0.212989" ny="0.0891751" nz="-0.972961"/> +<v x="0.411558" y="0.481927" z="-1.68252" nx="-0.23072" ny="0" nz="-0.972991"/> +<v x="0.443612" y="0.481927" z="-1.69012" nx="-0.159459" ny="0" nz="-0.987182"/> +<v x="0.44743" y="0.50081" z="-1.69012" nx="-0.14716" ny="0.0615864" nz="-0.987182"/> <t v1="35" v2="34" v3="33"/> <t v1="35" v2="33" v3="32"/> -<v x="0.417865" y="0.267576" z="-1.68252" nx="-0.212989" ny="-0.0891751" nz="-0.972961"/> -<v x="0.44743" y="0.279893" z="-1.69012" nx="-0.14716" ny="-0.0615864" nz="-0.987182"/> +<v x="0.417865" y="0.450727" z="-1.68252" nx="-0.212989" ny="-0.0891751" nz="-0.972961"/> +<v x="0.44743" y="0.463044" z="-1.69012" nx="-0.14716" ny="-0.0615864" nz="-0.987182"/> <t v1="34" v2="37" v3="36"/> <t v1="34" v2="36" v3="33"/> -<v x="0.435048" y="0.242102" z="-1.68252" nx="-0.163488" ny="-0.163488" nz="-0.972869"/> -<v x="0.457665" y="0.264718" z="-1.69012" nx="-0.112888" ny="-0.112888" nz="-0.987152"/> +<v x="0.435048" y="0.425253" z="-1.68252" nx="-0.163488" ny="-0.163488" nz="-0.972869"/> +<v x="0.457665" y="0.447869" z="-1.69012" nx="-0.112888" ny="-0.112888" nz="-0.987152"/> <t v1="37" v2="39" v3="38"/> <t v1="37" v2="38" v3="36"/> -<v x="0.460522" y="0.22492" z="-1.68252" nx="-0.0891751" ny="-0.213019" nz="-0.972961"/> -<v x="0.472838" y="0.254484" z="-1.69012" nx="-0.0615864" ny="-0.14716" nz="-0.987182"/> +<v x="0.460522" y="0.408071" z="-1.68252" nx="-0.0891751" ny="-0.213019" nz="-0.972961"/> +<v x="0.472838" y="0.437634" z="-1.69012" nx="-0.0615864" ny="-0.14716" nz="-0.987182"/> <t v1="39" v2="41" v3="40"/> <t v1="39" v2="40" v3="38"/> -<v x="0.491722" y="0.218612" z="-1.68252" nx="0" ny="-0.23075" nz="-0.972991"/> -<v x="0.491722" y="0.250665" z="-1.69012" nx="0" ny="-0.159459" nz="-0.987182"/> +<v x="0.491722" y="0.401763" z="-1.68252" nx="0" ny="-0.23075" nz="-0.972991"/> +<v x="0.491722" y="0.433816" z="-1.69012" nx="0" ny="-0.159459" nz="-0.987182"/> <t v1="41" v2="43" v3="42"/> <t v1="41" v2="42" v3="40"/> -<v x="0.522922" y="0.22492" z="-1.68252" nx="0.0891751" ny="-0.213019" nz="-0.972961"/> -<v x="0.510606" y="0.254484" z="-1.69012" nx="0.0615864" ny="-0.14716" nz="-0.987182"/> +<v x="0.522922" y="0.408071" z="-1.68252" nx="0.0891751" ny="-0.213019" nz="-0.972961"/> +<v x="0.510606" y="0.437634" z="-1.69012" nx="0.0615864" ny="-0.14716" nz="-0.987182"/> <t v1="43" v2="45" v3="44"/> <t v1="43" v2="44" v3="42"/> -<v x="0.548395" y="0.242102" z="-1.68252" nx="0.163488" ny="-0.163488" nz="-0.972869"/> -<v x="0.525779" y="0.264718" z="-1.69012" nx="0.112888" ny="-0.112888" nz="-0.987152"/> +<v x="0.548395" y="0.425253" z="-1.68252" nx="0.163488" ny="-0.163488" nz="-0.972869"/> +<v x="0.525779" y="0.447869" z="-1.69012" nx="0.112888" ny="-0.112888" nz="-0.987152"/> <t v1="45" v2="47" v3="46"/> <t v1="45" v2="46" v3="44"/> -<v x="0.565578" y="0.267576" z="-1.68252" nx="0.212989" ny="-0.0891751" nz="-0.972961"/> -<v x="0.536014" y="0.279893" z="-1.69012" nx="0.14716" ny="-0.0615864" nz="-0.987182"/> +<v x="0.565578" y="0.450727" z="-1.68252" nx="0.212989" ny="-0.0891751" nz="-0.972961"/> +<v x="0.536014" y="0.463044" z="-1.69012" nx="0.14716" ny="-0.0615864" nz="-0.987182"/> <t v1="47" v2="49" v3="48"/> <t v1="47" v2="48" v3="46"/> -<v x="0.571886" y="0.298776" z="-1.68252" nx="0.23072" ny="0" nz="-0.972991"/> -<v x="0.539832" y="0.298776" z="-1.69012" nx="0.159459" ny="0" nz="-0.987182"/> +<v x="0.571886" y="0.481927" z="-1.68252" nx="0.23072" ny="0" nz="-0.972991"/> +<v x="0.539832" y="0.481927" z="-1.69012" nx="0.159459" ny="0" nz="-0.987182"/> <t v1="49" v2="51" v3="50"/> <t v1="49" v2="50" v3="48"/> -<v x="0.565578" y="0.329975" z="-1.68252" nx="0.212989" ny="0.0891751" nz="-0.972961"/> -<v x="0.536014" y="0.317659" z="-1.69012" nx="0.14716" ny="0.0615864" nz="-0.987182"/> +<v x="0.565578" y="0.513126" z="-1.68252" nx="0.212989" ny="0.0891751" nz="-0.972961"/> +<v x="0.536014" y="0.50081" z="-1.69012" nx="0.14716" ny="0.0615864" nz="-0.987182"/> <t v1="51" v2="53" v3="52"/> <t v1="51" v2="52" v3="50"/> -<v x="0.548395" y="0.355449" z="-1.68252" nx="0.163488" ny="0.163488" nz="-0.9729"/> -<v x="0.525779" y="0.332833" z="-1.69012" nx="0.112888" ny="0.112888" nz="-0.987152"/> +<v x="0.548395" y="0.5386" z="-1.68252" nx="0.163488" ny="0.163488" nz="-0.9729"/> +<v x="0.525779" y="0.515984" z="-1.69012" nx="0.112888" ny="0.112888" nz="-0.987152"/> <t v1="53" v2="55" v3="54"/> <t v1="53" v2="54" v3="52"/> -<v x="0.522922" y="0.372632" z="-1.68252" nx="0.0891751" ny="0.212989" nz="-0.972961"/> -<v x="0.510606" y="0.343068" z="-1.69012" nx="0.0615864" ny="0.14713" nz="-0.987182"/> +<v x="0.522922" y="0.555783" z="-1.68252" nx="0.0891751" ny="0.212989" nz="-0.972961"/> +<v x="0.510606" y="0.526219" z="-1.69012" nx="0.0615864" ny="0.14713" nz="-0.987182"/> <t v1="55" v2="57" v3="56"/> <t v1="55" v2="56" v3="54"/> -<v x="0.491722" y="0.37894" z="-1.68252" nx="0" ny="0.23072" nz="-0.972991"/> -<v x="0.491722" y="0.346886" z="-1.69012" nx="0" ny="0.159459" nz="-0.987182"/> +<v x="0.491722" y="0.562091" z="-1.68252" nx="0" ny="0.23072" nz="-0.972991"/> +<v x="0.491722" y="0.530037" z="-1.69012" nx="0" ny="0.159459" nz="-0.987182"/> <t v1="57" v2="59" v3="58"/> <t v1="57" v2="58" v3="56"/> -<v x="0.460522" y="0.372632" z="-1.68252" nx="-0.0891751" ny="0.212989" nz="-0.972961"/> -<v x="0.472838" y="0.343068" z="-1.69012" nx="-0.0615864" ny="0.14713" nz="-0.987182"/> +<v x="0.460522" y="0.555783" z="-1.68252" nx="-0.0891751" ny="0.212989" nz="-0.972961"/> +<v x="0.472838" y="0.526219" z="-1.69012" nx="-0.0615864" ny="0.14713" nz="-0.987182"/> <t v1="59" v2="61" v3="60"/> <t v1="59" v2="60" v3="58"/> -<v x="0.435048" y="0.355449" z="-1.68252" nx="-0.163488" ny="0.163488" nz="-0.9729"/> -<v x="0.457665" y="0.332833" z="-1.69012" nx="-0.112888" ny="0.112888" nz="-0.987152"/> +<v x="0.435048" y="0.5386" z="-1.68252" nx="-0.163488" ny="0.163488" nz="-0.9729"/> +<v x="0.457665" y="0.515984" z="-1.69012" nx="-0.112888" ny="0.112888" nz="-0.987152"/> <t v1="61" v2="63" v3="62"/> <t v1="61" v2="62" v3="60"/> <t v1="63" v2="35" v3="32"/> <t v1="63" v2="32" v3="62"/> -<v x="0.491722" y="0.298776" z="-1.69434" nx="0" ny="0" nz="-1"/> +<v x="0.491722" y="0.481927" z="-1.69434" nx="0" ny="0" nz="-1"/> <t v1="64" v2="34" v3="35"/> <t v1="64" v2="37" v3="34"/> <t v1="64" v2="39" v3="37"/> @@ -149,84 +149,84 @@ <t v1="64" v2="61" v3="59"/> <t v1="64" v2="63" v3="61"/> <t v1="64" v2="35" v3="63"/> -<v x="0.511228" y="0.236075" z="1.60664" nx="-0.0820948" ny="-0.395856" nz="0.914609"/> -<v x="0.507015" y="0.237918" z="1.60664" nx="-0.21485" ny="-0.201941" nz="0.955504"/> -<v x="0.595477" y="0.237918" z="1.60664" nx="0.21485" ny="-0.201941" nz="0.955504"/> -<v x="0.591263" y="0.236075" z="1.60664" nx="0.0820948" ny="-0.395856" nz="0.914609"/> +<v x="0.511228" y="0.419226" z="1.60664" nx="-0.0820948" ny="-0.395856" nz="0.914609"/> +<v x="0.507015" y="0.421069" z="1.60664" nx="-0.21485" ny="-0.201941" nz="0.955504"/> +<v x="0.595477" y="0.421069" z="1.60664" nx="0.21485" ny="-0.201941" nz="0.955504"/> +<v x="0.591263" y="0.419226" z="1.60664" nx="0.0820948" ny="-0.395856" nz="0.914609"/> <t v1="68" v2="67" v3="66"/> <t v1="68" v2="66" v3="65"/> -<v x="0.509216" y="0.230876" z="1.59658" nx="-0.192206" ny="-0.930631" nz="0.31138"/> -<v x="0.503609" y="0.233299" z="1.59658" nx="-0.684133" ny="-0.657063" nz="0.316538"/> -<v x="0.505044" y="0.235655" z="1.60457" nx="-0.576342" ny="-0.548967" nz="0.605335"/> -<v x="0.510482" y="0.233283" z="1.60457" nx="-0.16306" ny="-0.788354" nz="0.593188"/> +<v x="0.509216" y="0.414026" z="1.59658" nx="-0.192206" ny="-0.930631" nz="0.31138"/> +<v x="0.503609" y="0.41645" z="1.59658" nx="-0.684133" ny="-0.657063" nz="0.316538"/> +<v x="0.505044" y="0.418806" z="1.60457" nx="-0.576342" ny="-0.548936" nz="0.605335"/> +<v x="0.510482" y="0.416434" z="1.60457" nx="-0.16306" ny="-0.788354" nz="0.593188"/> <t v1="72" v2="71" v3="70"/> <t v1="72" v2="70" v3="69"/> -<v x="0.501285" y="0.239145" z="1.59658" nx="-0.956298" ny="-0.180486" nz="0.229926"/> -<v x="0.502782" y="0.241367" z="1.60453" nx="-0.830134" ny="-0.15479" nz="0.53563"/> +<v x="0.501285" y="0.422296" z="1.59658" nx="-0.956298" ny="-0.180486" nz="0.229926"/> +<v x="0.502782" y="0.424518" z="1.60453" nx="-0.830134" ny="-0.15479" nz="0.53563"/> <t v1="71" v2="74" v3="73"/> <t v1="71" v2="73" v3="70"/> -<v x="0.501284" y="0.452135" z="1.59658" nx="-0.956298" ny="0.180517" nz="0.229926"/> -<v x="0.502782" y="0.449914" z="1.60453" nx="-0.830103" ny="0.15482" nz="0.53563"/> +<v x="0.501284" y="0.635286" z="1.59658" nx="-0.956298" ny="0.180517" nz="0.229926"/> +<v x="0.502782" y="0.633065" z="1.60453" nx="-0.830103" ny="0.15482" nz="0.53563"/> <t v1="74" v2="76" v3="75"/> <t v1="74" v2="75" v3="73"/> -<v x="0.503609" y="0.457982" z="1.59658" nx="-0.684072" ny="0.657094" nz="0.316538"/> -<v x="0.505044" y="0.455627" z="1.60457" nx="-0.576312" ny="0.548967" nz="0.605335"/> +<v x="0.503609" y="0.641133" z="1.59658" nx="-0.684072" ny="0.657094" nz="0.316538"/> +<v x="0.505044" y="0.638778" z="1.60457" nx="-0.576312" ny="0.548967" nz="0.605335"/> <t v1="76" v2="78" v3="77"/> <t v1="76" v2="77" v3="75"/> -<v x="0.509216" y="0.460405" z="1.59658" nx="-0.192175" ny="0.930662" nz="0.311319"/> -<v x="0.510482" y="0.457999" z="1.60457" nx="-0.16306" ny="0.788385" nz="0.593158"/> +<v x="0.509216" y="0.643556" z="1.59658" nx="-0.192175" ny="0.930662" nz="0.311319"/> +<v x="0.510482" y="0.64115" z="1.60457" nx="-0.16306" ny="0.788385" nz="0.593158"/> <t v1="78" v2="80" v3="79"/> <t v1="78" v2="79" v3="77"/> -<v x="0.593275" y="0.460405" z="1.59658" nx="0.192175" ny="0.930662" nz="0.311319"/> -<v x="0.592009" y="0.457999" z="1.60457" nx="0.16306" ny="0.788385" nz="0.593158"/> +<v x="0.593275" y="0.643556" z="1.59658" nx="0.192175" ny="0.930662" nz="0.311319"/> +<v x="0.592009" y="0.64115" z="1.60457" nx="0.16306" ny="0.788385" nz="0.593158"/> <t v1="80" v2="82" v3="81"/> <t v1="80" v2="81" v3="79"/> -<v x="0.598882" y="0.457982" z="1.59658" nx="0.684103" ny="0.657094" nz="0.316507"/> -<v x="0.597448" y="0.455627" z="1.60457" nx="0.576342" ny="0.548967" nz="0.605335"/> +<v x="0.598882" y="0.641133" z="1.59658" nx="0.684103" ny="0.657094" nz="0.316507"/> +<v x="0.597448" y="0.638778" z="1.60457" nx="0.576342" ny="0.548967" nz="0.605335"/> <t v1="82" v2="84" v3="83"/> <t v1="82" v2="83" v3="81"/> -<v x="0.601206" y="0.452135" z="1.59658" nx="0.956328" ny="0.180486" nz="0.229865"/> -<v x="0.599709" y="0.449914" z="1.60453" nx="0.830134" ny="0.15482" nz="0.5356"/> +<v x="0.601206" y="0.635286" z="1.59658" nx="0.956328" ny="0.180486" nz="0.229865"/> +<v x="0.599709" y="0.633065" z="1.60453" nx="0.830134" ny="0.15482" nz="0.5356"/> <t v1="84" v2="86" v3="85"/> <t v1="84" v2="85" v3="83"/> -<v x="0.601206" y="0.239145" z="1.59658" nx="0.956298" ny="-0.180486" nz="0.229896"/> -<v x="0.599709" y="0.241367" z="1.60453" nx="0.830134" ny="-0.15479" nz="0.5356"/> +<v x="0.601206" y="0.422296" z="1.59658" nx="0.956298" ny="-0.180486" nz="0.229896"/> +<v x="0.599709" y="0.424518" z="1.60453" nx="0.830134" ny="-0.15479" nz="0.5356"/> <t v1="86" v2="88" v3="87"/> <t v1="86" v2="87" v3="85"/> -<v x="0.598882" y="0.233299" z="1.59658" nx="0.684103" ny="-0.657063" nz="0.316568"/> -<v x="0.597448" y="0.235655" z="1.60457" nx="0.576342" ny="-0.548967" nz="0.605335"/> +<v x="0.598882" y="0.41645" z="1.59658" nx="0.684103" ny="-0.657063" nz="0.316538"/> +<v x="0.597448" y="0.418806" z="1.60457" nx="0.576342" ny="-0.548967" nz="0.605335"/> <t v1="88" v2="90" v3="89"/> <t v1="88" v2="89" v3="87"/> -<v x="0.593275" y="0.230876" z="1.59658" nx="0.192206" ny="-0.930631" nz="0.31138"/> -<v x="0.592009" y="0.233283" z="1.60457" nx="0.16306" ny="-0.788354" nz="0.593188"/> +<v x="0.593275" y="0.414026" z="1.59658" nx="0.192206" ny="-0.930631" nz="0.31138"/> +<v x="0.592009" y="0.416434" z="1.60457" nx="0.16306" ny="-0.788354" nz="0.593188"/> <t v1="90" v2="92" v3="91"/> <t v1="90" v2="91" v3="89"/> <t v1="92" v2="72" v3="69"/> <t v1="92" v2="69" v3="91"/> <t v1="66" v2="71" v3="72"/> <t v1="66" v2="72" v3="65"/> -<v x="0.50526" y="0.242384" z="1.60664" nx="-0.324992" ny="-0.0594501" nz="0.943815"/> +<v x="0.50526" y="0.425535" z="1.60664" nx="-0.324992" ny="-0.0594501" nz="0.943815"/> <t v1="93" v2="74" v3="71"/> <t v1="93" v2="71" v3="66"/> -<v x="0.50526" y="0.448898" z="1.60664" nx="-0.324992" ny="0.0594806" nz="0.943815"/> +<v x="0.50526" y="0.632049" z="1.60664" nx="-0.324992" ny="0.0594806" nz="0.943815"/> <t v1="94" v2="76" v3="74"/> <t v1="94" v2="74" v3="93"/> -<v x="0.507015" y="0.453363" z="1.60664" nx="-0.21485" ny="0.201972" nz="0.955504"/> +<v x="0.507015" y="0.636514" z="1.60664" nx="-0.21485" ny="0.201972" nz="0.955504"/> <t v1="95" v2="78" v3="76"/> <t v1="95" v2="76" v3="94"/> -<v x="0.511228" y="0.455207" z="1.60664" nx="-0.0820948" ny="0.395886" nz="0.914609"/> +<v x="0.511228" y="0.638358" z="1.60664" nx="-0.0820948" ny="0.395886" nz="0.914609"/> <t v1="96" v2="80" v3="78"/> <t v1="96" v2="78" v3="95"/> -<v x="0.591263" y="0.455207" z="1.60664" nx="0.0820948" ny="0.395886" nz="0.914609"/> +<v x="0.591263" y="0.638358" z="1.60664" nx="0.0820948" ny="0.395886" nz="0.914609"/> <t v1="97" v2="82" v3="80"/> <t v1="97" v2="80" v3="96"/> -<v x="0.595477" y="0.453363" z="1.60664" nx="0.21485" ny="0.201972" nz="0.955504"/> +<v x="0.595477" y="0.636514" z="1.60664" nx="0.21485" ny="0.201972" nz="0.955504"/> <t v1="98" v2="84" v3="82"/> <t v1="98" v2="82" v3="97"/> -<v x="0.597232" y="0.448898" z="1.60664" nx="0.324992" ny="0.0594806" nz="0.943815"/> +<v x="0.597232" y="0.632049" z="1.60664" nx="0.324992" ny="0.0594806" nz="0.943815"/> <t v1="99" v2="86" v3="84"/> <t v1="99" v2="84" v3="98"/> -<v x="0.597232" y="0.242384" z="1.60664" nx="0.324992" ny="-0.0594501" nz="0.943815"/> +<v x="0.597232" y="0.425535" z="1.60664" nx="0.324992" ny="-0.0594501" nz="0.943815"/> <t v1="100" v2="88" v3="86"/> <t v1="100" v2="86" v3="99"/> <t v1="67" v2="90" v3="88"/> @@ -243,71 +243,71 @@ <t v1="100" v2="94" v3="93"/> <t v1="67" v2="100" v3="93"/> <t v1="67" v2="93" v3="66"/> -<v x="-0.417867" y="0.329975" z="-1.68252" nx="0.212989" ny="0.0891751" nz="-0.972961"/> -<v x="-0.447431" y="0.317659" z="-1.69012" nx="0.14716" ny="0.0615864" nz="-0.987182"/> -<v x="-0.443612" y="0.298776" z="-1.69012" nx="0.159459" ny="0" nz="-0.987182"/> -<v x="-0.411559" y="0.298776" z="-1.68252" nx="0.23072" ny="0" nz="-0.972991"/> +<v x="-0.417867" y="0.513126" z="-1.68252" nx="0.212989" ny="0.0891751" nz="-0.972961"/> +<v x="-0.447431" y="0.50081" z="-1.69012" nx="0.14716" ny="0.0615864" nz="-0.987182"/> +<v x="-0.443612" y="0.481927" z="-1.69012" nx="0.159459" ny="0" nz="-0.987182"/> +<v x="-0.411559" y="0.481927" z="-1.68252" nx="0.23072" ny="0" nz="-0.972991"/> <t v1="104" v2="103" v3="102"/> <t v1="104" v2="102" v3="101"/> -<v x="-0.447431" y="0.279893" z="-1.69012" nx="0.14716" ny="-0.0615864" nz="-0.987182"/> -<v x="-0.417867" y="0.267576" z="-1.68252" nx="0.212989" ny="-0.0891751" nz="-0.972961"/> +<v x="-0.447431" y="0.463043" z="-1.69012" nx="0.14716" ny="-0.0615864" nz="-0.987182"/> +<v x="-0.417867" y="0.450726" z="-1.68252" nx="0.212989" ny="-0.0891751" nz="-0.972961"/> <t v1="106" v2="105" v3="103"/> <t v1="106" v2="103" v3="104"/> -<v x="-0.457665" y="0.264718" z="-1.69012" nx="0.112888" ny="-0.112888" nz="-0.987152"/> -<v x="-0.435049" y="0.242102" z="-1.68252" nx="0.163488" ny="-0.163488" nz="-0.972869"/> +<v x="-0.457665" y="0.447869" z="-1.69012" nx="0.112888" ny="-0.112888" nz="-0.987152"/> +<v x="-0.435049" y="0.425253" z="-1.68252" nx="0.163488" ny="-0.163488" nz="-0.972869"/> <t v1="108" v2="107" v3="105"/> <t v1="108" v2="105" v3="106"/> -<v x="-0.472839" y="0.254484" z="-1.69012" nx="0.0615864" ny="-0.14716" nz="-0.987182"/> -<v x="-0.460523" y="0.22492" z="-1.68252" nx="0.0891751" ny="-0.213019" nz="-0.972961"/> +<v x="-0.472839" y="0.437634" z="-1.69012" nx="0.0615864" ny="-0.14716" nz="-0.987182"/> +<v x="-0.460523" y="0.408071" z="-1.68252" nx="0.0891751" ny="-0.213019" nz="-0.972961"/> <t v1="110" v2="109" v3="107"/> <t v1="110" v2="107" v3="108"/> -<v x="-0.491723" y="0.250665" z="-1.69012" nx="0" ny="-0.159459" nz="-0.987182"/> -<v x="-0.491723" y="0.218612" z="-1.68252" nx="0" ny="-0.23075" nz="-0.972991"/> +<v x="-0.491723" y="0.433816" z="-1.69012" nx="0" ny="-0.159459" nz="-0.987182"/> +<v x="-0.491723" y="0.401763" z="-1.68252" nx="0" ny="-0.23075" nz="-0.972991"/> <t v1="112" v2="111" v3="109"/> <t v1="112" v2="109" v3="110"/> -<v x="-0.510606" y="0.254484" z="-1.69012" nx="-0.0615864" ny="-0.14716" nz="-0.987182"/> -<v x="-0.522922" y="0.22492" z="-1.68252" nx="-0.0891751" ny="-0.213019" nz="-0.972961"/> +<v x="-0.510606" y="0.437634" z="-1.69012" nx="-0.0615864" ny="-0.14716" nz="-0.987182"/> +<v x="-0.522922" y="0.408071" z="-1.68252" nx="-0.0891751" ny="-0.213019" nz="-0.972961"/> <t v1="114" v2="113" v3="111"/> <t v1="114" v2="111" v3="112"/> -<v x="-0.52578" y="0.264718" z="-1.69012" nx="-0.112888" ny="-0.112888" nz="-0.987152"/> -<v x="-0.548396" y="0.242102" z="-1.68252" nx="-0.163488" ny="-0.163488" nz="-0.972869"/> +<v x="-0.52578" y="0.447869" z="-1.69012" nx="-0.112888" ny="-0.112888" nz="-0.987152"/> +<v x="-0.548396" y="0.425253" z="-1.68252" nx="-0.163488" ny="-0.163488" nz="-0.972869"/> <t v1="116" v2="115" v3="113"/> <t v1="116" v2="113" v3="114"/> -<v x="-0.536014" y="0.279893" z="-1.69012" nx="-0.14716" ny="-0.0615864" nz="-0.987182"/> -<v x="-0.565579" y="0.267576" z="-1.68252" nx="-0.212989" ny="-0.0891751" nz="-0.972961"/> +<v x="-0.536014" y="0.463043" z="-1.69012" nx="-0.14716" ny="-0.0615864" nz="-0.987182"/> +<v x="-0.565579" y="0.450726" z="-1.68252" nx="-0.212989" ny="-0.0891751" nz="-0.972961"/> <t v1="118" v2="117" v3="115"/> <t v1="118" v2="115" v3="116"/> -<v x="-0.539833" y="0.298776" z="-1.69012" nx="-0.159459" ny="0" nz="-0.987182"/> -<v x="-0.571887" y="0.298776" z="-1.68252" nx="-0.23072" ny="0" nz="-0.972991"/> +<v x="-0.539833" y="0.481927" z="-1.69012" nx="-0.159459" ny="0" nz="-0.987182"/> +<v x="-0.571887" y="0.481927" z="-1.68252" nx="-0.23072" ny="0" nz="-0.972991"/> <t v1="120" v2="119" v3="117"/> <t v1="120" v2="117" v3="118"/> -<v x="-0.536014" y="0.317659" z="-1.69012" nx="-0.14716" ny="0.0615864" nz="-0.987182"/> -<v x="-0.565579" y="0.329975" z="-1.68252" nx="-0.212989" ny="0.0891751" nz="-0.972961"/> +<v x="-0.536014" y="0.50081" z="-1.69012" nx="-0.14716" ny="0.0615864" nz="-0.987182"/> +<v x="-0.565579" y="0.513126" z="-1.68252" nx="-0.212989" ny="0.0891751" nz="-0.972961"/> <t v1="122" v2="121" v3="119"/> <t v1="122" v2="119" v3="120"/> -<v x="-0.52578" y="0.332833" z="-1.69012" nx="-0.112888" ny="0.112888" nz="-0.987152"/> -<v x="-0.548396" y="0.355449" z="-1.68252" nx="-0.163488" ny="0.163488" nz="-0.9729"/> +<v x="-0.52578" y="0.515984" z="-1.69012" nx="-0.112888" ny="0.112888" nz="-0.987152"/> +<v x="-0.548396" y="0.5386" z="-1.68252" nx="-0.163488" ny="0.163488" nz="-0.9729"/> <t v1="124" v2="123" v3="121"/> <t v1="124" v2="121" v3="122"/> -<v x="-0.510606" y="0.343068" z="-1.69012" nx="-0.0615864" ny="0.14713" nz="-0.987182"/> -<v x="-0.522922" y="0.372632" z="-1.68252" nx="-0.0891751" ny="0.212989" nz="-0.972961"/> +<v x="-0.510606" y="0.526219" z="-1.69012" nx="-0.0615864" ny="0.14713" nz="-0.987182"/> +<v x="-0.522922" y="0.555783" z="-1.68252" nx="-0.0891751" ny="0.212989" nz="-0.972961"/> <t v1="126" v2="125" v3="123"/> <t v1="126" v2="123" v3="124"/> -<v x="-0.491723" y="0.346886" z="-1.69012" nx="0" ny="0.159459" nz="-0.987182"/> -<v x="-0.491723" y="0.37894" z="-1.68252" nx="0" ny="0.23072" nz="-0.972991"/> +<v x="-0.491723" y="0.530036" z="-1.69012" nx="0" ny="0.159459" nz="-0.987182"/> +<v x="-0.491723" y="0.562091" z="-1.68252" nx="0" ny="0.23072" nz="-0.972991"/> <t v1="128" v2="127" v3="125"/> <t v1="128" v2="125" v3="126"/> -<v x="-0.472839" y="0.343068" z="-1.69012" nx="0.0615864" ny="0.14713" nz="-0.987182"/> -<v x="-0.460523" y="0.372632" z="-1.68252" nx="0.0891751" ny="0.212989" nz="-0.972961"/> +<v x="-0.472839" y="0.526219" z="-1.69012" nx="0.0615864" ny="0.14713" nz="-0.987182"/> +<v x="-0.460523" y="0.555783" z="-1.68252" nx="0.0891751" ny="0.212989" nz="-0.972961"/> <t v1="130" v2="129" v3="127"/> <t v1="130" v2="127" v3="128"/> -<v x="-0.457665" y="0.332833" z="-1.69012" nx="0.112888" ny="0.112888" nz="-0.987152"/> -<v x="-0.435049" y="0.355449" z="-1.68252" nx="0.163488" ny="0.163488" nz="-0.9729"/> +<v x="-0.457665" y="0.515984" z="-1.69012" nx="0.112888" ny="0.112888" nz="-0.987152"/> +<v x="-0.435049" y="0.5386" z="-1.68252" nx="0.163488" ny="0.163488" nz="-0.9729"/> <t v1="132" v2="131" v3="129"/> <t v1="132" v2="129" v3="130"/> <t v1="101" v2="102" v3="131"/> <t v1="101" v2="131" v3="132"/> -<v x="-0.491723" y="0.298776" z="-1.69434" nx="0" ny="0" nz="-1"/> +<v x="-0.491723" y="0.481927" z="-1.69434" nx="0" ny="0" nz="-1"/> <t v1="103" v2="133" v3="102"/> <t v1="105" v2="133" v3="103"/> <t v1="107" v2="133" v3="105"/> @@ -324,84 +324,84 @@ <t v1="129" v2="133" v3="127"/> <t v1="131" v2="133" v3="129"/> <t v1="102" v2="133" v3="131"/> -<v x="-0.511228" y="0.236075" z="1.60664" nx="0.0820948" ny="-0.395856" nz="0.914609"/> -<v x="-0.591263" y="0.236075" z="1.60664" nx="-0.0820948" ny="-0.395856" nz="0.914609"/> -<v x="-0.595476" y="0.237918" z="1.60664" nx="-0.21485" ny="-0.201941" nz="0.955504"/> -<v x="-0.507014" y="0.237918" z="1.60664" nx="0.21485" ny="-0.201941" nz="0.955535"/> +<v x="-0.511228" y="0.419226" z="1.60664" nx="0.0820948" ny="-0.395856" nz="0.914609"/> +<v x="-0.591263" y="0.419226" z="1.60664" nx="-0.0820948" ny="-0.395856" nz="0.914609"/> +<v x="-0.595476" y="0.421069" z="1.60664" nx="-0.21485" ny="-0.201941" nz="0.955504"/> +<v x="-0.507014" y="0.421069" z="1.60664" nx="0.21485" ny="-0.201941" nz="0.955535"/> <t v1="137" v2="136" v3="135"/> <t v1="137" v2="135" v3="134"/> -<v x="-0.509216" y="0.230875" z="1.59658" nx="0.192175" ny="-0.930631" nz="0.31138"/> -<v x="-0.510482" y="0.233283" z="1.60457" nx="0.16306" ny="-0.788354" nz="0.593188"/> -<v x="-0.505043" y="0.235655" z="1.60457" nx="0.576342" ny="-0.548967" nz="0.605335"/> -<v x="-0.503609" y="0.233299" z="1.59658" nx="0.684103" ny="-0.657063" nz="0.316538"/> +<v x="-0.509216" y="0.414026" z="1.59658" nx="0.192175" ny="-0.930631" nz="0.31138"/> +<v x="-0.510482" y="0.416434" z="1.60457" nx="0.16306" ny="-0.788354" nz="0.593188"/> +<v x="-0.505043" y="0.418806" z="1.60457" nx="0.576342" ny="-0.548967" nz="0.605335"/> +<v x="-0.503609" y="0.41645" z="1.59658" nx="0.684103" ny="-0.657063" nz="0.316538"/> <t v1="141" v2="140" v3="139"/> <t v1="141" v2="139" v3="138"/> -<v x="-0.502782" y="0.241367" z="1.60453" nx="0.830134" ny="-0.15479" nz="0.5356"/> -<v x="-0.501285" y="0.239145" z="1.59658" nx="0.956298" ny="-0.180486" nz="0.229896"/> +<v x="-0.502782" y="0.424518" z="1.60453" nx="0.830134" ny="-0.15479" nz="0.5356"/> +<v x="-0.501285" y="0.422296" z="1.59658" nx="0.956298" ny="-0.180486" nz="0.229896"/> <t v1="143" v2="142" v3="140"/> <t v1="143" v2="140" v3="141"/> -<v x="-0.502782" y="0.449914" z="1.60453" nx="0.830134" ny="0.15482" nz="0.5356"/> -<v x="-0.501285" y="0.452135" z="1.59658" nx="0.956328" ny="0.180486" nz="0.229865"/> +<v x="-0.502782" y="0.633065" z="1.60453" nx="0.830134" ny="0.15482" nz="0.5356"/> +<v x="-0.501285" y="0.635286" z="1.59658" nx="0.956328" ny="0.180486" nz="0.229865"/> <t v1="145" v2="144" v3="142"/> <t v1="145" v2="142" v3="143"/> -<v x="-0.505043" y="0.455627" z="1.60457" nx="0.576342" ny="0.548967" nz="0.605304"/> -<v x="-0.503609" y="0.457982" z="1.59658" nx="0.684103" ny="0.657094" nz="0.316507"/> +<v x="-0.505043" y="0.638778" z="1.60457" nx="0.576342" ny="0.548967" nz="0.605304"/> +<v x="-0.503609" y="0.641133" z="1.59658" nx="0.684103" ny="0.657094" nz="0.316507"/> <t v1="147" v2="146" v3="144"/> <t v1="147" v2="144" v3="145"/> -<v x="-0.510482" y="0.457999" z="1.60457" nx="0.16306" ny="0.788385" nz="0.593127"/> -<v x="-0.509216" y="0.460405" z="1.59658" nx="0.192145" ny="0.930662" nz="0.311289"/> +<v x="-0.510482" y="0.64115" z="1.60457" nx="0.16306" ny="0.788385" nz="0.593127"/> +<v x="-0.509216" y="0.643556" z="1.59658" nx="0.192145" ny="0.930662" nz="0.311289"/> <t v1="149" v2="148" v3="146"/> <t v1="149" v2="146" v3="147"/> -<v x="-0.592009" y="0.457999" z="1.60457" nx="-0.16306" ny="0.788385" nz="0.593127"/> -<v x="-0.593275" y="0.460405" z="1.59658" nx="-0.192175" ny="0.930662" nz="0.311319"/> +<v x="-0.592009" y="0.64115" z="1.60457" nx="-0.16306" ny="0.788385" nz="0.593127"/> +<v x="-0.593275" y="0.643556" z="1.59658" nx="-0.192175" ny="0.930662" nz="0.311289"/> <t v1="151" v2="150" v3="148"/> <t v1="151" v2="148" v3="149"/> -<v x="-0.597447" y="0.455627" z="1.60457" nx="-0.576312" ny="0.548997" nz="0.605335"/> -<v x="-0.598882" y="0.457982" z="1.59658" nx="-0.684072" ny="0.657094" nz="0.316538"/> +<v x="-0.597447" y="0.638778" z="1.60457" nx="-0.576312" ny="0.548997" nz="0.605335"/> +<v x="-0.598882" y="0.641133" z="1.59658" nx="-0.684072" ny="0.657094" nz="0.316538"/> <t v1="153" v2="152" v3="150"/> <t v1="153" v2="150" v3="151"/> -<v x="-0.599709" y="0.449914" z="1.60453" nx="-0.830103" ny="0.15482" nz="0.53563"/> -<v x="-0.601206" y="0.452135" z="1.59658" nx="-0.956298" ny="0.180517" nz="0.229957"/> +<v x="-0.599709" y="0.633065" z="1.60453" nx="-0.830103" ny="0.15482" nz="0.53563"/> +<v x="-0.601206" y="0.635286" z="1.59658" nx="-0.956298" ny="0.180517" nz="0.229957"/> <t v1="155" v2="154" v3="152"/> <t v1="155" v2="152" v3="153"/> -<v x="-0.599709" y="0.241367" z="1.60453" nx="-0.830103" ny="-0.15482" nz="0.535661"/> -<v x="-0.601206" y="0.239145" z="1.59658" nx="-0.956298" ny="-0.180517" nz="0.229957"/> +<v x="-0.599709" y="0.424518" z="1.60453" nx="-0.830103" ny="-0.15482" nz="0.535661"/> +<v x="-0.601206" y="0.422296" z="1.59658" nx="-0.956298" ny="-0.180517" nz="0.229957"/> <t v1="157" v2="156" v3="154"/> <t v1="157" v2="154" v3="155"/> -<v x="-0.597447" y="0.235655" z="1.60457" nx="-0.576312" ny="-0.548967" nz="0.605335"/> -<v x="-0.598882" y="0.233299" z="1.59658" nx="-0.684103" ny="-0.657063" nz="0.316568"/> +<v x="-0.597447" y="0.418806" z="1.60457" nx="-0.576312" ny="-0.548967" nz="0.605335"/> +<v x="-0.598882" y="0.41645" z="1.59658" nx="-0.684103" ny="-0.657063" nz="0.316568"/> <t v1="159" v2="158" v3="156"/> <t v1="159" v2="156" v3="157"/> -<v x="-0.592009" y="0.233283" z="1.60457" nx="-0.16306" ny="-0.788354" nz="0.593188"/> -<v x="-0.593275" y="0.230875" z="1.59658" nx="-0.192175" ny="-0.930631" nz="0.31138"/> +<v x="-0.592009" y="0.416434" z="1.60457" nx="-0.16306" ny="-0.788354" nz="0.593188"/> +<v x="-0.593275" y="0.414026" z="1.59658" nx="-0.192175" ny="-0.930631" nz="0.31138"/> <t v1="161" v2="160" v3="158"/> <t v1="161" v2="158" v3="159"/> <t v1="138" v2="139" v3="160"/> <t v1="138" v2="160" v3="161"/> <t v1="139" v2="140" v3="137"/> <t v1="139" v2="137" v3="134"/> -<v x="-0.505259" y="0.242384" z="1.60664" nx="0.324992" ny="-0.0594806" nz="0.943815"/> +<v x="-0.505259" y="0.425535" z="1.60664" nx="0.324992" ny="-0.0594806" nz="0.943815"/> <t v1="140" v2="142" v3="162"/> <t v1="140" v2="162" v3="137"/> -<v x="-0.505259" y="0.448898" z="1.60664" nx="0.324992" ny="0.0594806" nz="0.943815"/> +<v x="-0.505259" y="0.632049" z="1.60664" nx="0.324992" ny="0.0594806" nz="0.943815"/> <t v1="142" v2="144" v3="163"/> <t v1="142" v2="163" v3="162"/> -<v x="-0.507014" y="0.453363" z="1.60664" nx="0.21485" ny="0.201941" nz="0.955504"/> +<v x="-0.507014" y="0.636514" z="1.60664" nx="0.21485" ny="0.201941" nz="0.955504"/> <t v1="144" v2="146" v3="164"/> <t v1="144" v2="164" v3="163"/> -<v x="-0.511228" y="0.455207" z="1.60664" nx="0.0820948" ny="0.395886" nz="0.914609"/> +<v x="-0.511228" y="0.638358" z="1.60664" nx="0.0820948" ny="0.395886" nz="0.914609"/> <t v1="146" v2="148" v3="165"/> <t v1="146" v2="165" v3="164"/> -<v x="-0.591263" y="0.455207" z="1.60664" nx="-0.0820948" ny="0.395886" nz="0.914609"/> +<v x="-0.591263" y="0.638358" z="1.60664" nx="-0.0820948" ny="0.395886" nz="0.914609"/> <t v1="148" v2="150" v3="166"/> <t v1="148" v2="166" v3="165"/> -<v x="-0.595476" y="0.453363" z="1.60664" nx="-0.21485" ny="0.201972" nz="0.955504"/> +<v x="-0.595476" y="0.636514" z="1.60664" nx="-0.21485" ny="0.201972" nz="0.955504"/> <t v1="150" v2="152" v3="167"/> <t v1="150" v2="167" v3="166"/> -<v x="-0.597231" y="0.448898" z="1.60664" nx="-0.324992" ny="0.0594806" nz="0.943815"/> +<v x="-0.597231" y="0.632049" z="1.60664" nx="-0.324992" ny="0.0594806" nz="0.943815"/> <t v1="152" v2="154" v3="168"/> <t v1="152" v2="168" v3="167"/> -<v x="-0.597231" y="0.242384" z="1.60664" nx="-0.324992" ny="-0.0594806" nz="0.943815"/> +<v x="-0.597231" y="0.425535" z="1.60664" nx="-0.324992" ny="-0.0594806" nz="0.943815"/> <t v1="154" v2="156" v3="169"/> <t v1="154" v2="169" v3="168"/> <t v1="156" v2="158" v3="136"/> @@ -418,52 +418,52 @@ <t v1="163" v2="169" v3="162"/> <t v1="162" v2="169" v3="136"/> <t v1="162" v2="136" v3="137"/> -<v x="-0.401293" y="0.063934" z="1.37252" nx="0.760979" ny="0.580645" nz="0.289315"/> -<v x="-0.401293" y="0.0483563" z="1.38226" nx="0.4738" ny="0.15772" nz="0.866359"/> -<v x="-0.451579" y="0.0483563" z="1.38226" nx="-0.4738" ny="0.15772" nz="0.866359"/> -<v x="-0.451579" y="0.063934" z="1.37252" nx="-0.760979" ny="0.580645" nz="0.289315"/> +<v x="-0.401293" y="0.247085" z="1.37252" nx="0.760979" ny="0.580645" nz="0.289315"/> +<v x="-0.401293" y="0.231507" z="1.38226" nx="0.4738" ny="0.15772" nz="0.866359"/> +<v x="-0.451579" y="0.231507" z="1.38226" nx="-0.4738" ny="0.15772" nz="0.866359"/> +<v x="-0.451579" y="0.247085" z="1.37252" nx="-0.760979" ny="0.580645" nz="0.289315"/> <t v1="173" v2="172" v3="171"/> <t v1="173" v2="171" v3="170"/> -<v x="-0.401293" y="0.0283499" z="1.37824" nx="0.747551" ny="-0.415082" nz="0.518509"/> -<v x="-0.451579" y="0.0283499" z="1.37824" nx="-0.747551" ny="-0.415082" nz="0.518509"/> +<v x="-0.401293" y="0.211501" z="1.37824" nx="0.747551" ny="-0.415082" nz="0.518509"/> +<v x="-0.451579" y="0.211501" z="1.37824" nx="-0.747551" ny="-0.415082" nz="0.518509"/> <t v1="172" v2="175" v3="174"/> <t v1="172" v2="174" v3="171"/> -<v x="-0.401293" y="0.0197383" z="1.3589" nx="0.750511" ny="-0.658956" nz="-0.0494705"/> -<v x="-0.451579" y="0.0197383" z="1.3589" nx="-0.750511" ny="-0.658956" nz="-0.0494705"/> +<v x="-0.401293" y="0.202889" z="1.3589" nx="0.750511" ny="-0.658956" nz="-0.0494705"/> +<v x="-0.451579" y="0.202889" z="1.3589" nx="-0.750511" ny="-0.658956" nz="-0.0494705"/> <t v1="175" v2="177" v3="176"/> <t v1="175" v2="176" v3="174"/> -<v x="-0.401293" y="0.0316583" z="1.34026" nx="0.744835" ny="-0.66332" nz="-0.0720542"/> -<v x="-0.451579" y="0.0316583" z="1.34026" nx="-0.744835" ny="-0.66332" nz="-0.0720542"/> +<v x="-0.401293" y="0.214809" z="1.34026" nx="0.744835" ny="-0.66332" nz="-0.0720542"/> +<v x="-0.451579" y="0.214809" z="1.34026" nx="-0.744835" ny="-0.66332" nz="-0.0720542"/> <t v1="177" v2="179" v3="178"/> <t v1="177" v2="178" v3="176"/> -<v x="-0.401293" y="-0.0134422" z="1.21762" nx="0.707266" ny="-0.670949" nz="0.222602"/> -<v x="-0.451579" y="-0.0134422" z="1.21762" nx="-0.707266" ny="-0.670949" nz="0.222602"/> +<v x="-0.401293" y="0.169709" z="1.21762" nx="0.707266" ny="-0.670949" nz="0.222602"/> +<v x="-0.451579" y="0.169709" z="1.21762" nx="-0.707266" ny="-0.670949" nz="0.222602"/> <t v1="179" v2="181" v3="180"/> <t v1="179" v2="180" v3="178"/> -<v x="-0.401293" y="-0.0638308" z="1.0477" nx="0.707205" ny="-0.682852" nz="0.183111"/> -<v x="-0.451579" y="-0.0638308" z="1.0477" nx="-0.707205" ny="-0.682852" nz="0.183111"/> +<v x="-0.401293" y="0.11932" z="1.0477" nx="0.707205" ny="-0.682852" nz="0.183111"/> +<v x="-0.451579" y="0.11932" z="1.0477" nx="-0.707205" ny="-0.682852" nz="0.183111"/> <t v1="181" v2="183" v3="182"/> <t v1="181" v2="182" v3="180"/> -<v x="-0.401293" y="-0.0906566" z="0.936029" nx="0.707083" ny="-0.687521" nz="0.165136"/> -<v x="-0.451579" y="-0.0906566" z="0.936029" nx="-0.707083" ny="-0.687521" nz="0.165136"/> +<v x="-0.401293" y="0.0924944" z="0.936029" nx="0.707083" ny="-0.687521" nz="0.165136"/> +<v x="-0.451579" y="0.0924944" z="0.936029" nx="-0.707083" ny="-0.687521" nz="0.165136"/> <t v1="183" v2="185" v3="184"/> <t v1="183" v2="184" v3="182"/> -<v x="-0.401293" y="-0.0477991" z="0.931504" nx="0.707083" ny="0.695883" nz="-0.125431"/> -<v x="-0.401293" y="-0.0276645" z="1.04319" nx="0.707175" ny="0.692984" nz="-0.140049"/> -<v x="-0.451579" y="-0.0276645" z="1.04319" nx="-0.707175" ny="0.692984" nz="-0.140049"/> -<v x="-0.451579" y="-0.0477991" z="0.931504" nx="-0.707083" ny="0.695883" nz="-0.125431"/> +<v x="-0.401293" y="0.135352" z="0.931504" nx="0.707083" ny="0.695883" nz="-0.125431"/> +<v x="-0.401293" y="0.155486" z="1.04319" nx="0.707175" ny="0.692984" nz="-0.140049"/> +<v x="-0.451579" y="0.155486" z="1.04319" nx="-0.707175" ny="0.692984" nz="-0.140049"/> +<v x="-0.451579" y="0.135352" z="0.931504" nx="-0.707083" ny="0.695883" nz="-0.125431"/> <t v1="189" v2="188" v3="187"/> <t v1="189" v2="187" v3="186"/> -<v x="-0.401293" y="0.0108892" z="1.21519" nx="0.707358" ny="0.683248" nz="-0.181005"/> -<v x="-0.451579" y="0.0108892" z="1.21519" nx="-0.707358" ny="0.683248" nz="-0.181005"/> +<v x="-0.401293" y="0.19404" z="1.21519" nx="0.707358" ny="0.683248" nz="-0.181005"/> +<v x="-0.451579" y="0.19404" z="1.21519" nx="-0.707358" ny="0.683248" nz="-0.181005"/> <t v1="188" v2="191" v3="190"/> <t v1="188" v2="190" v3="187"/> -<v x="-0.401293" y="0.048532" z="1.33799" nx="0.717795" ny="0.595965" nz="-0.359935"/> -<v x="-0.451579" y="0.048532" z="1.33799" nx="-0.717795" ny="0.595965" nz="-0.359935"/> +<v x="-0.401293" y="0.231683" z="1.33799" nx="0.717795" ny="0.595965" nz="-0.359935"/> +<v x="-0.451579" y="0.231683" z="1.33799" nx="-0.717795" ny="0.595965" nz="-0.359935"/> <t v1="191" v2="193" v3="192"/> <t v1="191" v2="192" v3="190"/> -<v x="-0.401293" y="0.0620773" z="1.35143" nx="0.728935" ny="0.6198" nz="-0.290658"/> -<v x="-0.451579" y="0.0620773" z="1.35143" nx="-0.728935" ny="0.6198" nz="-0.290658"/> +<v x="-0.401293" y="0.245228" z="1.35143" nx="0.728935" ny="0.6198" nz="-0.290658"/> +<v x="-0.451579" y="0.245228" z="1.35143" nx="-0.728935" ny="0.6198" nz="-0.290658"/> <t v1="193" v2="195" v3="194"/> <t v1="193" v2="194" v3="192"/> <t v1="195" v2="173" v3="170"/> @@ -490,415 +490,415 @@ <t v1="177" v2="173" v3="195"/> <t v1="174" v2="170" v3="171"/> <t v1="175" v2="172" v3="173"/> -<v x="0.686119" y="0.298113" z="-1.21941" nx="0" ny="-0.99881" nz="-0.0483718"/> -<v x="0.686119" y="0.298112" z="-1.3175" nx="0" ny="-0.998016" nz="0.0628376"/> -<v x="0.673237" y="0.298112" z="-1.3175" nx="-0.466536" ny="-0.882656" nz="0.0566729"/> -<v x="0.673237" y="0.298113" z="-1.21941" nx="-0.467116" ny="-0.883206" nz="-0.0416578"/> +<v x="0.686119" y="0.481263" z="-1.21941" nx="0" ny="-0.99881" nz="-0.0483718"/> +<v x="0.686119" y="0.481263" z="-1.3175" nx="0" ny="-0.998016" nz="0.0628376"/> +<v x="0.673237" y="0.481263" z="-1.3175" nx="-0.466536" ny="-0.882656" nz="0.0566729"/> +<v x="0.673237" y="0.481263" z="-1.21941" nx="-0.467116" ny="-0.883206" nz="-0.0416578"/> <t v1="199" v2="198" v3="197"/> <t v1="199" v2="197" v3="196"/> -<v x="0.68605" y="0.290285" z="-1.3794" nx="0" ny="-0.982788" nz="0.184698"/> -<v x="0.673169" y="0.290285" z="-1.3794" nx="-0.451949" ny="-0.874325" nz="0.176733"/> +<v x="0.68605" y="0.473436" z="-1.3794" nx="0" ny="-0.982788" nz="0.184698"/> +<v x="0.673169" y="0.473436" z="-1.3794" nx="-0.451949" ny="-0.874325" nz="0.176733"/> <t v1="198" v2="201" v3="200"/> <t v1="198" v2="200" v3="197"/> -<v x="0.686074" y="0.292804" z="-1.16474" nx="0" ny="-0.990143" nz="-0.139958"/> -<v x="0.673193" y="0.292804" z="-1.16474" nx="-0.462325" ny="-0.877041" nz="-0.130345"/> +<v x="0.686074" y="0.475955" z="-1.16474" nx="0" ny="-0.990143" nz="-0.139958"/> +<v x="0.673193" y="0.475955" z="-1.16474" nx="-0.462325" ny="-0.877041" nz="-0.130345"/> <t v1="203" v2="199" v3="196"/> <t v1="203" v2="196" v3="202"/> -<v x="0.685971" y="0.283425" z="-1.11436" nx="0" ny="-0.976226" nz="-0.216651"/> -<v x="0.673092" y="0.283425" z="-1.11437" nx="-0.450728" ny="-0.869991" nz="-0.199774"/> +<v x="0.685971" y="0.466576" z="-1.11436" nx="0" ny="-0.976226" nz="-0.216651"/> +<v x="0.673092" y="0.466576" z="-1.11437" nx="-0.450728" ny="-0.8699... [truncated message content] |
From: <cf...@us...> - 2007-10-01 12:45:36
|
Revision: 1155 http://automanic.svn.sourceforge.net/automanic/?rev=1155&view=rev Author: cfraz89 Date: 2007-10-01 05:45:38 -0700 (Mon, 01 Oct 2007) Log Message: ----------- mmm Modified Paths: -------------- trunk/ioData/vehicles/Van/entities_world Modified: trunk/ioData/vehicles/Van/entities_world =================================================================== --- trunk/ioData/vehicles/Van/entities_world 2007-10-01 12:44:51 UTC (rev 1154) +++ trunk/ioData/vehicles/Van/entities_world 2007-10-01 12:45:38 UTC (rev 1155) @@ -88,8 +88,8 @@ <par float="0.2" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="1.0" name="enginepower"/> - <par float="1.0" name="leftsteersensitivity"/> - <par float="0.8" name="rightsteersensitivity"/> + <par float="0.0" name="leftsteersensitivity"/> + <par float="0.0" name="rightsteersensitivity"/> <par float="1.3" name="friction"/> <par float="0.0000065" name="slip"/> <par float="15.0" name="mass"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cf...@us...> - 2007-10-01 12:44:49
|
Revision: 1154 http://automanic.svn.sourceforge.net/automanic/?rev=1154&view=rev Author: cfraz89 Date: 2007-10-01 05:44:51 -0700 (Mon, 01 Oct 2007) Log Message: ----------- mmm Modified Paths: -------------- trunk/ioData/client/ioEntityManagerClient.py trunk/ioData/scripts/ioNetworkEntCl.py trunk/ioData/server/game/ioGameServer.py trunk/ioData/vehicles/Van/entities_world trunk/ioData/vehicles/falcon/entities_world trunk/ioData/vehicles/fedex/entities_world trunk/ioData/vehicles/strider/entities_world trunk/ioData/vehicles/trekker/entities_world Modified: trunk/ioData/client/ioEntityManagerClient.py =================================================================== --- trunk/ioData/client/ioEntityManagerClient.py 2007-10-01 12:24:49 UTC (rev 1153) +++ trunk/ioData/client/ioEntityManagerClient.py 2007-10-01 12:44:51 UTC (rev 1154) @@ -14,7 +14,7 @@ def __init__(self, celEntity): self.entity = celEntity self.entities = [] - self.numbots = 1 + self.numbots = 0 self.net = ioNetHelper.ioNetHelper() Modified: trunk/ioData/scripts/ioNetworkEntCl.py =================================================================== --- trunk/ioData/scripts/ioNetworkEntCl.py 2007-10-01 12:24:49 UTC (rev 1153) +++ trunk/ioData/scripts/ioNetworkEntCl.py 2007-10-01 12:44:51 UTC (rev 1154) @@ -26,8 +26,8 @@ def __init__(self, celEntity): ioNetworkEntBase.__init__(self, celEntity) - self.timer.WakeUp(10000, True, 'send_rot') - self.timer.WakeUp(20000, True, 'send_pos') + self.timer.WakeUp(12, True, 'send_rot') + self.timer.WakeUp(25, True, 'send_pos') #Register or unregister from the network. def setregistered(self, pc, args): Modified: trunk/ioData/server/game/ioGameServer.py =================================================================== --- trunk/ioData/server/game/ioGameServer.py 2007-10-01 12:24:49 UTC (rev 1153) +++ trunk/ioData/server/game/ioGameServer.py 2007-10-01 12:44:51 UTC (rev 1154) @@ -15,7 +15,7 @@ ioServerBase.__init__(self, celEntity) if self.bindport(1828): #We need less sleeptime to keep ode synced better - self.sleeptime = 0.0 + self.sleeptime = 0.015 self.servertime = 0 #Used for compatibility testing Modified: trunk/ioData/vehicles/Van/entities_world =================================================================== --- trunk/ioData/vehicles/Van/entities_world 2007-10-01 12:24:49 UTC (rev 1153) +++ trunk/ioData/vehicles/Van/entities_world 2007-10-01 12:44:51 UTC (rev 1154) @@ -101,14 +101,14 @@ <!--Rear Right Wheel--> <action name="AddWheel"> <par vector="-0.55,0,1.1" name="position"/> - <par float="0.0" name="turnspeed"/> - <par float="0.0" name="returnspeed"/> + <par float="2.0" name="turnspeed"/> + <par float="2.0" name="returnspeed"/> <par float="0.00025" name="suspensionsoftness"/> <par float="0.2" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="1.0" name="enginepower"/> - <par float="0.8" name="leftsteersensitivity"/> - <par float="1.0" name="rightsteersensitivity"/> + <par float="0.0" name="leftsteersensitivity"/> + <par float="0.0" name="rightsteersensitivity"/> <par float="1.3" name="friction"/> <par float="0.0000065" name="slip"/> <par float="15.0" name="mass"/> Modified: trunk/ioData/vehicles/falcon/entities_world =================================================================== --- trunk/ioData/vehicles/falcon/entities_world 2007-10-01 12:24:49 UTC (rev 1153) +++ trunk/ioData/vehicles/falcon/entities_world 2007-10-01 12:44:51 UTC (rev 1154) @@ -82,14 +82,14 @@ <!--Rear Left Wheel--> <action name="AddWheel"> <par vector="0.58,0.05,0.93" name="position"/> - <par float="0.0" name="turnspeed"/> - <par float="0.0" name="returnspeed"/> + <par float="2.0" name="turnspeed"/> + <par float="2.0" name="returnspeed"/> <par float="0.00025" name="suspensionsoftness"/> <par float="0.125" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="1.0" name="enginepower"/> - <par float="1.0" name="leftsteersensitivity"/> - <par float="0.8" name="rightsteersensitivity"/> + <par float="0.0" name="leftsteersensitivity"/> + <par float="0.0" name="rightsteersensitivity"/> <par float="1.4" name="friction"/> <par float="0.0000085" name="slip"/> <par float="10.0" name="mass"/> @@ -101,13 +101,13 @@ <!--Rear Right Wheel--> <action name="AddWheel"> <par vector="-0.58,0.05,0.93" name="position"/> - <par float="0.0" name="turnspeed"/> - <par float="0.0" name="returnspeed"/> + <par float="2.0" name="turnspeed"/> + <par float="2.0" name="returnspeed"/> <par float="0.00025" name="suspensionsoftness"/> <par float="0.125" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> - <par float="1.0" name="enginepower"/> - <par float="0.8" name="leftsteersensitivity"/> + <par float="0.0" name="enginepower"/> + <par float="0.0" name="leftsteersensitivity"/> <par float="1.0" name="rightsteersensitivity"/> <par float="1.4" name="friction"/> <par float="0.0000085" name="slip"/> Modified: trunk/ioData/vehicles/fedex/entities_world =================================================================== --- trunk/ioData/vehicles/fedex/entities_world 2007-10-01 12:24:49 UTC (rev 1153) +++ trunk/ioData/vehicles/fedex/entities_world 2007-10-01 12:44:51 UTC (rev 1154) @@ -82,14 +82,14 @@ <!--Rear Left Wheel--> <action name="AddWheel"> <par vector="0.45, 0.0, 0.98" name="position"/> - <par float="0.0" name="turnspeed"/> - <par float="0.0" name="returnspeed"/> + <par float="2.0" name="turnspeed"/> + <par float="2.0" name="returnspeed"/> <par float="0.000225" name="suspensionsoftness"/> <par float="0.15" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="1.0" name="enginepower"/> - <par float="1.0" name="leftsteersensitivity"/> - <par float="0.8" name="rightsteersensitivity"/> + <par float="0.0" name="leftsteersensitivity"/> + <par float="0.0" name="rightsteersensitivity"/> <par float="1.0" name="friction"/> <par float="0.0000125" name="slip"/> <par float="10.0" name="mass"/> @@ -101,14 +101,14 @@ <!--Rear Right Wheel--> <action name="AddWheel"> <par vector="-0.45, 0.0, 0.98" name="position"/> - <par float="0.0" name="turnspeed"/> - <par float="0.0" name="returnspeed"/> + <par float="2.0" name="turnspeed"/> + <par float="2.0" name="returnspeed"/> <par float="0.000225" name="suspensionsoftness"/> <par float="0.15" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="1.0" name="enginepower"/> - <par float="0.8" name="leftsteersensitivity"/> - <par float="1.0" name="rightsteersensitivity"/> + <par float="0.0" name="leftsteersensitivity"/> + <par float="0.0" name="rightsteersensitivity"/> <par float="1.0" name="friction"/> <par float="0.0000125" name="slip"/> <par float="10.0" name="mass"/> Modified: trunk/ioData/vehicles/strider/entities_world =================================================================== --- trunk/ioData/vehicles/strider/entities_world 2007-10-01 12:24:49 UTC (rev 1153) +++ trunk/ioData/vehicles/strider/entities_world 2007-10-01 12:44:51 UTC (rev 1154) @@ -79,14 +79,14 @@ <!--Rear Left Wheel--> <action name="AddWheel"> <par vector="0.55,0.15,0.9" name="position"/> - <par float="0.0" name="turnspeed"/> - <par float="0.0" name="returnspeed"/> + <par float="2.0" name="turnspeed"/> + <par float="2.0" name="returnspeed"/> <par float="0.0005" name="suspensionsoftness"/> <par float="0.2" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="0.6" name="enginepower"/> - <par float="1.0" name="leftsteersensitivity"/> - <par float="0.8" name="rightsteersensitivity"/> + <par float="0.0" name="leftsteersensitivity"/> + <par float="0.0" name="rightsteersensitivity"/> <par float="1.0" name="friction"/> <par float="0.0000145" name="slip"/> <par float="12.0" name="mass"/> @@ -98,15 +98,15 @@ <!--Rear Right Wheel--> <action name="AddWheel"> <par vector="-0.55,0.15,0.9" name="position"/> - <par float="0.0" name="turnspeed"/> - <par float="0.0" name="returnspeed"/> + <par float="2.0" name="turnspeed"/> + <par float="2.0" name="returnspeed"/> <par float="0.0005" name="suspensionsoftness"/> <par float="0.2" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="0.6" name="enginepower"/> - <par float="0.8" name="leftsteersensitivity"/> - <par float="1.0" name="rightsteersensitivity"/> - <par float="1.0" name="friction"/> + <par float="0.0" name="leftsteersensitivity"/> + <par float="0.0" name="rightsteersensitivity"/> + <par float="0.0" name="friction"/> <par float="0.0000145" name="slip"/> <par float="12.0" name="mass"/> <par bool="true" name="handbrakeaffected"/> Modified: trunk/ioData/vehicles/trekker/entities_world =================================================================== --- trunk/ioData/vehicles/trekker/entities_world 2007-10-01 12:24:49 UTC (rev 1153) +++ trunk/ioData/vehicles/trekker/entities_world 2007-10-01 12:44:51 UTC (rev 1154) @@ -82,14 +82,14 @@ <!--Rear Left Wheel--> <action name="AddWheel"> <par vector="0.55, 0.1, 0.9" name="position"/> - <par float="0.0" name="turnspeed"/> - <par float="0.0" name="returnspeed"/> + <par float="2.0" name="turnspeed"/> + <par float="2.0" name="returnspeed"/> <par float="0.0002" name="suspensionsoftness"/> <par float="0.1" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="0.6" name="enginepower"/> - <par float="1.0" name="leftsteersensitivity"/> - <par float="0.8" name="rightsteersensitivity"/> + <par float="0.0" name="leftsteersensitivity"/> + <par float="0.0" name="rightsteersensitivity"/> <par float="1.2" name="friction"/> <par float="0.0000105" name="slip"/> <par float="10.0" name="mass"/> @@ -101,14 +101,14 @@ <!--Rear Right Wheel--> <action name="AddWheel"> <par vector="-0.55, 0.1, 0.9" name="position"/> - <par float="0.0" name="turnspeed"/> - <par float="0.0" name="returnspeed"/> + <par float="2.0" name="turnspeed"/> + <par float="2.0" name="returnspeed"/> <par float="0.0002" name="suspensionsoftness"/> <par float="0.1" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="0.6" name="enginepower"/> - <par float="0.8" name="leftsteersensitivity"/> - <par float="1.0" name="rightsteersensitivity"/> + <par float="0.0" name="leftsteersensitivity"/> + <par float="0.0" name="rightsteersensitivity"/> <par float="1.2" name="friction"/> <par float="0.0000105" name="slip"/> <par float="10.0" name="mass"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cf...@us...> - 2007-10-01 12:25:12
|
Revision: 1153 http://automanic.svn.sourceforge.net/automanic/?rev=1153&view=rev Author: cfraz89 Date: 2007-10-01 05:24:49 -0700 (Mon, 01 Oct 2007) Log Message: ----------- bleh Modified Paths: -------------- trunk/ioData/client/ioEntityManagerClient.py trunk/ioData/client/ioNetGameClient.py trunk/ioData/scripts/ioDispatcher.py trunk/ioData/scripts/ioNetworkEntCl.py trunk/ioData/server/game/celstart.cfg trunk/ioData/server/game/ioGameServer.py trunk/ioData/vehicles/voyager/entities_world trunk/ioData/vehicles/voyager/factories/genVoyagerBody trunk/ioData/vehicles/voyager/factories/genVoyagerWheel Modified: trunk/ioData/client/ioEntityManagerClient.py =================================================================== --- trunk/ioData/client/ioEntityManagerClient.py 2007-09-28 08:25:43 UTC (rev 1152) +++ trunk/ioData/client/ioEntityManagerClient.py 2007-10-01 12:24:49 UTC (rev 1153) @@ -14,7 +14,7 @@ def __init__(self, celEntity): self.entity = celEntity self.entities = [] - self.numbots = 3 + self.numbots = 1 self.net = ioNetHelper.ioNetHelper() @@ -103,11 +103,12 @@ #Equip random model for weapons models = ioLoader.scanModels(vehicleinfo['Path']) - model = random.choice(models) - weapons = model['Weapons'] - for mount, weapon in weapons.items(): - pars = parblock({'mount' : mount, 'weapon' : weapon}) - vehicle.Behaviour.SendMessage('addweapon', None, pars) + if len(models) > 0: + model = random.choice(models) + weapons = model['Weapons'] + for mount, weapon in weapons.items(): + pars = parblock({'mount' : mount, 'weapon' : weapon}) + vehicle.Behaviour.SendMessage('addweapon', None, pars) pars = parblock({'player' : False}) vehicle.Behaviour.SendMessage('setplayer', None, pars) Modified: trunk/ioData/client/ioNetGameClient.py =================================================================== --- trunk/ioData/client/ioNetGameClient.py 2007-09-28 08:25:43 UTC (rev 1152) +++ trunk/ioData/client/ioNetGameClient.py 2007-10-01 12:24:49 UTC (rev 1153) @@ -153,7 +153,7 @@ if not ioDataBin.Get('mpgame'): #Used for debugging damage system entmgr = Entities['ioEntMgrCl'] - #entmgr.Behaviour.SendMessage('fillbots', None, args) + entmgr.Behaviour.SendMessage('fillbots', None, args) def Play_click(self, pc, args): self.buttons.clear() Modified: trunk/ioData/scripts/ioDispatcher.py =================================================================== --- trunk/ioData/scripts/ioDispatcher.py 2007-09-28 08:25:43 UTC (rev 1152) +++ trunk/ioData/scripts/ioDispatcher.py 2007-10-01 12:24:49 UTC (rev 1153) @@ -37,6 +37,8 @@ if packet.ip in self.clients or packet.message in self.exceptions: reciever = pl.FindEntity(packet.entity) if reciever is not None: + if 'tgt' in packet.message: + print packet.message, packet.data reciever.Behaviour.SendMessage('r_%s' % packet.message, None, packet.toPars()) else: #print 'no entity', packet.entity Modified: trunk/ioData/scripts/ioNetworkEntCl.py =================================================================== --- trunk/ioData/scripts/ioNetworkEntCl.py 2007-09-28 08:25:43 UTC (rev 1152) +++ trunk/ioData/scripts/ioNetworkEntCl.py 2007-10-01 12:24:49 UTC (rev 1153) @@ -26,8 +26,8 @@ def __init__(self, celEntity): ioNetworkEntBase.__init__(self, celEntity) - self.timer.WakeUp(25, True, 'send_rot') - self.timer.WakeUp(50, True, 'send_pos') + self.timer.WakeUp(10000, True, 'send_rot') + self.timer.WakeUp(20000, True, 'send_pos') #Register or unregister from the network. def setregistered(self, pc, args): Modified: trunk/ioData/server/game/celstart.cfg =================================================================== --- trunk/ioData/server/game/celstart.cfg 2007-09-28 08:25:43 UTC (rev 1152) +++ trunk/ioData/server/game/celstart.cfg 2007-10-01 12:24:49 UTC (rev 1153) @@ -9,7 +9,7 @@ ; The collision detection system. System.Plugins.iCollideSystem = crystalspace.collisiondetection.opcode -System.Plugins.iGraphics3D = crystalspace.graphics3d.opengl +System.Plugins.iGraphics3D = crystalspace.graphics3d.null System.Plugins.iEngine = crystalspace.engine.3d System.Plugins.iFontServer = crystalspace.font.server.multiplexer System.Plugins.iFontServer.1 = crystalspace.font.server.freetype2 Modified: trunk/ioData/server/game/ioGameServer.py =================================================================== --- trunk/ioData/server/game/ioGameServer.py 2007-09-28 08:25:43 UTC (rev 1152) +++ trunk/ioData/server/game/ioGameServer.py 2007-10-01 12:24:49 UTC (rev 1153) @@ -15,7 +15,7 @@ ioServerBase.__init__(self, celEntity) if self.bindport(1828): #We need less sleeptime to keep ode synced better - self.sleeptime = 0.015 + self.sleeptime = 0.0 self.servertime = 0 #Used for compatibility testing Modified: trunk/ioData/vehicles/voyager/entities_world =================================================================== --- trunk/ioData/vehicles/voyager/entities_world 2007-09-28 08:25:43 UTC (rev 1152) +++ trunk/ioData/vehicles/voyager/entities_world 2007-10-01 12:24:49 UTC (rev 1153) @@ -31,7 +31,7 @@ <par bool="true" name="enabled" /> </action> <action name="SetColliderBoundingBox"> - <par vector="-0.2,-0.2,-0.2" name="sizeadjustment" /> + <par vector="-0.2,-0.4,-0.2" name="sizeadjustment" /> </action> </propclass> <propclass name="pcvehicle.wheeled"> @@ -43,7 +43,7 @@ <property name="steeramount" float="0.7"/> <!--Front Left Wheel--> <action name="AddWheel"> - <par vector="0.55, 0.0, -0.95" name="position"/> + <par vector="0.55, -0.1, -1.2" name="position"/> <par float="2.0" name="turnspeed"/> <par float="2.0" name="returnspeed"/> <par float="0.0002" name="suspensionsoftness"/> @@ -62,7 +62,7 @@ </action> <!--Front Right Wheel--> <action name="AddWheel"> - <par vector="-0.55, 0.0, -0.95" name="position"/> + <par vector="-0.55, -0.1, -1.2" name="position"/> <par float="2.0" name="turnspeed"/> <par float="2.0" name="returnspeed"/> <par float="0.0002" name="suspensionsoftness"/> @@ -81,15 +81,15 @@ </action> <!--Rear Left Wheel--> <action name="AddWheel"> - <par vector="0.55, 0.0, 0.9" name="position"/> - <par float="0.0" name="turnspeed"/> - <par float="0.0" name="returnspeed"/> + <par vector="0.55,-0.1, 0.9" name="position"/> + <par float="2.0" name="turnspeed"/> + <par float="2.0" name="returnspeed"/> <par float="0.0002" name="suspensionsoftness"/> <par float="0.1" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="0.6" name="enginepower"/> - <par float="1.0" name="leftsteersensitivity"/> - <par float="0.8" name="rightsteersensitivity"/> + <par float="0.0" name="leftsteersensitivity"/> + <par float="0.0" name="rightsteersensitivity"/> <par float="1.2" name="friction"/> <par float="0.0000105" name="slip"/> <par float="10.0" name="mass"/> @@ -100,15 +100,15 @@ </action> <!--Rear Right Wheel--> <action name="AddWheel"> - <par vector="-0.55, 0.0, 0.9" name="position"/> - <par float="0.0" name="turnspeed"/> - <par float="0.0" name="returnspeed"/> + <par vector="-0.55, -0.1, 0.9" name="position"/> + <par float="2.0" name="turnspeed"/> + <par float="2.0" name="returnspeed"/> <par float="0.0002" name="suspensionsoftness"/> <par float="0.1" name="suspensiondamping"/> <par float="0.3" name="brakepower"/> <par float="0.6" name="enginepower"/> - <par float="0.8" name="leftsteersensitivity"/> - <par float="1.0" name="rightsteersensitivity"/> + <par float="0.0" name="leftsteersensitivity"/> + <par float="0.0" name="rightsteersensitivity"/> <par float="1.2" name="friction"/> <par float="0.0000105" name="slip"/> <par float="10.0" name="mass"/> Modified: trunk/ioData/vehicles/voyager/factories/genVoyagerBody =================================================================== --- trunk/ioData/vehicles/voyager/factories/genVoyagerBody 2007-09-28 08:25:43 UTC (rev 1152) +++ trunk/ioData/vehicles/voyager/factories/genVoyagerBody 2007-10-01 12:24:49 UTC (rev 1153) @@ -3,21221 +3,21221 @@ <plugin>genmeshfact</plugin> <zuse/> <params> -<material>LF_Softener_BodySno</material> -<v x="-0.581652" y="0.423935" z="-1.13021" nx="0.996185" ny="-0.0871303" nz="0"/> -<v x="-0.586713" y="0.424378" z="-1.11795" nx="0.704398" ny="-0.0616169" nz="0.707083"/> -<v x="-0.568059" y="0.63759" z="-1.11795" nx="0.704398" ny="-0.0616169" nz="0.707083"/> -<v x="-0.562999" y="0.637147" z="-1.13021" nx="0.996185" ny="-0.0871303" nz="0"/> +<material>RF_Spring01SGno</material> +<v x="0.481016" y="-0.0271965" z="0.934664" nx="-0.996185" ny="-0.0871303" nz="0"/> +<v x="0.485201" y="-0.0268302" z="0.924522" nx="-0.704398" ny="-0.0616169" nz="-0.707083"/> +<v x="0.469775" y="0.149492" z="0.924521" nx="-0.704398" ny="-0.0616169" nz="-0.707083"/> +<v x="0.46559" y="0.149126" z="0.934663" nx="-0.996185" ny="-0.0871303" nz="0"/> <t v1="3" v2="2" v3="1"/> <t v1="3" v2="1" v3="0"/> -<v x="-0.59893" y="0.425447" z="-1.11287" nx="0" ny="0" nz="1"/> -<v x="-0.580277" y="0.638659" z="-1.11287" nx="0" ny="0" nz="1"/> +<v x="0.495304" y="-0.0259462" z="0.920321" nx="0" ny="0" nz="-1"/> +<v x="0.479879" y="0.150376" z="0.920319" nx="0" ny="0" nz="-1"/> <t v1="2" v2="5" v3="4"/> <t v1="2" v2="4" v3="1"/> -<v x="-0.611148" y="0.426516" z="-1.11795" nx="-0.704398" ny="0.0616169" nz="0.707083"/> -<v x="-0.592494" y="0.639728" z="-1.11795" nx="-0.704398" ny="0.0616169" nz="0.707083"/> +<v x="0.505408" y="-0.0250621" z="0.924522" nx="0.704398" ny="0.0616169" nz="-0.707083"/> +<v x="0.489982" y="0.15126" z="0.924521" nx="0.704398" ny="0.0616169" nz="-0.707083"/> <t v1="5" v2="7" v3="6"/> <t v1="5" v2="6" v3="4"/> -<v x="-0.616208" y="0.426958" z="-1.13021" nx="-0.996185" ny="0.0871303" nz="0"/> -<v x="-0.597555" y="0.64017" z="-1.13021" nx="-0.996185" ny="0.0871303" nz="0"/> +<v x="0.509593" y="-0.0246965" z="0.934664" nx="0.996185" ny="0.0871303" nz="0"/> +<v x="0.494167" y="0.151626" z="0.934663" nx="0.996185" ny="0.0871303" nz="0"/> <t v1="7" v2="9" v3="8"/> <t v1="7" v2="8" v3="6"/> -<v x="-0.611148" y="0.426516" z="-1.14248" nx="-0.704398" ny="0.0616169" nz="-0.707083"/> -<v x="-0.592494" y="0.639728" z="-1.14248" nx="-0.704398" ny="0.0616169" nz="-0.707083"/> +<v x="0.505408" y="-0.0250619" z="0.944806" nx="0.704398" ny="0.0616169" nz="0.707083"/> +<v x="0.489982" y="0.151261" z="0.944805" nx="0.704398" ny="0.0616169" nz="0.707083"/> <t v1="9" v2="11" v3="10"/> <t v1="9" v2="10" v3="8"/> -<v x="-0.59893" y="0.425447" z="-1.14755" nx="0" ny="0" nz="-1"/> -<v x="-0.580277" y="0.638659" z="-1.14755" nx="0" ny="0" nz="-1"/> +<v x="0.495304" y="-0.0259459" z="0.949007" nx="0" ny="0" nz="1"/> +<v x="0.479879" y="0.150377" z="0.949006" nx="0" ny="0" nz="1"/> <t v1="11" v2="13" v3="12"/> <t v1="11" v2="12" v3="10"/> -<v x="-0.586713" y="0.424378" z="-1.14248" nx="0.704398" ny="-0.0616169" nz="-0.707083"/> -<v x="-0.568059" y="0.63759" z="-1.14248" nx="0.704398" ny="-0.0616169" nz="-0.707083"/> +<v x="0.485201" y="-0.02683" z="0.944806" nx="-0.704398" ny="-0.0616169" nz="0.707083"/> +<v x="0.469775" y="0.149492" z="0.944805" nx="-0.704398" ny="-0.0616169" nz="0.707083"/> <t v1="13" v2="15" v3="14"/> <t v1="13" v2="14" v3="12"/> <t v1="15" v2="3" v3="0"/> <t v1="15" v2="0" v3="14"/> -<v x="-0.512574" y="0.612578" z="1.50489" nx="0.286172" ny="-0.958159" nz="0"/> -<v x="-0.519763" y="0.614504" z="1.52286" nx="0.137791" ny="-0.918424" nz="0.3708"/> -<v x="-0.467095" y="0.811063" z="1.52286" nx="0.683004" ny="-0.182989" nz="0.707083"/> -<v x="-0.459907" y="0.809137" z="1.50489" nx="0.965911" ny="-0.258797" nz="0"/> +<v x="0.423889" y="0.128789" z="-1.24452" nx="-0.286172" ny="-0.958159" nz="0"/> +<v x="0.429834" y="0.130382" z="-1.25938" nx="-0.137791" ny="-0.918424" nz="-0.3708"/> +<v x="0.386279" y="0.292933" z="-1.25938" nx="-0.683004" ny="-0.182989" nz="-0.707083"/> +<v x="0.380335" y="0.29134" z="-1.24452" nx="-0.965911" ny="-0.258797" nz="0"/> <t v1="19" v2="18" v3="17"/> <t v1="19" v2="17" v3="16"/> -<v x="-0.537118" y="0.619154" z="1.5303" nx="-0.123173" ny="-0.459731" nz="0.879452"/> -<v x="-0.48445" y="0.815714" z="1.5303" nx="0" ny="0" nz="1"/> +<v x="0.444187" y="0.134227" z="-1.26553" nx="0.123173" ny="-0.459731" nz="-0.879452"/> +<v x="0.400631" y="0.296779" z="-1.26553" nx="0" ny="0" nz="-1"/> <t v1="18" v2="21" v3="20"/> <t v1="18" v2="20" v3="17"/> -<v x="-0.554473" y="0.623805" z="1.52286" nx="-0.653584" ny="-0.585284" nz="0.479812"/> -<v x="-0.501805" y="0.820364" z="1.52286" nx="-0.683004" ny="0.182989" nz="0.707083"/> +<v x="0.458539" y="0.138074" z="-1.25938" nx="0.653584" ny="-0.585284" nz="-0.479812"/> +<v x="0.414983" y="0.300625" z="-1.25938" nx="0.683004" ny="0.182989" nz="-0.707083"/> <t v1="21" v2="23" v3="22"/> <t v1="21" v2="22" v3="20"/> -<v x="-0.561661" y="0.625731" z="1.50489" nx="-0.72692" ny="-0.686697" nz="0"/> -<v x="-0.508994" y="0.82229" z="1.50489" nx="-0.965911" ny="0.258797" nz="0"/> +<v x="0.464483" y="0.139667" z="-1.24452" nx="0.72692" ny="-0.686697" nz="0"/> +<v x="0.420929" y="0.302217" z="-1.24452" nx="0.965911" ny="0.258797" nz="0"/> <t v1="23" v2="25" v3="24"/> <t v1="23" v2="24" v3="22"/> -<v x="-0.554473" y="0.623805" z="1.48692" nx="-0.57857" ny="-0.726463" nz="-0.3708"/> -<v x="-0.501805" y="0.820364" z="1.48692" nx="-0.683004" ny="0.182989" nz="-0.707083"/> +<v x="0.458539" y="0.138074" z="-1.22966" nx="0.57857" ny="-0.726463" nz="0.3708"/> +<v x="0.414983" y="0.300625" z="-1.22966" nx="0.683004" ny="0.182989" nz="0.707083"/> <t v1="25" v2="27" v3="26"/> <t v1="25" v2="26" v3="24"/> -<v x="-0.537118" y="0.619154" z="1.47948" nx="-0.123173" ny="-0.459731" nz="-0.879452"/> -<v x="-0.48445" y="0.815714" z="1.47948" nx="0" ny="0" nz="-1"/> +<v x="0.444187" y="0.134228" z="-1.2235" nx="0.123173" ny="-0.459731" nz="0.879452"/> +<v x="0.400631" y="0.296779" z="-1.22351" nx="0" ny="0" nz="1"/> <t v1="27" v2="29" v3="28"/> <t v1="27" v2="28" v3="26"/> -<v x="-0.519763" y="0.614504" z="1.48692" nx="0.273354" ny="-0.833674" nz="-0.479812"/> -<v x="-0.467095" y="0.811063" z="1.48692" nx="0.683004" ny="-0.182989" nz="-0.707083"/> +<v x="0.429834" y="0.130382" z="-1.22966" nx="-0.273354" ny="-0.833674" nz="0.479812"/> +<v x="0.386279" y="0.292933" z="-1.22966" nx="-0.683004" ny="-0.182989" nz="0.707083"/> <t v1="29" v2="31" v3="30"/> <t v1="29" v2="30" v3="28"/> <t v1="31" v2="19" v3="16"/> <t v1="31" v2="16" v3="30"/> -<v x="0.48525" y="0.534127" z="-1.65968" nx="-0.760979" ny="0.580645" nz="-0.289315"/> -<v x="0.48525" y="0.51529" z="-1.67145" nx="-0.4738" ny="0.15772" nz="-0.866359"/> -<v x="0.546057" y="0.51529" z="-1.67145" nx="0.4738" ny="0.15772" nz="-0.866359"/> -<v x="0.546057" y="0.534127" z="-1.65968" nx="0.760979" ny="0.580645" nz="-0.289315"/> +<v x="0.417865" y="0.329975" z="-1.68252" nx="-0.212989" ny="0.0891751" nz="-0.972961"/> +<v x="0.411558" y="0.298776" z="-1.68252" nx="-0.23072" ny="0" nz="-0.972991"/> +<v x="0.443612" y="0.298776" z="-1.69012" nx="-0.159459" ny="0" nz="-0.987182"/> +<v x="0.44743" y="0.317659" z="-1.69012" nx="-0.14716" ny="0.0615864" nz="-0.987182"/> <t v1="35" v2="34" v3="33"/> <t v1="35" v2="33" v3="32"/> -<v x="0.48525" y="0.491098" z="-1.66659" nx="-0.747551" ny="-0.415082" nz="-0.518509"/> -<v x="0.546057" y="0.491098" z="-1.66659" nx="0.747551" ny="-0.415082" nz="-0.518509"/> +<v x="0.417865" y="0.267576" z="-1.68252" nx="-0.212989" ny="-0.0891751" nz="-0.972961"/> +<v x="0.44743" y="0.279893" z="-1.69012" nx="-0.14716" ny="-0.0615864" nz="-0.987182"/> <t v1="34" v2="37" v3="36"/> <t v1="34" v2="36" v3="33"/> -<v x="0.48525" y="0.480685" z="-1.64321" nx="-0.750511" ny="-0.658956" nz="0.0494705"/> -<v x="0.546057" y="0.480685" z="-1.64321" nx="0.750511" ny="-0.658956" nz="0.0494705"/> +<v x="0.435048" y="0.242102" z="-1.68252" nx="-0.163488" ny="-0.163488" nz="-0.972869"/> +<v x="0.457665" y="0.264718" z="-1.69012" nx="-0.112888" ny="-0.112888" nz="-0.987152"/> <t v1="37" v2="39" v3="38"/> <t v1="37" v2="38" v3="36"/> -<v x="0.48525" y="0.495099" z="-1.62066" nx="-0.744835" ny="-0.663289" nz="0.0720542"/> -<v x="0.546057" y="0.495099" z="-1.62066" nx="0.744835" ny="-0.663289" nz="0.0720542"/> +<v x="0.460522" y="0.22492" z="-1.68252" nx="-0.0891751" ny="-0.213019" nz="-0.972961"/> +<v x="0.472838" y="0.254484" z="-1.69012" nx="-0.0615864" ny="-0.14716" nz="-0.987182"/> <t v1="39" v2="41" v3="40"/> <t v1="39" v2="40" v3="38"/> -<v x="0.48525" y="0.440564" z="-1.47236" nx="-0.707266" ny="-0.670949" nz="-0.222571"/> -<v x="0.546057" y="0.440564" z="-1.47236" nx="0.707266" ny="-0.670949" nz="-0.222571"/> +<v x="0.491722" y="0.218612" z="-1.68252" nx="0" ny="-0.23075" nz="-0.972991"/> +<v x="0.491722" y="0.250665" z="-1.69012" nx="0" ny="-0.159459" nz="-0.987182"/> <t v1="41" v2="43" v3="42"/> <t v1="41" v2="42" v3="40"/> -<v x="0.48525" y="0.379635" z="-1.2669" nx="-0.707205" ny="-0.682852" nz="-0.183111"/> -<v x="0.546057" y="0.379635" z="-1.2669" nx="0.707205" ny="-0.682852" nz="-0.183111"/> +<v x="0.522922" y="0.22492" z="-1.68252" nx="0.0891751" ny="-0.213019" nz="-0.972961"/> +<v x="0.510606" y="0.254484" z="-1.69012" nx="0.0615864" ny="-0.14716" nz="-0.987182"/> <t v1="43" v2="45" v3="44"/> <t v1="43" v2="44" v3="42"/> -<v x="0.48525" y="0.347198" z="-1.13186" nx="-0.707083" ny="-0.687521" nz="-0.165136"/> -<v x="0.546057" y="0.347198" z="-1.13186" nx="0.707083" ny="-0.687521" nz="-0.165136"/> +<v x="0.548395" y="0.242102" z="-1.68252" nx="0.163488" ny="-0.163488" nz="-0.972869"/> +<v x="0.525779" y="0.264718" z="-1.69012" nx="0.112888" ny="-0.112888" nz="-0.987152"/> <t v1="45" v2="47" v3="46"/> <t v1="45" v2="46" v3="44"/> -<v x="0.48525" y="0.399022" z="-1.12639" nx="-0.707083" ny="0.695883" nz="0.125431"/> -<v x="0.48525" y="0.423368" z="-1.26144" nx="-0.707175" ny="0.693014" nz="0.140049"/> -<v x="0.546057" y="0.423368" z="-1.26144" nx="0.707175" ny="0.693014" nz="0.140049"/> -<v x="0.546057" y="0.399022" z="-1.12639" nx="0.707083" ny="0.695883" nz="0.125431"/> -<t v1="51" v2="50" v3="49"/> -<t v1="51" v2="49" v3="48"/> -<v x="0.48525" y="0.469986" z="-1.46942" nx="-0.707358" ny="0.683248" nz="0.181005"/> -<v x="0.546057" y="0.469986" z="-1.46942" nx="0.707358" ny="0.683248" nz="0.181005"/> -<t v1="50" v2="53" v3="52"/> -<t v1="50" v2="52" v3="49"/> -<v x="0.48525" y="0.515503" z="-1.61792" nx="-0.717795" ny="0.595965" nz="0.359905"/> -<v x="0.546057" y="0.515503" z="-1.61792" nx="0.717795" ny="0.595965" nz="0.359905"/> +<v x="0.565578" y="0.267576" z="-1.68252" nx="0.212989" ny="-0.0891751" nz="-0.972961"/> +<v x="0.536014" y="0.279893" z="-1.69012" nx="0.14716" ny="-0.0615864" nz="-0.987182"/> +<t v1="47" v2="49" v3="48"/> +<t v1="47" v2="48" v3="46"/> +<v x="0.571886" y="0.298776" z="-1.68252" nx="0.23072" ny="0" nz="-0.972991"/> +<v x="0.539832" y="0.298776" z="-1.69012" nx="0.159459" ny="0" nz="-0.987182"/> +<t v1="49" v2="51" v3="50"/> +<t v1="49" v2="50" v3="48"/> +<v x="0.565578" y="0.329975" z="-1.68252" nx="0.212989" ny="0.0891751" nz="-0.972961"/> +<v x="0.536014" y="0.317659" z="-1.69012" nx="0.14716" ny="0.0615864" nz="-0.987182"/> +<t v1="51" v2="53" v3="52"/> +<t v1="51" v2="52" v3="50"/> +<v x="0.548395" y="0.355449" z="-1.68252" nx="0.163488" ny="0.163488" nz="-0.9729"/> +<v x="0.525779" y="0.332833" z="-1.69012" nx="0.112888" ny="0.112888" nz="-0.987152"/> <t v1="53" v2="55" v3="54"/> <t v1="53" v2="54" v3="52"/> -<v x="0.48525" y="0.531882" z="-1.63418" nx="-0.728935" ny="0.6198" nz="0.290628"/> -<v x="0.546057" y="0.531882" z="-1.63418" nx="0.728935" ny="0.6198" nz="0.290628"/> +<v x="0.522922" y="0.372632" z="-1.68252" nx="0.0891751" ny="0.212989" nz="-0.972961"/> +<v x="0.510606" y="0.343068" z="-1.69012" nx="0.0615864" ny="0.14713" nz="-0.987182"/> <t v1="55" v2="57" v3="56"/> <t v1="55" v2="56" v3="54"/> -<t v1="57" v2="35" v3="32"/> -<t v1="57" v2="32" v3="56"/> -<t v1="38" v2="56" v3="32"/> -<t v1="38" v2="32" v3="36"/> -<t v1="55" v2="41" v3="39"/> -<t v1="55" v2="39" v3="57"/> -<t v1="44" v2="46" v3="48"/> -<t v1="44" v2="48" v3="49"/> -<t v1="50" v2="51" v3="47"/> -<t v1="50" v2="47" v3="45"/> -<t v1="42" v2="44" v3="49"/> -<t v1="42" v2="49" v3="52"/> -<t v1="53" v2="50" v3="45"/> -<t v1="53" v2="45" v3="43"/> -<t v1="40" v2="42" v3="52"/> -<t v1="40" v2="52" v3="54"/> -<t v1="55" v2="53" v3="43"/> -<t v1="55" v2="43" v3="41"/> -<t v1="38" v2="40" v3="54"/> -<t v1="38" v2="54" v3="56"/> -<t v1="39" v2="37" v3="35"/> -<t v1="39" v2="35" v3="57"/> -<t v1="36" v2="32" v3="33"/> -<t v1="37" v2="34" v3="35"/> -<v x="0.549128" y="0.554691" z="-1.67531" nx="-0.707083" ny="0.0620136" nz="-0.704367"/> -<v x="0.549128" y="0.503663" z="-1.6798" nx="-0.716941" ny="-0.102847" nz="-0.689444"/> -<v x="0.572864" y="0.503663" z="-1.6798" nx="0.698752" ny="-0.18363" nz="-0.691366"/> -<v x="0.578995" y="0.554691" z="-1.67531" nx="0.698447" ny="-0.0209052" nz="-0.715323"/> -<t v1="61" v2="60" v3="59"/> -<t v1="61" v2="59" v3="58"/> -<v x="0.549128" y="0.484263" z="-1.67196" nx="-0.73101" ny="-0.465621" nz="-0.498764"/> -<v x="0.570732" y="0.484263" z="-1.67196" nx="0.693564" ny="-0.526994" nz="-0.491104"/> -<t v1="60" v2="63" v3="62"/> -<t v1="60" v2="62" v3="59"/> -<v x="0.549128" y="0.473667" z="-1.65018" nx="-0.462233" ny="-0.874538" nz="-0.146489"/> -<v x="0.569933" y="0.473667" z="-1.65018" nx="0.438032" ny="-0.886502" nz="-0.14893"/> -<t v1="63" v2="65" v3="64"/> -<t v1="63" v2="64" v3="62"/> -<v x="0.549128" y="0.476882" z="-1.62372" nx="-0.729911" ny="-0.606494" nz="0.315195"/> -<v x="0.570865" y="0.476882" z="-1.62372" nx="0.692709" ny="-0.661702" nz="0.286843"/> -<t v1="65" v2="67" v3="66"/> -<t v1="65" v2="66" v3="64"/> -<v x="0.549128" y="0.49243" z="-1.60972" nx="-0.714438" ny="-0.353282" nz="0.6039"/> -<v x="0.572997" y="0.49243" z="-1.60972" nx="0.69509" ny="-0.428419" nz="0.577288"/> -<t v1="67" v2="69" v3="68"/> -<t v1="67" v2="68" v3="66"/> -<v x="0.549128" y="0.54134" z="-1.59321" nx="-0.707083" ny="-0.226081" nz="0.669973"/> -<v x="0.579128" y="0.54134" z="-1.59321" nx="0.695822" ny="-0.306406" nz="0.649525"/> -<t v1="69" v2="71" v3="70"/> -<t v1="69" v2="70" v3="68"/> -<t v1="59" v2="68" v3="70"/> -<t v1="59" v2="70" v3="58"/> -<t v1="67" v2="63" v3="60"/> -<t v1="67" v2="60" v3="69"/> -<t v1="59" v2="62" v3="66"/> -<t v1="59" v2="66" v3="68"/> -<t v1="60" v2="61" v3="71"/> -<t v1="60" v2="71" v3="69"/> -<t v1="67" v2="65" v3="63"/> -<t v1="62" v2="64" v3="66"/> -<v x="0.482872" y="0.554691" z="-1.67531" nx="0.707083" ny="0.0620136" nz="-0.704367"/> -<v x="0.453005" y="0.554691" z="-1.67531" nx="-0.698447" ny="-0.0209052" nz="-0.715323"/> -<v x="0.459136" y="0.503663" z="-1.6798" nx="-0.698752" ny="-0.18363" nz="-0.691366"/> -<v x="0.482872" y="0.503663" z="-1.6798" nx="0.716941" ny="-0.102847" nz="-0.689444"/> -<t v1="75" v2="74" v3="73"/> -<t v1="75" v2="73" v3="72"/> -<v x="0.461268" y="0.484263" z="-1.67196" nx="-0.693564" ny="-0.526994" nz="-0.491104"/> -<v x="0.482872" y="0.484263" z="-1.67196" nx="0.73101" ny="-0.465621" nz="-0.498764"/> -<t v1="77" v2="76" v3="74"/> -<t v1="77" v2="74" v3="75"/> -<v x="0.462067" y="0.473667" z="-1.65018" nx="-0.438032" ny="-0.886502" nz="-0.14893"/> -<v x="0.482872" y="0.473667" z="-1.65018" nx="0.462233" ny="-0.874538" nz="-0.146489"/> -<t v1="79" v2="78" v3="76"/> -<t v1="79" v2="76" v3="77"/> -<v x="0.461135" y="0.476882" z="-1.62372" nx="-0.692709" ny="-0.661702" nz="0.286843"/> -<v x="0.482872" y="0.476882" z="-1.62372" nx="0.729911" ny="-0.606494" nz="0.315195"/> -<t v1="81" v2="80" v3="78"/> -<t v1="81" v2="78" v3="79"/> -<v x="0.459003" y="0.49243" z="-1.60972" nx="-0.69509" ny="-0.428419" nz="0.577288"/> -<v x="0.482872" y="0.49243" z="-1.60972" nx="0.714438" ny="-0.353282" nz="0.6039"/> -<t v1="83" v2="82" v3="80"/> -<t v1="83" v2="80" v3="81"/> -<v x="0.452872" y="0.54134" z="-1.59321" nx="-0.695822" ny="-0.306406" nz="0.649525"/> -<v x="0.482872" y="0.54134" z="-1.59321" nx="0.707083" ny="-0.226081" nz="0.669973"/> -<t v1="85" v2="84" v3="82"/> -<t v1="85" v2="82" v3="83"/> -<t v1="75" v2="72" v3="85"/> -<t v1="75" v2="85" v3="83"/> -<t v1="74" v2="76" v3="80"/> -<t v1="74" v2="80" v3="82"/> -<t v1="81" v2="77" v3="75"/> -<t v1="81" v2="75" v3="83"/> -<t v1="84" v2="73" v3="74"/> -<t v1="84" v2="74" v3="82"/> -<t v1="78" v2="80" v3="76"/> -<t v1="79" v2="77" v3="81"/> -<v x="-0.572269" y="0.420958" z="1.50489" nx="0.965911" ny="-0.258797" nz="0"/> -<v x="-0.577175" y="0.422273" z="1.51715" nx="0.683004" ny="-0.182989" nz="0.707083"/> -<v x="-0.521781" y="0.629006" z="1.51715" nx="0.683004" ny="-0.182989" nz="0.707083"/> -<v x="-0.516874" y="0.627691" z="1.50489" nx="0.965911" ny="-0.258797" nz="0"/> -<t v1="89" v2="88" v3="87"/> -<t v1="89" v2="87" v3="86"/> -<v x="-0.589022" y="0.425447" z="1.52223" nx="0" ny="0" nz="1"/> -<v x="-0.533628" y="0.63218" z="1.52223" nx="0" ny="0" nz="1"/> -<t v1="88" v2="91" v3="90"/> -<t v1="88" v2="90" v3="87"/> -<v x="-0.600868" y="0.428621" z="1.51715" nx="-0.683004" ny="0.182989" nz="0.707083"/> -<v x="-0.545474" y="0.635355" z="1.51715" nx="-0.683004" ny="0.182989" nz="0.707083"/> -<t v1="91" v2="93" v3="92"/> -<t v1="91" v2="92" v3="90"/> -<v x="-0.605775" y="0.429936" z="1.50489" nx="-0.965911" ny="0.258797" nz="0"/> -<v x="-0.550381" y="0.636669" z="1.50489" nx="-0.965911" ny="0.258797" nz="0"/> -<t v1="93" v2="95" v3="94"/> -<t v1="93" v2="94" v3="92"/> -<v x="-0.600868" y="0.428621" z="1.49262" nx="-0.683004" ny="0.182989" nz="-0.707083"/> -<v x="-0.545474" y="0.635355" z="1.49262" nx="-0.683004" ny="0.182989" nz="-0.707083"/> -<t v1="95" v2="97" v3="96"/> -<t v1="95" v2="96" v3="94"/> -<v x="-0.589022" y="0.425447" z="1.48755" nx="0" ny="0" nz="-1"/> -<v x="-0.533628" y="0.63218" z="1.48755" nx="0" ny="0" nz="-1"/> -<t v1="97" v2="99" v3="98"/> -<t v1="97" v2="98" v3="96"/> -<v x="-0.577175" y="0.422273" z="1.49262" nx="0.683004" ny="-0.182989" nz="-0.707083"/> -<v x="-0.521781" y="0.629006" z="1.49262" nx="0.683004" ny="-0.182989" nz="-0.707083"/> -<t v1="99" v2="101" v3="100"/> -<t v1="99" v2="100" v3="98"/> -<t v1="101" v2="89" v3="86"/> -<t v1="101" v2="86" v3="100"/> -<v x="0.606834" y="0.627439" z="-1.13021" nx="0.596637" ny="-0.802484" nz="0"/> -<v x="0.59942" y="0.62679" z="-1.11224" nx="0.443617" ny="-0.815882" nz="0.3708"/> -<v x="0.581685" y="0.829509" z="-1.11224" nx="0.704398" ny="0.0616169" nz="0.707083"/> -<v x="0.589099" y="0.830158" z="-1.13021" nx="0.996185" ny="0.0871303" nz="0"/> -<t v1="105" v2="104" v3="103"/> -<t v1="105" v2="103" v3="102"/> -<v x="0.581522" y="0.625224" z="-1.1048" nx="0.0414747" ny="-0.474136" nz="0.879452"/> -<v x="0.563786" y="0.827943" z="-1.1048" nx="0" ny="0" nz="1"/> -<t v1="104" v2="107" v3="106"/> -<t v1="104" v2="106" v3="103"/> -<v x="0.563623" y="0.623658" z="-1.11224" nx="-0.413984" ny="-0.773522" nz="0.479812"/> -<v x="0.545887" y="0.826377" z="-1.11224" nx="-0.704398" ny="-0.0616169" nz="0.707083"/> -<t v1="107" v2="109" v3="108"/> -<t v1="107" v2="108" v3="106"/> -<v x="0.556209" y="0.62301" z="-1.13021" nx="-0.448195" ny="-0.893918" nz="0"/> -<v x="0.538473" y="0.825729" z="-1.13021" nx="-0.996185" ny="-0.0871303" nz="0"/> -<t v1="109" v2="111" v3="110"/> -<t v1="109" v2="110" v3="108"/> -<v x="0.563623" y="0.623658" z="-1.14818" nx="-0.295175" ny="-0.88052" nz="-0.3708"/> -<v x="0.545887" y="0.826377" z="-1.14818" nx="-0.704398" ny="-0.0616169" nz="-0.707083"/> -<t v1="111" v2="113" v3="112"/> -<t v1="111" v2="112" v3="110"/> -<v x="0.581522" y="0.625224" z="-1.15562" nx="0.0414747" ny="-0.474136" nz="-0.879452"/> -<v x="0.563786" y="0.827943" z="-1.15562" nx="0" ny="0" nz="-1"/> -<t v1="113" v2="115" v3="114"/> -<t v1="113" v2="114" v3="112"/> -<v x="0.59942" y="0.62679" z="-1.14818" nx="0.542009" ny="-0.689871" nz="-0.479812"/> -<v x="0.581685" y="0.829509" z="-1.14818" nx="0.704398" ny="0.0616169" nz="-0.707083"/> -<t v1="115" v2="117" v3="116"/> -<t v1="115" v2="116" v3="114"/> -<t v1="117" v2="105" v3="102"/> -<t v1="117" v2="102" v3="116"/> -<v x="0.000436" y="0.372415" z="0.794968" nx="0" ny="-0.956603" nz="0.29136"/> -<v x="0.045468" y="0.378028" z="0.794968" nx="0.274209" ny="-0.911618" nz="0.306101"/> -<v x="0.045468" y="0.378028" z="0.530948" nx="0.274209" ny="-0.911618" nz="-0.306101"/> -<v x="0.000436" y="0.372415" z="0.530948" nx="0" ny="-0.956603" nz="-0.29136"/> -<t v1="121" v2="120" v3="119"/> -<t v1="121" v2="119" v3="118"/> -<v x="0.096503" y="0.403523" z="0.794968" nx="0.611255" ny="-0.706076" nz="0.357402"/> -<v x="0.096503" y="0.403523" z="0.530948" nx="0.611255" ny="-0.706076" nz="-0.357402"/> -<t v1="120" v2="123" v3="122"/> -<t v1="120" v2="122" v3="119"/> -<v x="0.131607" y="0.45555" z="0.794968" nx="0.844722" ny="-0.329661" nz="0.421552"/> -<v x="0.131607" y="0.45555" z="0.530948" nx="0.844722" ny="-0.329661" nz="-0.421552"/> -<t v1="123" v2="125" v3="124"/> -<t v1="123" v2="124" v3="122"/> -<v x="0.144073" y="0.539425" z="0.794968" nx="0.868557" ny="0.0790429" nz="0.489181"/> -<v x="0.144073" y="0.539425" z="0.530948" nx="0.868557" ny="0.0790429" nz="-0.489181"/> -<t v1="125" v2="127" v3="126"/> -<t v1="125" v2="126" v3="124"/> -<v x="0.126065" y="0.592092" z="0.794968" nx="0.722922" ny="0.436232" nz="0.535783"/> -<v x="0.126065" y="0.592092" z="0.530948" nx="0.722922" ny="0.436232" nz="-0.535783"/> -<t v1="127" v2="129" v3="128"/> -<t v1="127" v2="128" v3="126"/> -<v x="0.103893" y="0.617069" z="0.794968" nx="0.319895" ny="0.765404" nz="0.558367"/> -<v x="0.103893" y="0.617069" z="0.530948" nx="0.319895" ny="0.765404" nz="-0.558367"/> -<t v1="129" v2="131" v3="130"/> -<t v1="129" v2="130" v3="128"/> -<v x="0.103893" y="0.617069" z="0.794968" nx="0" ny="1" nz="-0"/> -<v x="-0.103021" y="0.617069" z="0.794968" nx="0" ny="1" nz="-0"/> -<v x="-0.103021" y="0.617069" z="0.530948" nx="0" ny="1" nz="-0"/> -<v x="0.103893" y="0.617069" z="0.530948" nx="0" ny="1" nz="-0"/> -<t v1="135" v2="134" v3="133"/> -<t v1="135" v2="133" v3="132"/> -<v x="-0.125193" y="0.592092" z="0.794968" nx="-0.722922" ny="0.436232" nz="0.535783"/> -<v x="-0.125193" y="0.592092" z="0.530948" nx="-0.722922" ny="0.436232" nz="-0.535783"/> -<t v1="134" v2="137" v3="136"/> -<t v1="134" v2="136" v3="133"/> -<v x="-0.143201" y="0.539425" z="0.794968" nx="-0.868557" ny="0.0790429" nz="0.489181"/> -<v x="-0.143201" y="0.539425" z="0.530948" nx="-0.868557" ny="0.0790429" nz="-0.489181"/> -<t v1="137" v2="139" v3="138"/> -<t v1="137" v2="138" v3="136"/> -<v x="-0.130736" y="0.45555" z="0.794968" nx="-0.844722" ny="-0.329661" nz="0.421552"/> -<v x="-0.130736" y="0.45555" z="0.530948" nx="-0.844722" ny="-0.329661" nz="-0.421552"/> -<t v1="139" v2="141" v3="140"/> -<t v1="139" v2="140" v3="138"/> -<v x="-0.095631" y="0.403523" z="0.794968" nx="-0.611255" ny="-0.706107" nz="0.357402"/> -<v x="-0.095631" y="0.403523" z="0.530948" nx="-0.611255" ny="-0.706107" nz="-0.357402"/> -<t v1="141" v2="143" v3="142"/> -<t v1="141" v2="142" v3="140"/> -<v x="-0.044596" y="0.378028" z="0.794968" nx="-0.274209" ny="-0.911618" nz="0.306101"/> -<v x="-0.044596" y="0.378028" z="0.530948" nx="-0.274209" ny="-0.911618" nz="-0.306101"/> -<t v1="143" v2="145" v3="144"/> -<t v1="143" v2="144" v3="142"/> -<t v1="145" v2="121" v3="118"/> -<t v1="145" v2="118" v3="144"/> -<v x="0.000436" y="0.409622" z="0.850468" nx="0" ny="-0.616962" nz="0.786981"/> -<v x="0.02127" y="0.412219" z="0.850468" nx="0.130284" ny="-0.435987" nz="0.890439"/> -<t v1="147" v2="146" v3="118"/> -<t v1="147" v2="118" v3="119"/> -<v x="-0.020398" y="0.412219" z="0.850468" nx="-0.103549" ny="-0.346538" nz="0.932279"/> -<t v1="146" v2="148" v3="144"/> -<t v1="146" v2="144" v3="118"/> -<v x="-0.043043" y="0.423531" z="0.850468" nx="-0.208716" ny="-0.24546" nz="0.946654"/> -<t v1="148" v2="149" v3="142"/> -<t v1="148" v2="142" v3="144"/> -<v x="-0.058502" y="0.446442" z="0.850468" nx="-0.254067" ny="-0.099826" nz="0.962004"/> -<t v1="149" v2="150" v3="140"/> -<t v1="149" v2="140" v3="142"/> -<v x="-0.058894" y="0.474135" z="0.850468" nx="-0.217811" ny="0.019715" nz="0.975768"/> -<t v1="150" v2="151" v3="138"/> -<t v1="150" v2="138" v3="140"/> -<v x="-0.046999" y="0.502906" z="0.850468" nx="-0.14835" ny="0.0966826" nz="0.984191"/> -<t v1="151" v2="152" v3="136"/> -<t v1="151" v2="136" v3="138"/> -<v x="-0.027314" y="0.515629" z="0.850468" nx="-0.0950041" ny="0.270425" nz="0.958007"/> -<t v1="152" v2="153" v3="133"/> -<t v1="152" v2="133" v3="136"/> -<v x="0.028186" y="0.515629" z="0.850468" nx="0.0712912" ny="0.202887" nz="0.976592"/> -<t v1="153" v2="154" v3="130"/> -<t v1="153" v2="130" v3="133"/> -<v x="0.047871" y="0.502906" z="0.850468" nx="0.14835" ny="0.0966826" nz="0.984191"/> -<t v1="154" v2="155" v3="128"/> -<t v1="154" v2="128" v3="130"/> -<v x="0.059766" y="0.474135" z="0.850468" nx="0.217811" ny="0.019715" nz="0.975768"/> -<t v1="155" v2="156" v3="126"/> -<t v1="155" v2="126" v3="128"/> -<v x="0.059374" y="0.446442" z="0.850468" nx="0.254067" ny="-0.099826" nz="0.962004"/> -<t v1="156" v2="157" v3="124"/> -<t v1="156" v2="124" v3="126"/> -<v x="0.043915" y="0.423531" z="0.850468" nx="0.208716" ny="-0.24546" nz="0.946654"/> -<t v1="157" v2="158" v3="122"/> -<t v1="157" v2="122" v3="124"/> -<t v1="158" v2="147" v3="119"/> -<t v1="158" v2="119" v3="122"/> -<v x="0.02127" y="0.412219" z="0.475448" nx="0.130284" ny="-0.435987" nz="-0.890439"/> -<v x="0.000436" y="0.409622" z="0.475448" nx="0" ny="-0.616962" nz="-0.786981"/> -<t v1="160" v2="159" v3="120"/> -<t v1="160" v2="120" v3="121"/> -<v x="0.043915" y="0.423531" z="0.475448" nx="0.208716" ny="-0.24546" nz="-0.946654"/> -<t v1="159" v2="161" v3="123"/> -<t v1="159" v2="123" v3="120"/> -<v x="0.059374" y="0.446442" z="0.475448" nx="0.254067" ny="-0.099826" nz="-0.962004"/> -<t v1="161" v2="162" v3="125"/> -<t v1="161" v2="125" v3="123"/> -<v x="0.059766" y="0.474135" z="0.475448" nx="0.217811" ny="0.019715" nz="-0.975768"/> -<t v1="162" v2="163" v3="127"/> -<t v1="162" v2="127" v3="125"/> -<v x="0.047871" y="0.502906" z="0.475448" nx="0.14835" ny="0.0966826" nz="-0.984191"/> -<t v1="163" v2="164" v3="129"/> -<t v1="163" v2="129" v3="127"/> -<v x="0.028186" y="0.515629" z="0.475448" nx="0.0712912" ny="0.202887" nz="-0.976592"/> -<t v1="164" v2="165" v3="131"/> -<t v1="164" v2="131" v3="129"/> -<v x="-0.027314" y="0.515629" z="0.475448" nx="-0.0950041" ny="0.270425" nz="-0.958007"/> -<t v1="165" v2="166" v3="134"/> -<t v1="165" v2="134" v3="131"/> -<v x="-0.046999" y="0.502906" z="0.475448" nx="-0.14835" ny="0.0966826" nz="-0.984191"/> -<t v1="166" v2="167" v3="137"/> -<t v1="166" v2="137" v3="134"/> -<v x="-0.058894" y="0.474135" z="0.475448" nx="-0.217811" ny="0.019715" nz="-0.975768"/> -<t v1="167" v2="168" v3="139"/> -<t v1="167" v2="139" v3="137"/> -<v x="-0.058502" y="0.446442" z="0.475448" nx="-0.254067" ny="-0.099826" nz="-0.962004"/> -<t v1="168" v2="169" v3="141"/> -<t v1="168" v2="141" v3="139"/> -<v x="-0.043043" y="0.423531" z="0.475448" nx="-0.208716" ny="-0.24546" nz="-0.946654"/> -<t v1="169" v2="170" v3="143"/> -<t v1="169" v2="143" v3="141"/> -<v x="-0.020398" y="0.412219" z="0.475448" nx="-0.103549" ny="-0.346538" nz="-0.932279"/> -<t v1="170" v2="171" v3="145"/> -<t v1="170" v2="145" v3="143"/> -<t v1="171" v2="160" v3="121"/> -<t v1="171" v2="121" v3="145"/> -<v x="-0.600238" y="0.430923" z="1.50399" nx="0.964507" ny="0.264016" nz="0"/> -<v x="-0.630313" y="0.502076" z="1.50399" nx="0.753105" ny="0.657857" nz="0"/> -<v x="-0.630313" y="0.494252" z="1.45962" nx="0.753105" ny="0.618183" nz="-0.224982"/> -<v x="-0.600238" y="0.427391" z="1.48395" nx="0.980102" ny="0.186407" nz="-0.0678426"/> -<t v1="175" v2="174" v3="173"/> -<t v1="175" v2="173" v3="172"/> -<v x="-0.647619" y="0.512255" z="1.50399" nx="-0.0909452" ny="0.995849" nz="0"/> -<v x="-0.647619" y="0.503818" z="1.45614" nx="-0.0909452" ny="0.935789" nz="-0.340587"/> -<t v1="174" v2="177" v3="176"/> -<t v1="174" v2="176" v3="173"/> -<v x="-0.666347" y="0.496092" z="1.50399" nx="-0.910031" ny="0.414472" nz="0"/> -<v x="-0.666347" y="0.488629" z="1.46166" nx="-0.910062" ny="0.389447" nz="-0.141728"/> +<v x="0.491722" y="0.37894" z="-1.68252" nx="0" ny="0.23072" nz="-0.972991"/> +<v x="0.491722" y="0.346886" z="-1.69012" nx="0" ny="0.159459" nz="-0.987182"/> +<t v1="57" v2="59" v3="58"/> +<t v1="57" v2="58" v3="56"/> +<v x="0.460522" y="0.372632" z="-1.68252" nx="-0.0891751" ny="0.212989" nz="-0.972961"/> +<v x="0.472838" y="0.343068" z="-1.69012" nx="-0.0615864" ny="0.14713" nz="-0.987182"/> +<t v1="59" v2="61" v3="60"/> +<t v1="59" v2="60" v3="58"/> +<v x="0.435048" y="0.355449" z="-1.68252" nx="-0.163488" ny="0.163488" nz="-0.9729"/> +<v x="0.457665" y="0.332833" z="-1.69012" nx="-0.112888" ny="0.112888" nz="-0.987152"/> +<t v1="61" v2="63" v3="62"/> +<t v1="61" v2="62" v3="60"/> +<t v1="63" v2="35" v3="32"/> +<t v1="63" v2="32" v3="62"/> +<v x="0.491722" y="0.298776" z="-1.69434" nx="0" ny="0" nz="-1"/> +<t v1="64" v2="34" v3="35"/> +<t v1="64" v2="37" v3="34"/> +<t v1="64" v2="39" v3="37"/> +<t v1="64" v2="41" v3="39"/> +<t v1="64" v2="43" v3="41"/> +<t v1="64" v2="45" v3="43"/> +<t v1="64" v2="47" v3="45"/> +<t v1="64" v2="49" v3="47"/> +<t v1="64" v2="51" v3="49"/> +<t v1="64" v2="53" v3="51"/> +<t v1="64" v2="55" v3="53"/> +<t v1="64" v2="57" v3="55"/> +<t v1="64" v2="59" v3="57"/> +<t v1="64" v2="61" v3="59"/> +<t v1="64" v2="63" v3="61"/> +<t v1="64" v2="35" v3="63"/> +<v x="0.511228" y="0.236075" z="1.60664" nx="-0.0820948" ny="-0.395856" nz="0.914609"/> +<v x="0.507015" y="0.237918" z="1.60664" nx="-0.21485" ny="-0.201941" nz="0.955504"/> +<v x="0.595477" y="0.237918" z="1.60664" nx="0.21485" ny="-0.201941" nz="0.955504"/> +<v x="0.591263" y="0.236075" z="1.60664" nx="0.0820948" ny="-0.395856" nz="0.914609"/> +<t v1="68" v2="67" v3="66"/> +<t v1="68" v2="66" v3="65"/> +<v x="0.509216" y="0.230876" z="1.59658" nx="-0.192206" ny="-0.930631" nz="0.31138"/> +<v x="0.503609" y="0.233299" z="1.59658" nx="-0.684133" ny="-0.657063" nz="0.316538"/> +<v x="0.505044" y="0.235655" z="1.60457" nx="-0.576342" ny="-0.548967" nz="0.605335"/> +<v x="0.510482" y="0.233283" z="1.60457" nx="-0.16306" ny="-0.788354" nz="0.593188"/> +<t v1="72" v2="71" v3="70"/> +<t v1="72" v2="70" v3="69"/> +<v x="0.501285" y="0.239145" z="1.59658" nx="-0.956298" ny="-0.180486" nz="0.229926"/> +<v x="0.502782" y="0.241367" z="1.60453" nx="-0.830134" ny="-0.15479" nz="0.53563"/> +<t v1="71" v2="74" v3="73"/> +<t v1="71" v2="73" v3="70"/> +<v x="0.501284" y="0.452135" z="1.59658" nx="-0.956298" ny="0.180517" nz="0.229926"/> +<v x="0.502782" y="0.449914" z="1.60453" nx="-0.830103" ny="0.15482" nz="0.53563"/> +<t v1="74" v2="76" v3="75"/> +<t v1="74" v2="75" v3="73"/> +<v x="0.503609" y="0.457982" z="1.59658" nx="-0.684072" ny="0.657094" nz="0.316538"/> +<v x="0.505044" y="0.455627" z="1.60457" nx="-0.576312" ny="0.548967" nz="0.605335"/> +<t v1="76" v2="78" v3="77"/> +<t v1="76" v2="77" v3="75"/> +<v x="0.509216" y="0.460405" z="1.59658" nx="-0.192175" ny="0.930662" nz="0.311319"/> +<v x="0.510482" y="0.457999" z="1.60457" nx="-0.16306" ny="0.788385" nz="0.593158"/> +<t v1="78" v2="80" v3="79"/> +<t v1="78" v2="79" v3="77"/> +<v x="0.593275" y="0.460405" z="1.59658" nx="0.192175" ny="0.930662" nz="0.311319"/> +<v x="0.592009" y="0.457999" z="1.60457" nx="0.16306" ny="0.788385" nz="0.593158"/> +<t v1="80" v2="82" v3="81"/> +<t v1="80" v2="81" v3="79"/> +<v x="0.598882" y="0.457982" z="1.59658" nx="0.684103" ny="0.657094" nz="0.316507"/> +<v x="0.597448" y="0.455627" z="1.60457" nx="0.576342" ny="0.548967" nz="0.605335"/> +<t v1="82" v2="84" v3="83"/> +<t v1="82" v2="83" v3="81"/> +<v x="0.601206" y="0.452135" z="1.59658" nx="0.956328" ny="0.180486" nz="0.229865"/> +<v x="0.599709" y="0.449914" z="1.60453" nx="0.830134" ny="0.15482" nz="0.5356"/> +<t v1="84" v2="86" v3="85"/> +<t v1="84" v2="85" v3="83"/> +<v x="0.601206" y="0.239145" z="1.59658" nx="0.956298" ny="-0.180486" nz="0.229896"/> +<v x="0.599709" y="0.241367" z="1.60453" nx="0.830134" ny="-0.15479" nz="0.5356"/> +<t v1="86" v2="88" v3="87"/> +<t v1="86" v2="87" v3="85"/> +<v x="0.598882" y="0.233299" z="1.59658" nx="0.684103" ny="-0.657063" nz="0.316568"/> +<v x="0.597448" y="0.235655" z="1.60457" nx="0.576342" ny="-0.548967" nz="0.605335"/> +<t v1="88" v2="90" v3="89"/> +<t v1="88" v2="89" v3="87"/> +<v x="0.593275" y="0.230876" z="1.59658" nx="0.192206" ny="-0.930631" nz="0.31138"/> +<v x="0.592009" y="0.233283" z="1.60457" nx="0.16306" ny="-0.788354" nz="0.593188"/> +<t v1="90" v2="92" v3="91"/> +<t v1="90" v2="91" v3="89"/> +<t v1="92" v2="72" v3="69"/> +<t v1="92" v2="69" v3="91"/> +<t v1="66" v2="71" v3="72"/> +<t v1="66" v2="72" v3="65"/> +<v x="0.50526" y="0.242384" z="1.60664" nx="-0.324992" ny="-0.0594501" nz="0.943815"/> +<t v1="93" v2="74" v3="71"/> +<t v1="93" v2="71" v3="66"/> +<v x="0.50526" y="0.448898" z="1.60664" nx="-0.324992" ny="0.0594806" nz="0.943815"/> +<t v1="94" v2="76" v3="74"/> +<t v1="94" v2="74" v3="93"/> +<v x="0.507015" y="0.453363" z="1.60664" nx="-0.21485" ny="0.201972" nz="0.955504"/> +<t v1="95" v2="78" v3="76"/> +<t v1="95" v2="76" v3="94"/> +<v x="0.511228" y="0.455207" z="1.60664" nx="-0.0820948" ny="0.395886" nz="0.914609"/> +<t v1="96" v2="80" v3="78"/> +<t v1="96" v2="78" v3="95"/> +<v x="0.591263" y="0.455207" z="1.60664" nx="0.0820948" ny="0.395886" nz="0.914609"/> +<t v1="97" v2="82" v3="80"/> +<t v1="97" v2="80" v3="96"/> +<v x="0.595477" y="0.453363" z="1.60664" nx="0.21485" ny="0.201972" nz="0.955504"/> +<t v1="98" v2="84" v3="82"/> +<t v1="98" v2="82" v3="97"/> +<v x="0.597232" y="0.448898" z="1.60664" nx="0.324992" ny="0.0594806" nz="0.943815"/> +<t v1="99" v2="86" v3="84"/> +<t v1="99" v2="84" v3="98"/> +<v x="0.597232" y="0.242384" z="1.60664" nx="0.324992" ny="-0.0594501" nz="0.943815"/> +<t v1="100" v2="88" v3="86"/> +<t v1="100" v2="86" v3="99"/> +<t v1="67" v2="90" v3="88"/> +<t v1="67" v2="88" v3="100"/> +<t v1="68" v2="92" v3="90"/> +<t v1="68" v2="90" v3="67"/> +<t v1="65" v2="72" v3="92"/> +<t v1="65" v2="92" v3="68"/> +<t v1="99" v2="98" v3="95"/> +<t v1="99" v2="95" v3="94"/> +<t v1="98" v2="97" v3="96"/> +<t v1="98" v2="96" v3="95"/> +<t v1="100" v2="99" v3="94"/> +<t v1="100" v2="94" v3="93"/> +<t v1="67" v2="100" v3="93"/> +<t v1="67" v2="93" v3="66"/> +<v x="-0.417867" y="0.329975" z="-1.68252" nx="0.212989" ny="0.0891751" nz="-0.972961"/> +<v x="-0.447431" y="0.317659" z="-1.69012" nx="0.14716" ny="0.0615864" nz="-0.987182"/> +<v x="-0.443612" y="0.298776" z="-1.69012" nx="0.159459" ny="0" nz="-0.987182"/> +<v x="-0.411559" y="0.298776" z="-1.68252" nx="0.23072" ny="0" nz="-0.972991"/> +<t v1="104" v2="103" v3="102"/> +<t v1="104" v2="102" v3="101"/> +<v x="-0.447431" y="0.279893" z="-1.69012" nx="0.14716" ny="-0.0615864" nz="-0.987182"/> +<v x="-0.417867" y="0.267576" z="-1.68252" nx="0.212989" ny="-0.0891751" nz="-0.972961"/> +<t v1="106" v2="105" v3="103"/> +<t v1="106" v2="103" v3="104"/> +<v x="-0.457665" y="0.264718" z="-1.69012" nx="0.112888" ny="-0.112888" nz="-0.987152"/> +<v x="-0.435049" y="0.242102" z="-1.68252" nx="0.163488" ny="-0.163488" nz="-0.972869"/> +<t v1="108" v2="107" v3="105"/> +<t v1="108" v2="105" v3="106"/> +<v x="-0.472839" y="0.254484" z="-1.69012" nx="0.0615864" ny="-0.14716" nz="-0.987182"/> +<v x="-0.460523" y="0.22492" z="-1.68252" nx="0.0891751" ny="-0.213019" nz="-0.972961"/> +<t v1="110" v2="109" v3="107"/> +<t v1="110" v2="107" v3="108"/> +<v x="-0.491723" y="0.250665" z="-1.69012" nx="0" ny="-0.159459" nz="-0.987182"/> +<v x="-0.491723" y="0.218612" z="-1.68252" nx="0" ny="-0.23075" nz="-0.972991"/> +<t v1="112" v2="111" v3="109"/> +<t v1="112" v2="109" v3="110"/> +<v x="-0.510606" y="0.254484" z="-1.69012" nx="-0.0615864" ny="-0.14716" nz="-0.987182"/> +<v x="-0.522922" y="0.22492" z="-1.68252" nx="-0.0891751" ny="-0.213019" nz="-0.972961"/> +<t v1="114" v2="113" v3="111"/> +<t v1="114" v2="111" v3="112"/> +<v x="-0.52578" y="0.264718" z="-1.69012" nx="-0.112888" ny="-0.112888" nz="-0.987152"/> +<v x="-0.548396" y="0.242102" z="-1.68252" nx="-0.163488" ny="-0.163488" nz="-0.972869"/> +<t v1="116" v2="115" v3="113"/> +<t v1="116" v2="113" v3="114"/> +<v x="-0.536014" y="0.279893" z="-1.69012" nx="-0.14716" ny="-0.0615864" nz="-0.987182"/> +<v x="-0.565579" y="0.267576" z="-1.68252" nx="-0.212989" ny="-0.0891751" nz="-0.972961"/> +<t v1="118" v2="117" v3="115"/> +<t v1="118" v2="115" v3="116"/> +<v x="-0.539833" y="0.298776" z="-1.69012" nx="-0.159459" ny="0" nz="-0.987182"/> +<v x="-0.571887" y="0.298776" z="-1.68252" nx="-0.23072" ny="0" nz="-0.972991"/> +<t v1="120" v2="119" v3="117"/> +<t v1="120" v2="117" v3="118"/> +<v x="-0.536014" y="0.317659" z="-1.69012" nx="-0.14716" ny="0.0615864" nz="-0.987182"/> +<v x="-0.565579" y="0.329975" z="-1.68252" nx="-0.212989" ny="0.0891751" nz="-0.972961"/> +<t v1="122" v2="121" v3="119"/> +<t v1="122" v2="119" v3="120"/> +<v x="-0.52578" y="0.332833" z="-1.69012" nx="-0.112888" ny="0.112888" nz="-0.987152"/> +<v x="-0.548396" y="0.355449" z="-1.68252" nx="-0.163488" ny="0.163488" nz="-0.9729"/> +<t v1="124" v2="123" v3="121"/> +<t v1="124" v2="121" v3="122"/> +<v x="-0.510606" y="0.343068" z="-1.69012" nx="-0.0615864" ny="0.14713" nz="-0.987182"/> +<v x="-0.522922" y="0.372632" z="-1.68252" nx="-0.0891751" ny="0.212989" nz="-0.972961"/> +<t v1="126" v2="125" v3="123"/> +<t v1="126" v2="123" v3="124"/> +<v x="-0.491723" y="0.346886" z="-1.69012" nx="0" ny="0.159459" nz="-0.987182"/> +<v x="-0.491723" y="0.37894" z="-1.68252" nx="0" ny="0.23072" nz="-0.972991"/> +<t v1="128" v2="127" v3="125"/> +<t v1="128" v2="125" v3="126"/> +<v x="-0.472839" y="0.343068" z="-1.69012" nx="0.0615864" ny="0.14713" nz="-0.987182"/> +<v x="-0.460523" y="0.372632" z="-1.68252" nx="0.0891751" ny="0.212989" nz="-0.972961"/> +<t v1="130" v2="129" v3="127"/> +<t v1="130" v2="127" v3="128"/> +<v x="-0.457665" y="0.332833" z="-1.69012" nx="0.112888" ny="0.112888" nz="-0.987152"/> +<v x="-0.435049" y="0.355449" z="-1.68252" nx="0.163488" ny="0.163488" nz="-0.9729"/> +<t v1="132" v2="131" v3="129"/> +<t v1="132" v2="129" v3="130"/> +<t v1="101" v2="102" v3="131"/> +<t v1="101" v2="131" v3="132"/> +<v x="-0.491723" y="0.298776" z="-1.69434" nx="0" ny="0" nz="-1"/> +<t v1="103" v2="133" v3="102"/> +<t v1="105" v2="133" v3="103"/> +<t v1="107" v2="133" v3="105"/> +<t v1="109" v2="133" v3="107"/> +<t v1="111" v2="133" v3="109"/> +<t v1="113" v2="133" v3="111"/> +<t v1="115" v2="133" v3="113"/> +<t v1="117" v2="133" v3="115"/> +<t v1="119" v2="133" v3="117"/> +<t v1="121" v2="133" v3="119"/> +<t v1="123" v2="133" v3="121"/> +<t v1="125" v2="133" v3="123"/> +<t v1="127" v2="133" v3="125"/> +<t v1="129" v2="133" v3="127"/> +<t v1="131" v2="133" v3="129"/> +<t v1="102" v2="133" v3="131"/> +<v x="-0.511228" y="0.236075" z="1.60664" nx="0.0820948" ny="-0.395856" nz="0.914609"/> +<v x="-0.591263" y="0.236075" z="1.60664" nx="-0.0820948" ny="-0.395856" nz="0.914609"/> +<v x="-0.595476" y="0.237918" z="1.60664" nx="-0.21485" ny="-0.201941" nz="0.955504"/> +<v x="-0.507014" y="0.237918" z="1.60664" nx="0.21485" ny="-0.201941" nz="0.955535"/> +<t v1="137" v2="136" v3="135"/> +<t v1="137" v2="135" v3="134"/> +<v x="-0.509216" y="0.230875" z="1.59658" nx="0.192175" ny="-0.930631" nz="0.31138"/> +<v x="-0.510482" y="0.233283" z="1.60457" nx="0.16306" ny="-0.788354" nz="0.593188"/> +<v x="-0.505043" y="0.235655" z="1.60457" nx="0.576342" ny="-0.548967" nz="0.605335"/> +<v x="-0.503609" y="0.233299" z="1.59658" nx="0.684103" ny="-0.657063" nz="0.316538"/> +<t v1="141" v2="140" v3="139"/> +<t v1="141" v2="139" v3="138"/> +<v x="-0.502782" y="0.241367" z="1.60453" nx="0.830134" ny="-0.15479" nz="0.5356"/> +<v x="-0.501285" y="0.239145" z="1.59658" nx="0.956298" ny="-0.180486" nz="0.229896"/> +<t v1="143" v2="142" v3="140"/> +<t v1="143" v2="140" v3="141"/> +<v x="-0.502782" y="0.449914" z="1.60453" nx="0.830134" ny="0.15482" nz="0.5356"/> +<v x="-0.501285" y="0.452135" z="1.59658" nx="0.956328" ny="0.180486" nz="0.229865"/> +<t v1="145" v2="144" v3="142"/> +<t v1="145" v2="142" v3="143"/> +<v x="-0.505043" y="0.455627" z="1.60457" nx="0.576342" ny="0.548967" nz="0.605304"/> +<v x="-0.503609" y="0.457982" z="1.59658" nx="0.684103" ny="0.657094" nz="0.316507"/> +<t v1="147" v2="146" v3="144"/> +<t v1="147" v2="144" v3="145"/> +<v x="-0.510482" y="0.457999" z="1.60457" nx="0.16306" ny="0.788385" nz="0.593127"/> +<v x="-0.509216" y="0.460405" z="1.59658" nx="0.192145" ny="0.930662" nz="0.311289"/> +<t v1="149" v2="148" v3="146"/> +<t v1="149" v2="146" v3="147"/> +<v x="-0.592009" y="0.457999" z="1.60457" nx="-0.16306" ny="0.788385" nz="0.593127"/> +<v x="-0.593275" y="0.460405" z="1.59658" nx="-0.192175" ny="0.930662" nz="0.311319"/> +<t v1="151" v2="150" v3="148"/> +<t v1="151" v2="148" v3="149"/> +<v x="-0.597447" y="0.455627" z="1.60457" nx="-0.576312" ny="0.548997" nz="0.605335"/> +<v x="-0.598882" y="0.457982" z="1.59658" nx="-0.684072" ny="0.657094" nz="0.316538"/> +<t v1="153" v2="152" v3="150"/> +<t v1="153" v2="150" v3="151"/> +<v x="-0.599709" y="0.449914" z="1.60453" nx="-0.830103" ny="0.15482" nz="0.53563"/> +<v x="-0.601206" y="0.452135" z="1.59658" nx="-0.956298" ny="0.180517" nz="0.229957"/> +<t v1="155" v2="154" v3="152"/> +<t v1="155" v2="152" v3="153"/> +<v x="-0.599709" y="0.241367" z="1.60453" nx="-0.830103" ny="-0.15482" nz="0.535661"/> +<v x="-0.601206" y="0.239145" z="1.59658" nx="-0.956298" ny="-0.180517" nz="0.229957"/> +<t v1="157" v2="156" v3="154"/> +<t v1="157" v2="154" v3="155"/> +<v x="-0.597447" y="0.235655" z="1.60457" nx="-0.576312" ny="-0.548967" nz="0.605335"/> +<v x="-0.598882" y="0.233299" z="1.59658" nx="-0.684103" ny="-0.657063" nz="0.316568"/> +<t v1="159" v2="158" v3="156"/> +<t v1="159" v2="156" v3="157"/> +<v x="-0.592009" y="0.233283" z="1.60457" nx="-0.16306" ny="-0.788354" nz="0.593188"/> +<v x="-0.593275" y="0.230875" z="1.59658" nx="-0.192175" ny="-0.930631" nz="0.31138"/> +<t v1="161" v2="160" v3="158"/> +<t v1="161" v2="158" v3="159"/> +<t v1="138" v2="139" v3="160"/> +<t v1="138" v2="160" v3="161"/> +<t v1="139" v2="140" v3="137"/> +<t v1="139" v2="137" v3="134"/> +<v x="-0.505259" y="0.242384" z="1.60664" nx="0.324992" ny="-0.0594806" nz="0.943815"/> +<t v1="140" v2="142" v3="162"/> +<t v1="140" v2="162" v3="137"/> +<v x="-0.505259" y="0.448898" z="1.60664" nx="0.324992" ny="0.0594806" nz="0.943815"/> +<t v1="142" v2="144" v3="163"/> +<t v1="142" v2="163" v3="162"/> +<v x="-0.507014" y="0.453363" z="1.60664" nx="0.21485" ny="0.201941" nz="0.955504"/> +<t v1="144" v2="146" v3="164"/> +<t v1="144" v2="164" v3="163"/> +<v x="-0.511228" y="0.455207" z="1.60664" nx="0.0820948" ny="0.395886" nz="0.914609"/> +<t v1="146" v2="148" v3="165"/> +<t v1="146" v2="165" v3="164"/> +<v x="-0.591263" y="0.455207" z="1.60664" nx="-0.0820948" ny="0.395886" nz="0.914609"/> +<t v1="148" v2="150" v3="166"/> +<t v1="148" v2="166" v3="165"/> +<v x="-0.595476" y="0.453363" z="1.60664" nx="-0.21485" ny="0.201972" nz="0.955504"/> +<t v1="150" v2="152" v3="167"/> +<t v1="150" v2="167" v3="166"/> +<v x="-0.597231" y="0.448898" z="1.60664" nx="-0.324992" ny="0.0594806" nz="0.943815"/> +<t v1="152" v2="154" v3="168"/> +<t v1="152" v2="168" v3="167"/> +<v x="-0.597231" y="0.242384" z="1.60664" nx="-0.324992" ny="-0.0594806" nz="0.943815"/> +<t v1="154" v2="156" v3="169"/> +<t v1="154" v2="169" v3="168"/> +<t v1="156" v2="158" v3="136"/> +<t v1="156" v2="136" v3="169"/> +<t v1="158" v2="160" v3="135"/> +<t v1="158" v2="135" v3="136"/> +<t v1="160" v2="139" v3="134"/> +<t v1="160" v2="134" v3="135"/> +<t v1="164" v2="167" v3="168"/> +<t v1="164" v2="168" v3="163"/> +<t v1="165" v2="166" v3="167"/> +<t v1="165" v2="167" v3="164"/> +<t v1="163" v2="168" v3="169"/> +<t v1="163" v2="169" v3="162"/> +<t v1="162" v2="169" v3="136"/> +<t v1="162" v2="136" v3="137"/> +<v x="-0.401293" y="0.063934" z="1.37252" nx="0.760979" ny="0.580645" nz="0.289315"/> +<v x="-0.401293" y="0.0483563" z="1.38226" nx="0.4738" ny="0.15772" nz="0.866359"/> +<v x="-0.451579" y="0.0483563" z="1.38226" nx="-0.4738" ny="0.15772" nz="0.866359"/> +<v x="-0.451579" y="0.063934" z="1.37252" nx="-0.760979" ny="0.580645" nz="0.289315"/> +<t v1="173" v2="172" v3="171"/> +<t v1="173" v2="171" v3="170"/> +<v x="-0.401293" y="0.0283499" z="1.37824" nx="0.747551" ny="-0.415082" nz="0.518509"/> +<v x="-0.451579" y="0.0283499" z="1.37824" nx="-0.747551" ny="-0.415082" nz="0.518509"/> +<t v1="172" v2="175" v3="174"/> +<t v1="172" v2="174" v3="171"/> +<v x="-0.401293" y="0.0197383" z="1.3589" nx="0.750511" ny="-0.658956" nz="-0.0494705"/> +<v x="-0.451579" y="0.0197383" z="1.3589" nx="-0.750511" ny="-0.658956" nz="-0.0494705"/> +<t v1="175" v2="177" v3="176"/> +<t v1="175" v2="176" v3="174"/> +<v x="-0.401293" y="0.0316583" z="1.34026" nx="0.744835" ny="-0.66332" nz="-0.0720542"/> +<v x="-0.451579" y="0.0316583" z="1.34026" nx="-0.744835" ny="-0.66332" nz="-0.0720542"/> <t v1="177" v2="179" v3="178"/> <t v1="177" v2="178" v3="176"/> -<v x="-0.666347" y="0.488954" z="1.50399" nx="-0.856349" ny="-0.516343" nz="0"/> -<v x="-0.666347" y="0.481921" z="1.46411" nx="-0.856349" ny="-0.485183" nz="0.17658"/> +<v x="-0.401293" y="-0.0134422" z="1.21762" nx="0.707266" ny="-0.670949" nz="0.222602"/> +<v x="-0.451579" y="-0.0134422" z="1.21762" nx="-0.707266" ny="-0.670949" nz="0.222602"/> <t v1="179" v2="181" v3="180"/> <t v1="179" v2="180" v3="178"/> -<v x="-0.652601" y="0.481828" z="1.50399" nx="-0.857418" ny="-0.514573" nz="0"/> -<v x="-0.652601" y="0.475225" z="1.46654" nx="-0.857418" ny="-0.483535" nz="0.17597"/> +<v x="-0.401293" y="-0.0638308" z="1.0477" nx="0.707205" ny="-0.682852" nz="0.183111"/> +<v x="-0.451579" y="-0.0638308" z="1.0477" nx="-0.707205" ny="-0.682852" nz="0.183111"/> <t v1="181" v2="183" v3="182"/> <t v1="181" v2="182" v3="180"/> -<v x="-0.652709" y="0.455456" z="1.50399" nx="-0.800287" ny="0.599567" nz="0"/> -<v x="-0.652709" y="0.450443" z="1.47556" nx="-0.800287" ny="0.563402" nz="-0.205054"/> +<v x="-0.401293" y="-0.0906566" z="0.936029" nx="0.707083" ny="-0.687521" nz="0.165136"/> +<v x="-0.451579" y="-0.0906566" z="0.936029" nx="-0.707083" ny="-0.687521" nz="0.165136"/> <t v1="183" v2="185" v3="184"/> <t v1="183" v2="184" v3="182"/> -<v x="-0.674087" y="0.449348" z="1.50399" nx="-0.801538" ny="0.597919" nz="0"/> -<v x="-0.674087" y="0.444704" z="1.47765" nx="-0.801538" ny="0.561846" nz="-0.204505"/> -<t v1="185" v2="187" v3="186"/> -<t v1="185" v2="186" v3="184"/> -<v x="-0.782335" y="0.393546" z="1.50399" nx="-0.621906" ny="0.783074" nz="0"/> -<v x="-0.790645" y="0.372342" z="1.50399" nx="-1" ny="0" nz="0"/> -<v x="-0.782335" y="0.392268" z="1.49674" nx="-0.621906" ny="0.735862" nz="-0.2678"/> -<t v1="190" v2="189" v3="188"/> -<v x="-0.630313" y="0.471724" z="1.4206" nx="0.753105" ny="0.503952" nz="-0.422864"/> -<v x="-0.600238" y="0.417218" z="1.46633" nx="0.987335" ny="0.121433" nz="-0.101901"/> -<t v1="192" v2="191" v3="174"/> -<t v1="192" v2="174" v3="175"/> -<v x="-0.647619" y="0.479522" z="1.41405" nx="-0.0909452" ny="0.762841" nz="-0.640095"/> -<t v1="191" v2="193" v3="177"/> -<t v1="191" v2="177" v3="174"/> -<v x="-0.666347" y="0.46714" z="1.42444" nx="-0.910062" ny="0.317484" nz="-0.266396"/> -<t v1="193" v2="194" v3="179"/> +<v x="-0.401293" y="-0.0477991" z="0.931504" nx="0.707083" ny="0.695883" nz="-0.125431"/> +<v x="-0.401293" y="-0.0276645" z="1.04319" nx="0.707175" ny="0.692984" nz="-0.140049"/> +<v x="-0.451579" y="-0.0276645" z="1.04319" nx="-0.707175" ny="0.692984" nz="-0.140049"/> +<v x="-0.451579" y="-0.0477991" z="0.931504" nx="-0.707083" ny="0.695883" nz="-0.125431"/> +<t v1="189" v2="188" v3="187"/> +<t v1="189" v2="187" v3="186"/> +<v x="-0.401293" y="0.0108892" z="1.21519" nx="0.707358" ny="0.683248" nz="-0.181005"/> +<v x="-0.451579" y="0.0108892" z="1.21519" nx="-0.707358" ny="0.683248" nz="-0.181005"/> +<t v1="188" v2="191" v3="190"/> +<t v1="188" v2="190" v3="187"/> +<v x="-0.401293" y="0.048532" z="1.33799" nx="0.717795" ny="0.595965" nz="-0.359935"/> +<v x="-0.451579" y="0.048532" z="1.33799" nx="-0.717795" ny="0.595965" nz="-0.359935"/> +<t v1="191" v2="193" v3="192"/> +<t v1="191" v2="192" v3="190"/> +<v x="-0.401293" y="0.0620773" z="1.35143" nx="0.728935" ny="0.6198" nz="-0.290658"/> +<v x="-0.451579" y="0.0620773" z="1.35143" nx="-0.728935" ny="0.6198" nz="-0.290658"/> +<t v1="193" v2="195" v3="194"/> +<t v1="193" v2="194" v3="192"/> +<t v1="195" v2="173" v3="170"/> +<t v1="195" v2="170" v3="194"/> +<t v1="176" v2="194" v3="170"/> +<t v1="176" v2="170" v3="174"/> <t v1="193" v2="179" v3="177"/> -<v x="-0.666347" y="0.461672" z="1.42903" nx="-0.856349" ny="-0.39552" nz="0.331889"/> -<t v1="194" v2="195" v3="181"/> -<t v1="194" v2="181" v3="179"/> -<v x="-0.652601" y="0.456213" z="1.43361" nx="-0.857418" ny="-0.394177" nz="0.33076"/> -<t v1="195" v2="196" v3="183"/> -<t v1="195" v2="183" v3="181"/> -<v x="-0.652709" y="0.436011" z="1.45056" nx="-0.800287" ny="0.459304" nz="-0.385388"/> -<t v1="196" v2="197" v3="185"/> -<t v1="196" v2="185" v3="183"/> -<v x="-0.674087" y="0.431332" z="1.45449" nx="-0.801538" ny="0.458022" nz="-0.38432"/> -<t v1="197" v2="198" v3="187"/> -<t v1="197" v2="187" v3="185"/> -<v x="-0.782335" y="0.388586" z="1.49036" nx="-0.621906" ny="0.599872" nz="-0.503342"/> -<t v1="199" v2="189" v3="190"/> -<v x="-0.630313" y="0.437209" z="1.39164" nx="0.753105" ny="0.328929" nz="-0.56972"/> -<v x="-0.600238" y="0.401633" z="1.45326" nx="0.987335" ny="0.0792566" nz="-0.137272"/> -<t v1="201" v2="200" v3="191"/> -<t v1="201" v2="191" v3="192"/> -<v x="-0.647619" y="0.442299" z="1.38282" nx="-0.0909452" ny="0.497909" nz="-0.862423"/> -<t v1="200" v2="202" v3="193"/> -<t v1="200" v2="193" v3="191"/> -<v x="-0.666347" y="0.434217" z="1.39682" nx="-0.910062" ny="0.207221" nz="-0.358928"/> -<t v1="202" v2="203" v3="194"/> -<t v1="202" v2="194" v3="193"/> -<v x="-0.666347" y="0.430648" z="1.403" nx="-0.856349" ny="-0.258156" nz="0.447157"/> -<t v1="203" v2="204" v3="195"/> -<t v1="203" v2="195" v3="194"/> -<v x="-0.652601" y="0.427085" z="1.40917" nx="-0.857418" ny="-0.257271" nz="0.445631"/> -<t v1="204" v2="205" v3="196"/> -<t v1="204" v2="196" v3="195"/> -<v x="-0.652709" y="0.413899" z="1.43201" nx="-0.800287" ny="0.299783" nz="-0.519242"/> -<t v1="205" v2="206" v3="197"/> -<t v1="205" v2="197" v3="196"/> -<v x="-0.674087" y="0.410845" z="1.4373" nx="-0.801538" ny="0.298959" nz="-0.517808"/> -<t v1="206" v2="207" v3="198"/> -<t v1="206" v2="198" v3="197"/> -<v x="-0.782335" y="0.382944" z="1.48563" nx="-0.621906" ny="0.391522" nz="-0.678182"/> -<t v1="208" v2="189" v3="199"/> -<v x="-0.630313" y="0.39487" z="1.37623" nx="0.753105" ny="0.114231" nz="-0.647877"/> -<v x="-0.600238" y="0.382514" z="1.4463" nx="0.987335" ny="0.0275277" nz="-0.156133"/> -<t v1="210" v2="209" v3="200"/> -<t v1="210" v2="200" v3="201"/> -<v x="-0.647619" y="0.396638" z="1.3662" nx="-0.0909452" ny="0.172918" nz="-0.980712"/> -<t v1="209" v2="211" v3="202"/> -<t v1="209" v2="202" v3="200"/> -<v x="-0.666347" y="0.393831" z="1.38212" nx="-0.910062" ny="0.0719626" nz="-0.408155"/> -<t v1="211" v2="212" v3="203"/> -<t v1="211" v2="203" v3="202"/> -<v x="-0.666347" y="0.392591" z="1.38915" nx="-0.856349" ny="-0.0896634" nz="0.508499"/> -<t v1="212" v2="213" v3="204"/> -<t v1="212" v2="204" v3="203"/> -<v x="-0.652601" y="0.391354" z="1.39617" nx="-0.857418" ny="-0.0893277" nz="0.50676"/> -<t v1="213" v2="214" v3="205"/> -<t v1="213" v2="205" v3="204"/> -<v x="-0.652709" y="0.386774" z="1.42214" nx="-0.800287" ny="0.104099" nz="-0.590472... [truncated message content] |
From: <cf...@us...> - 2007-09-28 08:25:41
|
Revision: 1152 http://automanic.svn.sourceforge.net/automanic/?rev=1152&view=rev Author: cfraz89 Date: 2007-09-28 01:25:43 -0700 (Fri, 28 Sep 2007) Log Message: ----------- added test voyager Modified Paths: -------------- trunk/ioData/menus/ioGameMenu.py trunk/ioData/scripts/ioNetworkEntBase.py trunk/ioData/scripts/ioNetworkEntCl.py trunk/ioData/server/game/celstart.cfg trunk/ioData/vehicles/ioVehicleBase.py trunk/ioData/vehicles/voyager/factories/genVoyagerWheel Modified: trunk/ioData/menus/ioGameMenu.py =================================================================== --- trunk/ioData/menus/ioGameMenu.py 2007-09-28 07:06:24 UTC (rev 1151) +++ trunk/ioData/menus/ioGameMenu.py 2007-09-28 08:25:43 UTC (rev 1152) @@ -78,6 +78,7 @@ #Now ask the user if they want to quit the server if it exists def pctimer_poll_wait(self, pc, args): + self.timer.Clear() if self.serverfound: if ioDataBin.Get('mpgame'): self.menu.clear() @@ -110,6 +111,8 @@ self.afterpoll() def quitgame(self): + netgame = Entities['ioNetMgrCl'] + netgame.Behaviour.SendMessage('leavegame', None, celGenericParameterBlock(0)) q = CS_QUERY_REGISTRY (oreg, iEventQueue) if q: q.GetEventOutlet().Broadcast (csevQuit (oreg)) Modified: trunk/ioData/scripts/ioNetworkEntBase.py =================================================================== --- trunk/ioData/scripts/ioNetworkEntBase.py 2007-09-28 07:06:24 UTC (rev 1151) +++ trunk/ioData/scripts/ioNetworkEntBase.py 2007-09-28 08:25:43 UTC (rev 1152) @@ -20,6 +20,7 @@ self.front = csVector3(0, 0, -1) self.codename = '' self.net = ioNetHelper.ioNetHelper() + self.timer = celTimer(self.entity) ##Interpolate our rotation for 150ms def pctimer_wakeupframe(self, pc, args): @@ -40,10 +41,10 @@ if distance > 5.0: print 'setting position' self.body.SetPosition(pos) - self.unstuck(False) + #self.unstuck(False) #Otherwise do a little correction elif distance > 0.1: - correction = diff * 5.0 + correction = diff * 2.0 self.body.SetLinearVelocity(lvel + correction) #Get quaternion from server. Work out some stuff in order to add a torque to our body to correct it. Modified: trunk/ioData/scripts/ioNetworkEntCl.py =================================================================== --- trunk/ioData/scripts/ioNetworkEntCl.py 2007-09-28 07:06:24 UTC (rev 1151) +++ trunk/ioData/scripts/ioNetworkEntCl.py 2007-09-28 08:25:43 UTC (rev 1152) @@ -26,6 +26,8 @@ def __init__(self, celEntity): ioNetworkEntBase.__init__(self, celEntity) + self.timer.WakeUp(25, True, 'send_rot') + self.timer.WakeUp(50, True, 'send_pos') #Register or unregister from the network. def setregistered(self, pc, args): Modified: trunk/ioData/server/game/celstart.cfg =================================================================== --- trunk/ioData/server/game/celstart.cfg 2007-09-28 07:06:24 UTC (rev 1151) +++ trunk/ioData/server/game/celstart.cfg 2007-09-28 08:25:43 UTC (rev 1152) @@ -9,7 +9,7 @@ ; The collision detection system. System.Plugins.iCollideSystem = crystalspace.collisiondetection.opcode -System.Plugins.iGraphics3D = crystalspace.graphics3d.null +System.Plugins.iGraphics3D = crystalspace.graphics3d.opengl System.Plugins.iEngine = crystalspace.engine.3d System.Plugins.iFontServer = crystalspace.font.server.multiplexer System.Plugins.iFontServer.1 = crystalspace.font.server.freetype2 Modified: trunk/ioData/vehicles/ioVehicleBase.py =================================================================== --- trunk/ioData/vehicles/ioVehicleBase.py 2007-09-28 07:06:24 UTC (rev 1151) +++ trunk/ioData/vehicles/ioVehicleBase.py 2007-09-28 08:25:43 UTC (rev 1152) @@ -73,12 +73,7 @@ self.fire = None self.shatterfact = Engine.FindMeshFactory('windowShatter') - #When subclassed by ioVehicle, has to be kept in sync with the timer time in ioNetworkEnt - self.timer = celTimer(self.entity) self.timer.WakeUp(50, True, 'update') - self.timer.WakeUp(25, True, 'send_rot') - self.timer.WakeUp(50, True, 'send_pos') - #timer.WakeUpFrame(0) #This dict matches up sets of similar weapons. eg {'FLMR' : [0,2,4], 'BRWNG' : [1,5]} self.weapongroups = {} @@ -912,7 +907,7 @@ self.unstuck(True) def unstuck(self, resetorientation): - self.mech.AddForceDuration(csVector3(0, 25.0 * self.mech.GetMass() ,0), False, csVector3(0), 0.25) + self.mech.AddForceDuration(csVector3(0, 25.0 * self.mech.GetMass() ,0), False, csVector3(0), 0.1) if resetorientation: self.mech.Body.SetTransform(csOrthoTransform(csMatrix3(), self.mech.Body.GetPosition())) Modified: trunk/ioData/vehicles/voyager/factories/genVoyagerWheel =================================================================== --- trunk/ioData/vehicles/voyager/factories/genVoyagerWheel 2007-09-28 07:06:24 UTC (rev 1151) +++ trunk/ioData/vehicles/voyager/factories/genVoyagerWheel 2007-09-28 08:25:43 UTC (rev 1152) @@ -4,235 +4,235 @@ <zuse/> <params> <material>Wheel01SG.001no</material> -<v x="-0.701816" y="0.510324" z="1.47484" nx="0.683218" ny="0.310251" nz="0.661"/> -<v x="-0.703964" y="0.515716" z="1.4763" nx="0.855739" ny="-0.229957" nz="0.463424"/> -<v x="-0.706873" y="0.521304" z="1.46386" nx="0.997833" ny="-0.0550859" nz="0.0354625"/> +<v x="0.0217707" y="0.140548" z="-0.0306522" nx="0.683218" ny="0.310251" nz="0.661"/> +<v x="0.0196227" y="0.14594" z="-0.0291932" nx="0.855739" ny="-0.229957" nz="0.463424"/> +<v x="0.0167137" y="0.151528" z="-0.0416371" nx="0.997833" ny="-0.0550859" nz="0.0354625"/> <t v1="2" v2="1" v3="0"/> -<v x="-0.707082" y="0.526579" z="1.50393" nx="0.933592" ny="-0.358257" nz="0.00512711"/> -<v x="-0.627212" y="0.564436" z="1.50435" nx="0.678518" ny="-0.73455" nz="0.00399792"/> -<v x="-0.626951" y="0.55787" z="1.45448" nx="0.677541" ny="-0.709494" nz="0.19364"/> +<v x="0.0165048" y="0.156803" z="-0.0015651" nx="0.933592" ny="-0.358257" nz="0.00512711"/> +<v x="0.0963748" y="0.19466" z="-0.00114715" nx="0.678518" ny="-0.73455" nz="0.00399792"/> +<v x="0.0966358" y="0.188094" z="-0.0510172" nx="0.677541" ny="-0.709494" nz="0.19364"/> <t v1="2" v2="5" v3="4"/> <t v1="2" v2="4" v3="3"/> -<v x="-0.621528" y="0.574287" z="1.50438" nx="0.992126" ny="0.125034" nz="0.00509659"/> -<v x="-0.621254" y="0.567386" z="1.45196" nx="0.992279" ny="0.120792" nz="-0.0271615"/> +<v x="0.102059" y="0.204511" z="-0.00111806" nx="0.992126" ny="0.125034" nz="0.00509659"/> +<v x="0.102333" y="0.19761" z="-0.0535371" nx="0.992279" ny="0.120792" nz="-0.0271615"/> <t v1="5" v2="7" v3="6"/> <t v1="5" v2="6" v3="4"/> -<v x="-0.625502" y="0.578339" z="1.50435" nx="0.982116" ny="0.188116" nz="0.00500504"/> -<v x="-0.625223" y="0.5713" z="1.45089" nx="0.98236" ny="0.181707" nz="-0.0435499"/> +<v x="0.0980847" y="0.208563" z="-0.00113916" nx="0.982116" ny="0.188116" nz="0.00500504"/> +<v x="0.0983638" y="0.201524" z="-0.0546072" nx="0.98236" ny="0.181707" nz="-0.0435499"/> <t v1="7" v2="9" v3="8"/> <t v1="7" v2="8" v3="6"/> -<v x="-0.611598" y="0.61167" z="1.50443" nx="0.980529" ny="-0.196265" nz="0.00521867"/> -<v x="-0.611273" y="0.603495" z="1.44233" nx="0.980255" ny="-0.18955" nz="0.0559099"/> +<v x="0.111989" y="0.241894" z="-0.00106609" nx="0.980529" ny="-0.196265" nz="0.00521867"/> +<v x="0.112314" y="0.233719" z="-0.0631601" nx="0.980255" ny="-0.18955" nz="0.0559099"/> <t v1="9" v2="11" v3="10"/> <t v1="9" v2="10" v3="8"/> -<v x="-0.611589" y="0.683139" z="1.50443" nx="0.989959" ny="0.141148" nz="0.00512711"/> -<v x="-0.611168" y="0.672529" z="1.42384" nx="0.990143" ny="0.136326" nz="-0.0313425"/> +<v x="0.111998" y="0.313363" z="-0.00106609" nx="0.989959" ny="0.141148" nz="0.00512711"/> +<v x="0.112419" y="0.302753" z="-0.0816581" nx="0.990143" ny="0.136326" nz="-0.0313425"/> <t v1="11" v2="13" v3="12"/> <t v1="11" v2="12" v3="10"/> -<v x="-0.627275" y="0.736978" z="1.50435" nx="0.830226" ny="0.55736" nz="0.00415052"/> -<v x="-0.62678" y="0.724533" z="1.40982" nx="0.830988" ny="0.538347" nz="-0.139897"/> +<v x="0.0963117" y="0.367202" z="-0.0011481" nx="0.830226" ny="0.55736" nz="0.00415052"/> +<v x="0.0968068" y="0.354757" z="-0.0956742" nx="0.830988" ny="0.538347" nz="-0.139897"/> <t v1="13" v2="15" v3="14"/> <t v1="13" v2="14" v3="12"/> -<v x="-0.632268" y="0.740937" z="1.50432" nx="0.351909" ny="0.936003" nz="0.00152593"/> -<v x="-0.721645" y="0.745212" z="1.50385" nx="0" ny="0.999969" nz="-0.000305185"/> -<v x="-0.721139" y="0.732487" z="1.40719" nx="0.00134281" ny="0.965911" nz="-0.258797"/> -<v x="-0.631768" y="0.728358" z="1.40877" nx="0.35316" ny="0.904111" nz="-0.240394"/> +<v x="0.0913187" y="0.371161" z="-0.00117409" nx="0.351909" ny="0.936003" nz="0.00152593"/> +<v x="0.00194174" y="0.375436" z="-0.00164211" nx="0" ny="0.999969" nz="-0.000305185"/> +<v x="0.00244772" y="0.362711" z="-0.0982991" nx="0.00134281" ny="0.965911" nz="-0.258797"/> +<v x="0.0918187" y="0.358582" z="-0.0967251" nx="0.35316" ny="0.904111" nz="-0.240394"/> <t v1="19" v2="18" v3="17"/> <t v1="19" v2="17" v3="16"/> -<v x="-0.811021" y="0.740937" z="1.50338" nx="-0.351909" ny="0.936003" nz="-0.00210578"/> -<v x="-0.810521" y="0.728358" z="1.40783" nx="-0.350627" ny="0.904111" nz="-0.244087"/> +<v x="-0.0874342" y="0.371161" z="-0.00210917" nx="-0.351909" ny="0.936003" nz="-0.00210578"/> +<v x="-0.0869343" y="0.358582" z="-0.0976601" nx="-0.350627" ny="0.904111" nz="-0.244087"/> <t v1="18" v2="21" v3="20"/> <t v1="18" v2="20" v3="17"/> -<v x="-0.816014" y="0.736978" z="1.50336" nx="-0.830226" ny="0.55736" nz="-0.00451674"/> -<v x="-0.8317" y="0.683139" z="1.50328" nx="-0.989959" ny="0.141148" nz="-0.00521867"/> -<v x="-0.831278" y="0.672529" z="1.42269" nx="-0.989776" ny="0.136326" nz="-0.0416883"/> -<v x="-0.81552" y="0.724533" z="1.40883" nx="-0.829493" ny="0.538377" nz="-0.148595"/> +<v x="-0.0924273" y="0.367202" z="-0.00213611" nx="-0.830226" ny="0.55736" nz="-0.00451674"/> +<v x="-0.108113" y="0.313363" z="-0.00221813" nx="-0.989959" ny="0.141148" nz="-0.00521867"/> +<v x="-0.107691" y="0.302753" z="-0.0828091" nx="-0.989776" ny="0.136326" nz="-0.0416883"/> +<v x="-0.0919333" y="0.354757" z="-0.0966622" nx="-0.829493" ny="0.538377" nz="-0.148595"/> <t v1="25" v2="24" v3="23"/> <t v1="25" v2="23" v3="22"/> -<v x="-0.831691" y="0.61167" z="1.50328" nx="-0.980529" ny="-0.196265" nz="-0.00500504"/> -<v x="-0.831366" y="0.603495" z="1.44118" nx="-0.980804" ny="-0.18955" nz="0.0456557"/> +<v x="-0.108104" y="0.241894" z="-0.00221813" nx="-0.980529" ny="-0.196265" nz="-0.00500504"/> +<v x="-0.107779" y="0.233719" z="-0.0643121" nx="-0.980804" ny="-0.18955" nz="0.0456557"/> <t v1="24" v2="27" v3="26"/> <t v1="24" v2="26" v3="23"/> -<v x="-0.817787" y="0.578339" z="1.50335" nx="-0.982116" ny="0.188116" nz="-0.00524918"/> -<v x="-0.817507" y="0.5713" z="1.44988" nx="-0.981872" ny="0.181707" nz="-0.0538041"/> +<v x="-0.0942003" y="0.208563" z="-0.00214517" nx="-0.982116" ny="0.188116" nz="-0.00524918"/> +<v x="-0.0939203" y="0.201524" z="-0.0556132" nx="-0.981872" ny="0.181707" nz="-0.0538041"/> <t v1="27" v2="29" v3="28"/> <t v1="27" v2="28" v3="26"/> -<v x="-0.821761" y="0.574287" z="1.50333" nx="-0.980895" ny="0.194311" nz="-0.00521867"/> -<v x="-0.821486" y="0.567386" z="1.45091" nx="-0.980651" ny="0.187689" nz="-0.0554216"/> +<v x="-0.0981743" y="0.204511" z="-0.00216615" nx="-0.980895" ny="0.194311" nz="-0.00521867"/> +<v x="-0.0978993" y="0.19761" z="-0.0545851" nx="-0.980651" ny="0.187689" nz="-0.0554216"/> <t v1="29" v2="31" v3="30"/> <t v1="29" v2="30" v3="28"/> -<v x="-0.817797" y="0.564436" z="1.50335" nx="-0.588763" ny="-0.808283" nz="-0.00259407"/> -<v x="-0.817536" y="0.55787" z="1.45348" nx="-0.589892" ny="-0.780694" nz="0.206091"/> +<v x="-0.0942103" y="0.19466" z="-0.00214517" nx="-0.588763" ny="-0.808283" nz="-0.00259407"/> +<v x="-0.0939493" y="0.188094" z="-0.0520141" nx="-0.589892" ny="-0.780694" nz="0.206091"/> <t v1="31" v2="33" v3="32"/> <t v1="31" v2="32" v3="30"/> -<v x="-0.7794" y="0.561885" z="1.50355" nx="-0.342174" ny="-0.939604" nz="-0.00119022"/> -<v x="-0.779142" y="0.555407" z="1.45434" nx="-0.343455" ny="-0.90759" nz="0.241371"/> +<v x="-0.0558133" y="0.192109" z="-0.00194407" nx="-0.342174" ny="-0.939604" nz="-0.00119022"/> +<v x="-0.0555553" y="0.185631" z="-0.0511531" nx="-0.343455" ny="-0.90759" nz="0.241371"/> <t v1="33" v2="35" v3="34"/> <t v1="33" v2="34" v3="32"/> -<v x="-0.730412" y="0.526064" z="1.50381" nx="-0.806513" ny="-0.591174" nz="-0.00381481"/> -<v x="-0.730203" y="0.520806" z="1.46387" nx="-0.865078" ny="-0.488571" nz="0.113681"/> +<v x="-0.00682527" y="0.156288" z="-0.00168812" nx="-0.806513" ny="-0.591174" nz="-0.00381481"/> +<v x="-0.00661623" y="0.15103" z="-0.0416261" nx="-0.865078" ny="-0.488571" nz="0.113681"/> <t v1="35" v2="37" v3="36"/> <t v1="35" v2="36" v3="34"/> -<v x="-0.728061" y="0.519147" z="1.50382" nx="-0.58449" ny="-0.811365" nz="-0.00289926"/> -<v x="-0.727987" y="0.515716" z="1.47618" nx="-0.648762" ny="-0.648915" nz="0.397443"/> +<v x="-0.00447428" y="0.149371" z="-0.00167513" nx="-0.58449" ny="-0.811365" nz="-0.00289926"/> +<v x="-0.00440025" y="0.14594" z="-0.0293181" nx="-0.648762" ny="-0.648915" nz="0.397443"/> <t v1="37" v2="39" v3="38"/> <t v1="37" v2="38" v3="36"/> -<v x="-0.695211" y="0.422489" z="1.50399" nx="-0.985107" ny="0.17185" nz="-0.0052797"/> -<v x="-0.746031" y="0.422489" z="1.50373" nx="-0.0728172" ny="0.995849" nz="-0.0543229"/> -<v x="-0.69508" y="0.415781" z="1.47884" nx="-0.993561" ny="0.107944" nz="-0.0339366"/> +<v x="0.0283757" y="0.0527129" z="-0.00150311" nx="-0.985107" ny="0.17185" nz="-0.0052797"/> +<v x="-0.0224442" y="0.0527129" z="-0.00176907" nx="-0.0728172" ny="0.995849" nz="-0.0543229"/> +<v x="0.0285068" y="0.0460049" z="-0.0266562" nx="-0.993561" ny="0.107944" nz="-0.0339366"/> <t v1="42" v2="41" v3="40"/> -<v x="-0.706678" y="0.505926" z="1.42673" nx="0.997864" ny="-0.0608539" nz="0.0226753"/> -<v x="-0.673454" y="0.439118" z="1.47633" nx="0.974212" ny="0.210028" nz="-0.0822474"/> +<v x="0.0169088" y="0.13615" z="-0.0787622" nx="0.997864" ny="-0.0608539" nz="0.0226753"/> +<v x="0.0501328" y="0.0693419" z="-0.0291672" nx="0.974212" ny="0.210028" nz="-0.0822474"/> <t v1="44" v2="43" v3="2"/> -<v x="-0.626709" y="0.53871" z="1.40822" nx="0.676656" ny="-0.635853" nz="0.371197"/> +<v x="0.0968778" y="0.168934" z="-0.0972722" nx="0.676656" ny="-0.635853" nz="0.371197"/> <t v1="43" v2="45" v3="5"/> <t v1="43" v2="5" v3="2"/> -<v x="-0.621" y="0.547242" z="1.40333" nx="0.992431" ny="0.10828" nz="-0.0573748"/> +<v x="0.102587" y="0.177466" z="-0.102168" nx="0.992431" ny="0.10828" nz="-0.0573748"/> <t v1="45" v2="46" v3="7"/> <t v1="45" v2="7" v3="5"/> -<v x="-0.624963" y="0.550751" z="1.40128" nx="0.982604" ny="0.162847" nz="-0.088992"/> +<v x="0.0986238" y="0.180975" z="-0.104215" nx="0.982604" ny="0.162847" nz="-0.088992"/> <t v1="46" v2="47" v3="9"/> <t v1="46" v2="9" v3="7"/> -<v x="-0.610972" y="0.579616" z="1.38469" nx="0.98001" ny="-0.169897" nz="0.103336"/> +<v x="0.112615" y="0.20984" z="-0.120807" nx="0.98001" ny="-0.169897" nz="0.103336"/> <t v1="47" v2="48" v3="11"/> <t v1="47" v2="11" v3="9"/> -<v x="-0.610776" y="0.641511" z="1.34895" nx="0.990326" ny="0.122196" nz="-0.0654317"/> +<v x="0.112811" y="0.271735" z="-0.156541" nx="0.990326" ny="0.122196" nz="-0.0654317"/> <t v1="48" v2="49" v3="13"/> <t v1="48" v2="13" v3="11"/> -<v x="-0.62632" y="0.688136" z="1.32195" nx="0.83169" ny="0.482589" nz="-0.274483"/> +<v x="0.0972667" y="0.31836" z="-0.183542" nx="0.83169" ny="0.482589" nz="-0.274483"/> <t v1="49" v2="50" v3="15"/> <t v1="49" v2="15" v3="13"/> -<v x="-0.720668" y="0.695267" z="1.31734" nx="0.00259407" ny="0.865841" nz="-0.500259"/> -<v x="-0.631304" y="0.691565" z="1.31995" nx="0.35432" ny="0.81048" nz="-0.466414"/> +<v x="0.00291872" y="0.325491" z="-0.188153" nx="0.00259407" ny="0.865841" nz="-0.500259"/> +<v x="0.0922827" y="0.321789" z="-0.185548" nx="0.35432" ny="0.81048" nz="-0.466414"/> <t v1="52" v2="51" v3="18"/> <t v1="52" v2="18" v3="19"/> -<v x="-0.810056" y="0.691565" z="1.31901" nx="-0.349437" ny="0.81045" nz="-0.470107"/> +<v x="-0.0864692" y="0.321789" z="-0.186483" nx="-0.349437" ny="0.81045" nz="-0.470107"/> <t v1="51" v2="53" v3="21"/> <t v1="51" v2="21" v3="18"/> -<v x="-0.830886" y="0.641511" z="1.3478" nx="-0.989593" ny="0.122196" nz="-0.0757775"/> -<v x="-0.81506" y="0.688136" z="1.32096" nx="-0.828791" ny="0.482589" nz="-0.283181"/> +<v x="-0.107299" y="0.271735" z="-0.157693" nx="-0.989593" ny="0.122196" nz="-0.0757775"/> +<v x="-0.0914733" y="0.31836" z="-0.18453" nx="-0.828791" ny="0.482589" nz="-0.283181"/> <t v1="55" v2="54" v3="24"/> <t v1="55" v2="24" v3="25"/> -<v x="-0.831064" y="0.579616" z="1.38354" nx="-0.981048" ny="-0.169897" nz="0.0930509"/> +<v x="-0.107477" y="0.20984" z="-0.121959" nx="-0.981048" ny="-0.169897" nz="0.0930509"/> <t v1="54" v2="56" v3="27"/> <t v1="54" v2="27" v3="24"/> -<v x="-0.817247" y="0.550751" z="1.40027" nx="-0.981628" ny="0.162847" nz="-0.0993072"/> +<v x="-0.0936602" y="0.180975" z="-0.105221" nx="-0.981628" ny="0.162847" nz="-0.0993072"/> <t v1="56" v2="57" v3="29"/> <t v1="56" v2="29" v3="27"/> -<v x="-0.821232" y="0.547242" z="1.40228" nx="-0.980407" ny="0.168249" nz="-0.10239"/> +<v x="-0.0976453" y="0.177466" z="-0.103216" nx="-0.980407" ny="0.168249" nz="-0.10239"/> <t v1="57" v2="58" v3="31"/> <t v1="57" v2="31" v3="29"/> -<v x="-0.817294" y="0.53871" z="1.40723" nx="-0.59096" ny="-0.699698" nz="0.40144"/> +<v x="-0.0937073" y="0.168934" z="-0.0982691" nx="-0.59096" ny="-0.699698" nz="0.40144"/> <t v1="58" v2="59" v3="33"/> <t v1="58" v2="33" v3="31"/> -<v x="-0.778903" y="0.536502" z="1.4087" nx="-0.344676" ny="-0.81341" nz="0.46852"/> +<v x="-0.0553163" y="0.166726" z="-0.0967932" nx="-0.344676" ny="-0.81341" nz="0.46852"/> <t v1="59" v2="60" v3="35"/> <t v1="59" v2="35" v3="33"/> -<v x="-0.730009" y="0.50548" z="1.42687" nx="-0.865261" ny="-0.428144" nz="0.26072"/> +<v x="-0.00642228" y="0.135704" z="-0.0786271" nx="-0.865261" ny="-0.428144" nz="0.26072"/> <t v1="60" v2="61" v3="37"/> <t v1="60" v2="37" v3="35"/> <t v1="61" v2="42" v3="37"/> -<v x="-0.745899" y="0.415781" z="1.47857" nx="-0.0748009" ny="0.84405" nz="-0.530961"/> +<v x="-0.0223123" y="0.0460049" z="-0.0269221" nx="-0.0748009" ny="0.84405" nz="-0.530961"/> <t v1="62" v2="41" v3="42"/> -<v x="-0.793789" y="0.413635" z="1.50347" nx="-0.731376" ny="0.681906" nz="-0.00427259"/> -<v x="-0.79368" y="0.408113" z="1.48275" nx="-0.730003" ny="0.58974" nz="-0.345317"/> +<v x="-0.0702023" y="0.0438589" z="-0.00201917" nx="-0.731376" ny="0.681906" nz="-0.00427259"/> +<v x="-0.0700933" y="0.0383369" z="-0.0227441" nx="-0.730003" ny="0.58974" nz="-0.345317"/> <t v1="62" v2="64" v3="63"/> <t v1="62" v2="63" v3="41"/> -<v x="-0.726213" y="0.510324" z="1.47471" nx="-0.787988" ny="-0.235511" nz="0.568804"/> +<v x="-0.00262624" y="0.140548" z="-0.0307791" nx="-0.787988" ny="-0.235511" nz="0.568804"/> <t v1="39" v2="37" v3="65"/> -<v x="-0.70068" y="0.438582" z="1.50396" nx="-0.897732" ny="0.440077" nz="-0.019013"/> -<v x="-0.701181" y="0.439746" z="1.50131" nx="-0.894009" ny="0.0890225" nz="0.43907"/> +<v x="0.0229067" y="0.0688059" z="-0.00153208" nx="-0.897732" ny="0.440077" nz="-0.019013"/> +<v x="0.0224057" y="0.0699699" z="-0.00418115" nx="-0.894009" ny="0.0890225" nz="0.43907"/> <t v1="67" v2="40" v3="66"/> -<v x="-0.707291" y="0.521393" z="1.54378" nx="0.998138" ny="-0.0553911" nz="-0.0254219"/> -<v x="-0.627472" y="0.55796" z="1.554" nx="0.679556" ny="-0.709586" nz="-0.186071"/> +<v x="0.0162957" y="0.151617" z="0.0382899" nx="0.998138" ny="-0.0553911" nz="-0.0254219"/> +<v x="0.0961148" y="0.188184" z="0.0485059" nx="0.679556" ny="-0.709586" nz="-0.186071"/> <t v1="4" v2="69" v3="68"/> <t v1="4" v2="68" v3="3"/> -<v x="-0.621802" y="0.567475" z="1.55658" nx="0.991943" ny="0.120762" nz="0.0374767"/> +<v x="0.101785" y="0.197699" z="0.0510858" nx="0.991943" ny="0.120762" nz="0.0374767"/> <t v1="6" v2="70" v3="69"/> <t v1="6" v2="69" v3="4"/> -<v x="-0.625781" y="0.57139" z="1.55761" nx="0.981872" ny="0.181677" nz="0.0536821"/> +<v x="0.0978057" y="0.201614" z="0.0521139" nx="0.981872" ny="0.181677" nz="0.0536821"/> <t v1="8" v2="71" v3="70"/> <t v1="8" v2="70" v3="6"/> -<v x="-0.611922" y="0.603584" z="1.56631" nx="0.980804" ny="-0.189581" nz="-0.0455336"/> +<v x="0.111665" y="0.233808" z="0.0608128" nx="0.980804" ny="-0.189581" nz="-0.0455336"/> <t v1="10" v2="72" v3="71"/> <t v1="10" v2="71" v3="8"/> -<v x="-0.61201" y="0.672618" z="1.5848" nx="0.989776" ny="0.136357" nz="0.0416578"/> +<v x="0.111577" y="0.302842" z="0.0793099" nx="0.989776" ny="0.136357" nz="0.0416578"/> <t v1="12" v2="73" v3="72"/> <t v1="12" v2="72" v3="10"/> -<v x="-0.627768" y="0.724622" z="1.59866" nx="0.829493" ny="0.538377" nz="0.148412"/> +<v x="0.0958188" y="0.354846" z="0.0931619" nx="0.829493" ny="0.538377" nz="0.148412"/> <t v1="14" v2="74" v3="73"/> <t v1="14" v2="73" v3="12"/> -<v x="-0.632767" y="0.728447" z="1.59966" nx="0.350658" ny="0.904202" nz="0.243812"/> -<v x="-0.722149" y="0.732576" z="1.60029" nx="-0.00134281" ny="0.966002" nz="0.258492"/> +<v x="0.0908197" y="0.358671" z="0.0941609" nx="0.350658" ny="0.904202" nz="0.243812"/> +<v x="0.00143772" y="0.3628" z="0.0947999" nx="-0.00134281" ny="0.966002" nz="0.258492"/> <t v1="17" v2="76" v3="75"/> <t v1="17" v2="75" v3="16"/> -<v x="-0.81152" y="0.728447" z="1.59872" nx="-0.353191" ny="0.904202" nz="0.24012"/> +<v x="-0.0879332" y="0.358671" z="0.0932258" nx="-0.353191" ny="0.904202" nz="0.24012"/> <t v1="20" v2="77" v3="76"/> <t v1="20" v2="76" v3="17"/> -<v x="-0.816508" y="0.724622" z="1.59767" nx="-0.831019" ny="0.538377" nz="0.139714"/> -<v x="-0.83212" y="0.672618" z="1.58365" nx="-0.990143" ny="0.136357" nz="0.0312815"/> +<v x="-0.0929213" y="0.354846" z="0.0921749" nx="-0.831019" ny="0.538377" nz="0.139714"/> +<v x="-0.108533" y="0.302842" z="0.0781579" nx="-0.990143" ny="0.136357" nz="0.0312815"/> <t v1="23" v2="79" v3="78"/> <t v1="23" v2="78" v3="22"/> -<v x="-0.832015" y="0.603584" z="1.56516" nx="-0.980255" ny="-0.189581" nz="-0.0558184"/> +<v x="-0.108428" y="0.233808" z="0.0596609" nx="-0.980255" ny="-0.189581" nz="-0.0558184"/> <t v1="26" v2="80" v3="79"/> <t v1="26" v2="79" v3="23"/> -<v x="-0.818065" y="0.57139" z="1.5566" nx="-0.982391" ny="0.181707" nz="0.0434278"/> +<v x="-0.0944782" y="0.201614" z="0.0511069" nx="-0.982391" ny="0.181707" nz="0.0434278"/> <t v1="28" v2="81" v3="80"/> <t v1="28" v2="80" v3="26"/> -<v x="-0.822034" y="0.567475" z="1.55553" nx="-0.98117" ny="0.187689" nz="0.0450453"/> +<v x="-0.0984473" y="0.197699" z="0.0500379" nx="-0.98117" ny="0.187689" nz="0.0450453"/> <t v1="30" v2="82" v3="81"/> <t v1="30" v2="81" v3="28"/> -<v x="-0.818057" y="0.557959" z="1.553" nx="-0.587725" ny="-0.780816" nz="-0.211768"/> +<v x="-0.0944703" y="0.188183" z="0.0475088" nx="-0.587725" ny="-0.780816" nz="-0.211768"/> <t v1="32" v2="83" v3="82"/> <t v1="32" v2="82" v3="30"/> -<v x="-0.779656" y="0.555496" z="1.55254" nx="-0.340953" ny="-0.907743" nz="-0.244392"/> +<v x="-0.0560693" y="0.18572" z="0.0470499" nx="-0.340953" ny="-0.907743" nz="-0.244392"/> <t v1="34" v2="84" v3="83"/> <t v1="34" v2="83" v3="32"/> -<v x="-0.73062" y="0.520896" z="1.54353" nx="-0.864009" ny="-0.488449" nz="-0.121921"/> +<v x="-0.00703329" y="0.15112" z="0.0380349" nx="-0.864009" ny="-0.488449" nz="-0.121921"/> <t v1="36" v2="85" v3="84"/> <t v1="36" v2="84" v3="34"/> -<v x="-0.728276" y="0.515716" z="1.53146" nx="-0.645039" ny="-0.648732" nz="-0.403729"/> +<v x="-0.00468928" y="0.14594" z="0.0259669" nx="-0.645039" ny="-0.648732" nz="-0.403729"/> <t v1="38" v2="86" v3="85"/> <t v1="38" v2="85" v3="36"/> -<v x="-0.695342" y="0.415871" z="1.52893" nx="-0.998962" ny="-0.0451674" nz="-0.00509659"/> -<v x="-0.746161" y="0.415871" z="1.52866" nx="-0.0994903" ny="0.86877" nz="0.485092"/> +<v x="0.0282447" y="0.0460949" z="0.0234329" nx="-0.998962" ny="-0.0451674" nz="-0.00509659"/> +<v x="-0.0225742" y="0.0460949" z="0.0231669" nx="-0.0994903" ny="0.86877" nz="0.485092"/> <t v1="41" v2="88" v3="87"/> <t v1="41" v2="87" v3="40"/> -<v x="-0.793896" y="0.408203" z="1.52398" nx="-0.733299" ny="0.59154" nz="0.335154"/> +<v x="-0.0703093" y="0.0384269" z="0.0184898" nx="-0.733299" ny="0.59154" nz="0.335154"/> <t v1="63" v2="89" v3="88"/> <t v1="63" v2="88" v3="41"/> -<v x="-0.726517" y="0.510324" z="1.53294" nx="-0.782464" ny="-0.235664" nz="-0.576342"/> +<v x="-0.00293028" y="0.140548" z="0.0274469" nx="-0.782464" ny="-0.235664" nz="-0.576342"/> <t v1="85" v2="86" v3="90"/> -<v x="-0.701208" y="0.439746" z="1.50661" nx="-0.885495" ny="0.0836818" nz="-0.456984"/> +<v x="0.0223787" y="0.0699699" z="0.00111187" nx="-0.885495" ny="0.0836818" nz="-0.456984"/> <t v1="40" v2="91" v3="66"/> -<v x="-0.704022" y="0.519147" z="1.50394" nx="0.833338" ny="-0.552721" nz="0.00412"/> -<v x="-0.704253" y="0.515716" z="1.53159" nx="0.860103" ny="-0.230476" nz="-0.455"/> +<v x="0.0195647" y="0.149371" z="-0.00154912" nx="0.833338" ny="-0.552721" nz="0.00412"/> +<v x="0.0193337" y="0.14594" z="0.0260929" nx="0.860103" ny="-0.230476" nz="-0.455"/> <t v1="93" v2="92" v3="3"/> <t v1="93" v2="3" v3="68"/> <t v1="1" v2="2" v3="3"/> <t v1="1" v2="3" v3="92"/> -<v x="-0.674632" y="0.447112" z="1.49869" nx="0.586963" ny="0.693228" nz="0.418134"/> -<v x="-0.6736" y="0.445249" z="1.5041" nx="0.708304" ny="0.705832" nz="-0.00680563"/> +<v x="0.0489547" y="0.0773359" z="-0.00680506" nx="0.586963" ny="0.693228" nz="0.418134"/> +<v x="0.0499867" y="0.0754729" z="-0.0013901" nx="0.708304" ny="0.705832" nz="-0.00680563"/> <t v1="95" v2="44" v3="94"/> -<v x="-0.702121" y="0.510324" z="1.53307" nx="0.689718" ny="0.309976" nz="-0.654347"/> +<v x="0.0214657" y="0.140548" z="0.0275738" nx="0.689718" ny="0.309976" nz="-0.654347"/> <t v1="93" v2="68" v3="96"/> <t v1="94" v2="44" v3="2"/> <t v1="94" v2="2" v3="0"/> -<v x="-0.673744" y="0.439208" z="1.53166" nx="0.965209" ny="0.239875" nz="0.103977"/> -<v x="-0.674874" y="0.447541" z="1.50967" nx="0.588977" ny="0.687796" nz="-0.424238"/> +<v x="0.0498427" y="0.0694319" z="0.0261708" nx="0.965209" ny="0.239875" nz="0.103977"/> +<v x="0.0487127" y="0.0777649" z="0.00417292" nx="0.588977" ny="0.687796" nz="-0.424238"/> <t v1="98" v2="97" v3="95"/> <t v1="96" v2="68" v3="97"/> <t v1="96" v2="97" v3="98"/> -<v x="-0.701208" y="0.439746" z="1.50661" nx="-0.213867" ny="0.882615" nz="-0.418632"/> -<v x="-0.70068" y="0.438582" z="1.50396" nx="-0.213867" ny="0.882615" nz="-0.418632"/> -<v x="-0.6736" y="0.445249" z="1.5041" nx="-0.213867" ny="0.882615" nz="-0.418632"/> -<v x="-0.674874" y="0.447541" z="1.50967" nx="-0.213867" ny="0.882615" nz="-0.418632"/> +<v x="0.0223787" y="0.0699699" z="0.00111187" nx="-0.213867" ny="0.882615" nz="-0.418632"/> +<v x="0.0229067" y="0.0688059" z="-0.00153208" nx="-0.213867" ny="0.882615" nz="-0.418632"/> +<v x="0.0499867" y="0.0754729" z="-0.0013901" nx="-0.213867" ny="0.882615" nz="-0.418632"/> +<v x="0.0487127" y="0.0777649" z="0.00417292" nx="-0.213867" ny="0.882615" nz="-0.418632"/> <t v1="102" v2="101" v3="100"/> <t v1="102" v2="100" v3="99"/> -<v x="-0.70068" y="0.438582" z="1.50396" nx="-0.217803" ny="0.899396" nz="0.37901"/> -<v x="-0.701181" y="0.439746" z="1.50131" nx="-0.217803" ny="0.899396" nz="0.37901"/> -<v x="-0.674632" y="0.447112" z="1.49869" nx="-0.217803" ny="0.899396" nz="0.37901"/> -<v x="-0.6736" y="0.445249" z="1.5041" nx="-0.217803" ny="0.899396" nz="0.37901"/> +<v x="0.0229067" y="0.0688059" z="-0.00153208" nx="-0.217803" ny="0.899396" nz="0.37901"/> +<v x="0.0224057" y="0.0699699" z="-0.00418115" nx="-0.217803" ny="0.899396" nz="0.37901"/> +<v x="0.0489547" y="0.0773359" z="-0.00680506" nx="-0.217803" ny="0.899396" nz="0.37901"/> +<v x="0.0499867" y="0.0754729" z="-0.0013901" nx="-0.217803" ny="0.899396" nz="0.37901"/> <t v1="106" v2="105" v3="104"/> <t v1="106" v2="104" v3="103"/> <t v1="65" v2="67" v3="94"/> @@ -259,144 +259,144 @@ <t v1="14" v2="75" v3="74"/> <t v1="20" v2="22" v3="78"/> <t v1="20" v2="78" v3="77"/> -<v x="-0.70135" y="0.44933" z="1.38582" nx="0.678854" ny="0.68981" nz="0.251564"/> -<v x="-0.703475" y="0.454182" z="1.38303" nx="0.855586" ny="0.16187" nz="0.491623"/> -<v x="-0.706383" y="0.449345" z="1.37028" nx="0.997589" ny="-0.0110172" nz="0.0682394"/> +<v x="0.0222368" y="0.0795539" z="-0.119677" nx="0.678854" ny="0.68981" nz="0.251564"/> +<v x="0.0201117" y="0.0844059" z="-0.12246" nx="0.855586" ny="0.16187" nz="0.491623"/> +<v x="0.0172037" y="0.0795689" z="-0.135216" nx="0.997589" ny="-0.0110172" nz="0.0682394"/> <t v1="109" v2="108" v3="107"/> -<v x="-0.706512" y="0.481411" z="1.39488" nx="0.932249" ny="-0.253151" nz="0.25837"/> -<v x="-0.626502" y="0.508179" z="1.36853" nx="0.675802" ny="-0.519059" nz="0.52327"/> -<v x="-0.626341" y="0.468273" z="1.33791" nx="0.675222" ny="-0.36726" nz="0.639668"/> +<v x="0.0170748" y="0.111635" z="-0.110611" nx="0.932249" ny="-0.253151" nz="0.25837"/> +<v x="0.0970848" y="0.138403" z="-0.136961" nx="0.675802" ny="-0.519059" nz="0.52327"/> +<v x="0.0972458" y="0.0984969" z="-0.167582" nx="0.675222" ny="-0.36726" nz="0.639668"/> <t v1="109" v2="112" v3="111"/> <t v1="109" v2="111" v3="110"/> -<v x="-0.620781" y="0.515145" z="1.3616" nx="0.992584" ny="0.0883816" nz="-0.083285"/> -<v x="-0.620613" y="0.473199" z="1.32941" nx="0.992676" ny="0.0625324" nz="-0.103092"/> +<v x="0.102806" y="0.145369" z="-0.143898" nx="0.992584" ny="0.0883816" nz="-0.083285"/> +<v x="0.102974" y="0.103423" z="-0.176084" nx="0.992676" ny="0.0625324" nz="-0.103092"/> <t v1="112" v2="114" v3="113"/> <t v1="112" v2="113" v3="111"/> -<v x="-0.62474" y="0.51801" z="1.35871" nx="0.982818" ny="0.132939" nz="-0.127964"/> -<v x="-0.624568" y="0.475225" z="1.32588" nx="0.982971" ny="0.0940275" nz="-0.15775"/> +<v x="0.0988467" y="0.148234" z="-0.146784" nx="0.982818" ny="0.132939" nz="-0.127964"/> +<v x="0.0990188" y="0.105449" z="-0.179614" nx="0.982971" ny="0.0940275" nz="-0.15775"/> <t v1="114" v2="116" v3="115"/> <t v1="114" v2="115" v3="113"/> -<v x="-0.610713" y="0.541579" z="1.33521" nx="0.979797" ny="-0.138707" nz="0.143986"/> -<v x="-0.610513" y="0.49189" z="1.29709" nx="0.979644" ny="-0.098117" nz="0.175085"/> +<v x="0.112874" y="0.171803" z="-0.170279" nx="0.979797" ny="-0.138707" nz="0.143986"/> +<v x="0.113074" y="0.122114" z="-0.208406" nx="0.979644" ny="-0.098117" nz="0.175085"/> <t v1="116" v2="118" v3="117"/> <t v1="116" v2="117" v3="115"/> -<v x="-0.610439" y="0.592115" z="1.28468" nx="0.990478" ny="0.099765" nz="-0.0946684"/> -<v x="-0.61018" y="0.527625" z="1.2352" nx="0.9906" ny="0.0705588" nz="-0.117069"/> +<v x="0.113148" y="0.222339" z="-0.220814" nx="0.990478" ny="0.099765" nz="-0.0946684"/> +<v x="0.113407" y="0.157849" z="-0.270299" nx="0.9906" ny="0.0705588" nz="-0.117069"/> <t v1="118" v2="120" v3="119"/> <t v1="118" v2="119" v3="117"/> -<v x="-0.625925" y="0.630185" z="1.24653" nx="0.83227" ny="0.394024" nz="-0.389904"/> -<v x="-0.625622" y="0.554544" z="1.18849" nx="0.832759" ny="0.278664" nz="-0.478317"/> +<v x="0.0976617" y="0.260409" z="-0.258966" nx="0.83227" ny="0.394024" nz="-0.389904"/> +<v x="0.0979648" y="0.184768" z="-0.317006" nx="0.832759" ny="0.278664" nz="-0.478317"/> <t v1="120" v2="122" v3="121"/> <t v1="120" v2="121" v3="119"/> -<v x="-0.630905" y="0.632984" z="1.2437" nx="0.355327" ny="0.661672" nz="-0.660237"/> -<v x="-0.720265" y="0.636007" z="1.24021" nx="0.00369274" ny="0.70687" nz="-0.707297"/> -<v x="-0.719954" y="0.558661" z="1.18086" nx="0.00451674" ny="0.499985" nz="-0.865993"/> -<v x="-0.630597" y="0.556524" z="1.18503" nx="0.356151" ny="0.468001" nz="-0.808771"/> +<v x="0.0926818" y="0.263208" z="-0.261792" nx="0.355327" ny="0.661672" nz="-0.660237"/> +<v x="0.00332177" y="0.266231" z="-0.265282" nx="0.00369274" ny="0.70687" nz="-0.707297"/> +<v x="0.00363272" y="0.188885" z="-0.324631" nx="0.00451674" ny="0.499985" nz="-0.865993"/> +<v x="0.0929897" y="0.186748" z="-0.320461" nx="0.356151" ny="0.468001" nz="-0.808771"/> <t v1="126" v2="125" v3="124"/> <t v1="126" v2="124" v3="123"/> -<v x="-0.809657" y="0.632984" z="1.24277" nx="-0.34843" ny="0.661641" nz="-0.6639"/> -<v x="-0.80935" y="0.556524" z="1.1841" nx="-0.347667" ny="0.468001" nz="-0.812433"/> +<v x="-0.0860702" y="0.263208" z="-0.262727" nx="-0.34843" ny="0.661641" nz="-0.6639"/> +<v x="-0.0857633" y="0.186748" z="-0.321397" nx="-0.347667" ny="0.468001" nz="-0.812433"/> <t v1="125" v2="128" v3="127"/> <t v1="125" v2="127" v3="124"/> -<v x="-0.814665" y="0.630185" z="1.24554" nx="-0.82815" ny="0.393994" nz="-0.398572"/> -<v x="-0.83055" y="0.592115" z="1.28353" nx="-0.989441" ny="0.099765" nz="-0.105014"/> -<v x="-0.830291" y="0.527624" z="1.23404" nx="-0.989319" ny="0.0705588" nz="-0.127415"/> -<v x="-0.814361" y="0.554544" z="1.1875" nx="-0.827723" ny="0.278664" nz="-0.487014"/> +<v x="-0.0910783" y="0.260409" z="-0.259953" nx="-0.82815" ny="0.393994" nz="-0.398572"/> +<v x="-0.106963" y="0.222339" z="-0.221966" nx="-0.989441" ny="0.099765" nz="-0.105014"/> +<v x="-0.106704" y="0.157848" z="-0.271451" nx="-0.989319" ny="0.0705588" nz="-0.127415"/> +<v x="-0.0907742" y="0.184768" z="-0.317994" nx="-0.827723" ny="0.278664" nz="-0.487014"/> <t v1="132" v2="131" v3="130"/> <t v1="132" v2="130" v3="129"/> -<v x="-0.830805" y="0.541579" z="1.33406" nx="-0.981262" ny="-0.138707" nz="0.133702"/> -<v x="-0.830606" y="0.49189" z="1.29594" nx="-0.981414" ny="-0.098117" nz="0.16483"/> +<v x="-0.107218" y="0.171803" z="-0.171431" nx="-0.981262" ny="-0.138707" nz="0.133702"/> +<v x="-0.107019" y="0.122114" z="-0.209557" nx="-0.981414" ny="-0.098117" nz="0.16483"/> <t v1="131" v2="134" v3="133"/> <t v1="131" v2="133" v3="130"/> -<v x="-0.817024" y="0.51801" z="1.3577" nx="-0.981414" ny="0.132939" nz="-0.138249"/> -<v x="-0.816853" y="0.475225" z="1.32487" nx="-0.981262" ny="0.0940275" nz="-0.168004"/> +<v x="-0.0934373" y="0.148234" z="-0.14779" nx="-0.981414" ny="0.132939" nz="-0.138249"/> +<v x="-0.0932662" y="0.105449" z="-0.18062" nx="-0.981262" ny="0.0940275" nz="-0.168004"/> <t v1="134" v2="136" v3="135"/> <t v1="134" v2="135" v3="133"/> -<v x="-0.821013" y="0.515145" z="1.36055" nx="-0.980193" ny="0.137364" nz="-0.142613"/> -<v x="-0.820845" y="0.473199" z="1.32836" nx="-0.980041" ny="0.0971404" nz="-0.173406"/> +<v x="-0.0974262" y="0.145369" z="-0.144945" nx="-0.980193" ny="0.137364" nz="-0.142613"/> +<v x="-0.0972583" y="0.103423" z="-0.177132" nx="-0.980041" ny="0.0971404" nz="-0.173406"/> <t v1="136" v2="138" v3="137"/> <t v1="136" v2="137" v3="135"/> -<v x="-0.817086" y="0.508179" z="1.36753" nx="-0.591754" ny="-0.571184" nz="0.568773"/> -<v x="-0.816926" y="0.468273" z="1.33692" nx="-0.592456" ny="-0.404126" nz="0.69686"/> +<v x="-0.0934992" y="0.138403" z="-0.137959" nx="-0.591754" ny="-0.571184" nz="0.568773"/> +<v x="-0.0933393" y="0.0984969" z="-0.168579" nx="-0.592456" ny="-0.404126" nz="0.69686"/> <t v1="138" v2="140" v3="139"/> <t v1="138" v2="139" v3="137"/> -<v x="-0.778698" y="0.506376" z="1.36954" nx="-0.345653" ny="-0.663991" nz="0.663015"/> -<v x="-0.77854" y="0.466998" z="1.33932" nx="-0.346446" ny="-0.469802" nz="0.811914"/> +<v x="-0.0551113" y="0.1366" z="-0.135954" nx="-0.345653" ny="-0.663991" nz="0.663015"/> +<v x="-0.0549533" y="0.0972219" z="-0.16617" nx="-0.346446" ny="-0.469802" nz="0.811914"/> <t v1="140" v2="142" v3="141"/> <t v1="140" v2="141" v3="139"/> -<v x="-0.729843" y="0.481046" z="1.39513" nx="-0.808679" ny="-0.417737" nz="0.414075"/> -<v x="-0.729715" y="0.449087" z="1.3706" nx="-0.880276" ny="-0.255318" nz="0.399853"/> +<v x="-0.00625628" y="0.11127" z="-0.110369" nx="-0.808679" ny="-0.417737" nz="0.414075"/> +<v x="-0.00612825" y="0.0793109" z="-0.134892" nx="-0.880276" ny="-0.255318" nz="0.399853"/> <t v1="142" v2="144" v3="143"/> <t v1="142" v2="143" v3="141"/> -<v x="-0.727517" y="0.476155" z="1.40003" nx="-0.587481" ny="-0.573626" nz="0.570757"/> -<v x="-0.727499" y="0.454182" z="1.38291" nx="-0.650533" ny="-0.175451" nz="0.738884"/> +<v x="-0.00393027" y="0.106379" z="-0.105465" nx="-0.587481" ny="-0.573626" nz="0.570757"/> +<v x="-0.00391227" y="0.0844059" z="-0.122586" nx="-0.650533" ny="-0.175451" nz="0.738884"/> <t v1="144" v2="146" v3="145"/> <t v1="144" v2="145" v3="143"/> -<v x="-0.695026" y="0.407808" z="1.46855" nx="-0.982452" ny="0.143437" nz="-0.119053"/> -<v x="-0.745803" y="0.3973" z="1.46022" nx="-0.0924101" ny="0.485611" nz="-0.869259"/> -<v x="-0.694984" y="0.3973" z="1.46048" nx="-0.99939" ny="0.0347301" nz="0.00238044"/> +<v x="0.0285608" y="0.0380319" z="-0.0369471" nx="-0.982452" ny="0.143437" nz="-0.119053"/> +<v x="-0.0222163" y="0.0275239" z="-0.0452762" nx="-0.0924101" ny="0.485611" nz="-0.869259"/> +<v x="0.0286027" y="0.0275239" z="-0.0450101" nx="-0.99939" ny="0.0347301" nz="0.00238044"/> <t v1="149" v2="148" v3="62"/> <t v1="149" v2="62" v3="147"/> -<v x="-0.793601" y="0.392872" z="1.46764" nx="-0.728416" ny="0.339" nz="-0.595355"/> +<v x="-0.0700142" y="0.0230959" z="-0.0378581" nx="-0.728416" ny="0.339" nz="-0.595355"/> <t v1="148" v2="150" v3="64"/> <t v1="148" v2="64" v3="62"/> -<v x="-0.673269" y="0.408679" z="1.44089" nx="0.981811" ny="0.104282" nz="-0.158513"/> -<v x="-0.706303" y="0.412219" z="1.3549" nx="0.99762" ny="-0.0374157" nz="0.0578021"/> -<v x="-0.673231" y="0.391169" z="1.43363" nx="0.981872" ny="0.0414441" nz="-0.18482"/> +<v x="0.0503178" y="0.0389029" z="-0.0646071" nx="0.981811" ny="0.104282" nz="-0.158513"/> +<v x="0.0172837" y="0.0424429" z="-0.150594" nx="0.99762" ny="-0.0374157" nz="0.0578021"/> +<v x="0.0503557" y="0.0213929" z="-0.0718601" nx="0.981872" ny="0.0414441" nz="-0.18482"/> <t v1="153" v2="152" v3="109"/> <t v1="153" v2="109" v3="151"/> -<v x="-0.626241" y="0.422017" z="1.31875" nx="0.674856" ny="-0.189642" nz="0.713126"/> +<v x="0.0973457" y="0.0522409" z="-0.186741" nx="0.674856" ny="-0.189642" nz="0.713126"/> <t v1="152" v2="154" v3="112"/> <t v1="152" v2="112" v3="109"/> -<v x="-0.620507" y="0.424567" z="1.30927" nx="0.992767" ny="0.0322886" nz="-0.115604"/> +<v x="0.10308" y="0.0547909" z="-0.196227" nx="0.992767" ny="0.0322886" nz="-0.115604"/> <t v1="154" v2="155" v3="114"/> <t v1="154" v2="114" v3="112"/> -<v x="-0.624461" y="0.425616" z="1.30533" nx="0.983062" ny="0.0485549" nz="-0.17655"/> +<v x="0.0991257" y="0.0558399" z="-0.200162" nx="0.983062" ny="0.0485549" nz="-0.17655"/> <t v1="155" v2="156" v3="116"/> <t v1="155" v2="116" v3="114"/> -<v x="-0.610388" y="0.434242" z="1.27321" nx="0.979522" ny="-0.0506912" nz="0.194708"/> +<v x="0.113199" y="0.0644659" z="-0.232284" nx="0.979522" ny="-0.0506912" nz="0.194708"/> <t v1="156" v2="157" v3="118"/> <t v1="156" v2="118" v3="116"/> -<v x="-0.610018" y="0.45274" z="1.20418" nx="0.990661" ny="0.0364696" nz="-0.131169"/> +<v x="0.113569" y="0.0829639" z="-0.301317" nx="0.990661" ny="0.0364696" nz="-0.131169"/> <t v1="157" v2="158" v3="120"/> <t v1="157" v2="120" v3="118"/> -<v x="-0.625431" y="0.466674" z="1.15209" nx="0.833064" ny="0.144078" nz="-0.534043"/> +<v x="0.0981557" y="0.0968979" z="-0.353402" nx="0.833064" ny="0.144078" nz="-0.534043"/> <t v1="158" v2="159" v3="122"/> <t v1="158" v2="122" v3="120"/> -<v x="-0.719759" y="0.468806" z="1.14364" nx="0.00503555" ny="0.258492" nz="-0.965972"/> -<v x="-0.630405" y="0.467699" z="1.14824" nx="0.356639" ny="0.241951" nz="-0.902341"/> +<v x="0.00382775" y="0.0990299" z="-0.36185" nx="0.00503555" ny="0.258492" nz="-0.965972"/> +<v x="0.0931817" y="0.0979229" z="-0.357253" nx="0.356639" ny="0.241951" nz="-0.902341"/> <t v1="161" v2="160" v3="125"/> <t v1="161" v2="125" v3="126"/> -<v x="-0.809157" y="0.467699" z="1.14731" nx="-0.347179" ny="0.241951" nz="-0.906034"/> +<v x="-0.0855703" y="0.0979229" z="-0.358188" nx="-0.347179" ny="0.241951" nz="-0.906034"/> <t v1="160" v2="162" v3="128"/> <t v1="160" v2="128" v3="125"/> -<v x="-0.830128" y="0.45274" z="1.20302" nx="-0.989257" ny="0.0364696" nz="-0.141514"/> -<v x="-0.814171" y="0.466674" z="1.1511" nx="-0.827448" ny="0.144047" nz="-0.542711"/> +<v x="-0.106541" y="0.0829639" z="-0.302469" nx="-0.989257" ny="0.0364696" nz="-0.141514"/> +<v x="-0.0905843" y="0.0968979" z="-0.35439" nx="-0.827448" ny="0.144047" nz="-0.542711"/> <t v1="164" v2="163" v3="131"/> <t v1="164" v2="131" v3="132"/> -<v x="-0.830481" y="0.434242" z="1.27206" nx="-0.981506" ny="-0.0506912" nz="0.184423"/> +<v x="-0.106894" y="0.0644659" z="-0.233436" nx="-0.981506" ny="-0.0506912" nz="0.184423"/> <t v1="163" v2="165" v3="134"/> <t v1="163" v2="134" v3="131"/> -<v x="-0.816745" y="0.425616" z="1.30432" nx="-0.98117" ny="0.0485549" nz="-0.186804"/> +<v x="-0.0931582" y="0.0558399" z="-0.201169" nx="-0.98117" ny="0.0485549" nz="-0.186804"/> <t v1="165" v2="166" v3="136"/> <t v1="165" v2="136" v3="134"/> -<v x="-0.820739" y="0.424567" z="1.30822" nx="-0.979919" ny="0.0501724" nz="-0.192816"/> +<v x="-0.0971522" y="0.0547909" z="-0.197275" nx="-0.979919" ny="0.0501724" nz="-0.192816"/> <t v1="166" v2="167" v3="138"/> <t v1="166" v2="138" v3="136"/> -<v x="-0.816825" y="0.422017" z="1.31775" nx="-0.592914" ny="-0.208716" nz="0.777703"/> +<v x="-0.0932382" y="0.0522409" z="-0.187739" nx="-0.592914" ny="-0.208716" nz="0.777703"/> <t v1="167" v2="168" v3="140"/> <t v1="167" v2="140" v3="138"/> -<v x="-0.778441" y="0.421357" z="1.32042" nx="-0.346965" ny="-0.242592" nz="0.905942"/> +<v x="-0.0548543" y="0.0515809" z="-0.185074" nx="-0.346965" ny="-0.242592" nz="0.905942"/> <t v1="168" v2="169" v3="142"/> <t v1="168" v2="142" v3="140"/> -<v x="-0.729634" y="0.412086" z="1.35528" nx="-0.867183" ny="-0.117405" nz="0.483902"/> +<v x="-0.00604725" y="0.0423099" z="-0.150218" nx="-0.867183" ny="-0.117405" nz="0.483902"/> <t v1="169" v2="170" v3="144"/> <t v1="169" v2="144" v3="142"/> <t v1="170" v2="149" v3="144"/> -<v x="-0.725747" y="0.44933" z="1.38569" nx="-0.679434" ny="0.361522" nz="0.638478"/> +<v x="-0.00216025" y="0.0795539" z="-0.119804" nx="-0.679434" ny="0.361522" nz="0.638478"/> <t v1="146" v2="144" v3="171"/> -<v x="-0.700435" y="0.419187" z="1.45714" nx="-0.896146" ny="0.300912" nz="-0.326121"/> -<v x="-0.700935" y="0.418139" z="1.45444" nx="-0.938658" ny="0.240364" nz="0.2472"/> +<v x="0.0231518" y="0.0494109" z="-0.0483551" nx="-0.896146" ny="0.300912" nz="-0.326121"/> +<v x="0.0226517" y="0.0483629" z="-0.0510521" nx="-0.938658" ny="0.240364" nz="0.2472"/> <t v1="173" v2="147" v3="172"/> <t v1="111" v2="45" v3="43"/> <t v1="111" v2="43" v3="110"/> @@ -428,41 +428,41 @@ <t v1="141" v2="59" v3="139"/> <t v1="143" v2="61" v3="60"/> <t v1="143" v2="60" v3="141"/> -<v x="-0.727703" y="0.493275" z="1.422" nx="-0.64803" ny="-0.741844" nz="0.172277"/> +<v x="-0.00411624" y="0.123499" z="-0.0834941" nx="-0.64803" ny="-0.741844" nz="0.172277"/> <t v1="145" v2="174" v3="61"/> <t v1="145" v2="61" v3="143"/> <t v1="62" v2="42" v3="147"/> -<v x="-0.725962" y="0.490503" z="1.42686" nx="-0.788446" ny="-0.570635" nz="-0.22953"/> +<v x="-0.00237525" y="0.120727" z="-0.0786321" nx="-0.788446" ny="-0.570635" nz="-0.22953"/> <t v1="61" v2="174" v3="175"/> -<v x="-0.700955" y="0.421881" z="1.45818" nx="-0.895321" ny="-0.25135" nz="-0.367656"/> +<v x="0.0226318" y="0.0521049" z="-0.0473092" nx="-0.895321" ny="-0.25135" nz="-0.367656"/> <t v1="147" v2="176" v3="172"/> -<v x="-0.703479" y="0.476155" z="1.40015" nx="0.831294" ny="-0.390973" nz="0.395032"/> -<v x="-0.70368" y="0.493275" z="1.42213" nx="0.858547" ny="-0.48793" nz="-0.157414"/> +<v x="0.0201077" y="0.106379" z="-0.10534" nx="0.831294" ny="-0.390973" nz="0.395032"/> +<v x="0.0199068" y="0.123499" z="-0.0833681" nx="0.858547" ny="-0.48793" nz="-0.157414"/> <t v1="178" v2="177" v3="110"/> <t v1="178" v2="110" v3="43"/> <t v1="108" v2="109" v3="110"/> <t v1="108" v2="110" v3="177"/> -<v x="-0.674363" y="0.421394" z="1.44742" nx="0.571245" ny="0.797632" nz="-0.193335"/> -<v x="-0.67333" y="0.423901" z="1.45257" nx="0.810938" ny="0.413434" nz="-0.413984"/> +<v x="0.0492237" y="0.0516179" z="-0.0580761" nx="0.571245" ny="0.797632" nz="-0.193335"/> +<v x="0.0502567" y="0.0541249" z="-0.0529281" nx="0.810938" ny="0.413434" nz="-0.413984"/> <t v1="180" v2="151" v3="179"/> -<v x="-0.701566" y="0.490503" z="1.42699" nx="0.68984" ny="-0.246101" nz="-0.680807"/> +<v x="0.0220208" y="0.120727" z="-0.0785052" nx="0.68984" ny="-0.246101" nz="-0.680807"/> <t v1="178" v2="43" v3="181"/> <t v1="179" v2="151" v3="109"/> <t v1="179" v2="109" v3="107"/> -<v x="-0.674588" y="0.429461" z="1.45488" nx="0.590808" ny="0.18421" nz="-0.785455"/> +<v x="0.0489987" y="0.0596849" z="-0.0506171" nx="0.590808" ny="0.18421" nz="-0.785455"/> <t v1="182" v2="44" v3="180"/> <t v1="181" v2="43" v3="44"/> <t v1="181" v2="44" v3="182"/> -<v x="-0.700955" y="0.421881" z="1.45818" nx="-0.211266" ny="0.328842" nz="-0.920451"/> -<v x="-0.700435" y="0.419187" z="1.45714" nx="-0.211266" ny="0.328842" nz="-0.920451"/> -<v x="-0.67333" y="0.423901" z="1.45257" nx="-0.211266" ny="0.328842" nz="-0.920451"/> -<v x="-0.674588" y="0.429461" z="1.45488" nx="-0.211266" ny="0.328842" nz="-0.920451"/> +<v x="0.0226318" y="0.0521049" z="-0.0473092" nx="-0.211266" ny="0.328842" nz="-0.920451"/> +<v x="0.0231518" y="0.0494109" z="-0.0483551" nx="-0.211266" ny="0.328842" nz="-0.920451"/> +<v x="0.0502567" y="0.0541249" z="-0.0529281" nx="-0.211266" ny="0.328842" nz="-0.920451"/> +<v x="0.0489987" y="0.0596849" z="-0.0506171" nx="-0.211266" ny="0.328842" nz="-0.920451"/> <t v1="186" v2="185" v3="184"/> <t v1="186" v2="184" v3="183"/> -<v x="-0.700435" y="0.419187" z="1.45714" nx="-0.213883" ny="0.904804" nz="-0.368218"/> -<v x="-0.700935" y="0.418139" z="1.45444" nx="-0.213883" ny="0.904804" nz="-0.368218"/> -<v x="-0.674363" y="0.421394" z="1.44742" nx="-0.213883" ny="0.904804" nz="-0.368218"/> -<v x="-0.67333" y="0.423901" z="1.45257" nx="-0.213883" ny="0.904804" nz="-0.368218"/> +<v x="0.0231518" y="0.0494109" z="-0.0483551" nx="-0.213883" ny="0.904804" nz="-0.368218"/> +<v x="0.0226517" y="0.0483629" z="-0.0510521" nx="-0.213883" ny="0.904804" nz="-0.368218"/> +<v x="0.0492237" y="0.0516179" z="-0.0580761" nx="-0.213883" ny="0.904804" nz="-0.368218"/> +<v x="0.0502567" y="0.0541249" z="-0.0529281" nx="-0.213883" ny="0.904804" nz="-0.368218"/> <t v1="190" v2="189" v3="188"/> <t v1="190" v2="188" v3="187"/> <t v1="179" v2="107" v3="171"/> @@ -489,147 +489,147 @@ <t v1="121" v2="52" v3="50"/> <t v1="127" v2="129" v3="55"/> <t v1="127" v2="55" v3="53"/> -<v x="-0.701246" y="0.34325" z="1.366" nx="0.688284" ny="0.657399" nz="-0.30665"/> -<v x="-0.703358" y="0.34472" z="1.36059" nx="0.85696" ny="0.458937" nz="0.234443"/> -<v x="-0.706303" y="0.332291" z="1.35499" nx="0.997711" ny="0.0302438" nz="0.0603046"/> +<v x="0.0223407" y="-0.0265261" z="-0.139498" nx="0.688284" ny="0.657399" nz="-0.30665"/> +<v x="0.0202287" y="-0.0250561" z="-0.144901" nx="0.85696" ny="0.458937" nz="0.234443"/> +<v x="0.0172837" y="-0.0374851" z="-0.150504" nx="0.997711" ny="0.0302438" nz="0.0603046"/> <t v1="193" v2="192" v3="191"/> -<v x="-0.706275" y="0.372363" z="1.34971" nx="0.9317" ny="0.000244148" nz="0.36314"/> -<v x="-0.626207" y="0.372363" z="1.31228" nx="0.674673" ny="0.000457778" nz="0.73809"/> -<v x="-0.626242" y="0.322493" z="1.31884" nx="0.674825" ny="0.1901" nz="0.713034"/> +<v x="0.0173118" y="0.00258687" z="-0.15578" nx="0.9317" ny="0.000244148" nz="0.36314"/> +<v x="0.0973797" y="0.00258687" z="-0.193217" nx="0.674673" ny="0.000457778" nz="0.73809"/> +<v x="0.0973448" y="-0.0472831" z="-0.186652" nx="0.674825" ny="0.1901" nz="0.713034"/> <t v1="193" v2="196" v3="195"/> <t v1="193" v2="195" v3="194"/> -<v x="-0.620472" y="0.372363" z="1.30245" nx="0.992767" ny="-6.1037e-05" nz="-0.119846"/> -<v x="-0.620508" y="0.319943" z="1.30936" nx="0.992767" ny="-0.0323496" nz="-0.115574"/> +<v x="0.103115" y="0.00258687" z="-0.203039" nx="0.992767" ny="-6.1037e-05" nz="-0.119846"/> +<v x="0.103079" y="-0.0498331" z="-0.196138" nx="0.992767" ny="-0.0323496" nz="-0.115574"/> <t v1="196" v2="198" v3="197"/> <t v1="196" v2="197" v3="195"/> -<v x="-0.624424" y="0.372363" z="1.29838" nx="0.983093" ny="-9.15555e-05" nz="-0.182958"/> -<v x="-0.624461" y="0.318894" z="1.30542" nx="0.983062" ny="-0.048677" nz="-0.176519"/> +<v x="0.0991628" y="0.00258687" z="-0.207112" nx="0.983093" ny="-9.15555e-05" nz="-0.182958"/> +<v x="0.0991257" y="-0.0508821" z="-0.200073" nx="0.983062" ny="-0.048677" nz="-0.176519"/> <t v1="198" v2="200" v3="199"/> <t v1="198" v2="199" v3="197"/> -<v x="-0.610346" y="0.372363" z="1.26513" nx="0.979492" ny="9.15555e-05" nz="0.201392"/> -<v x="-0.610389" y="0.310268" z="1.2733" nx="0.979522" ny="0.0507828" nz="0.194678"/> +<v x="0.113241" y="0.00258687" z="-0.240369" nx="0.979492" ny="9.15555e-05" nz="0.201392"/> +<v x="0.113198" y="-0.0595081" z="-0.232194" nx="0.979522" ny="0.0507828" nz="0.194678"/> <t v1="200" v2="202" v3="201"/> <t v1="200" v2="201" v3="199"/> -<v x="-0.609963" y="0.372363" z="1.19366" nx="0.990692" ny="-3.05185e-05" nz="-0.13596"/> -<v x="-0.610018" y="0.29177" z="1.20427" nx="0.990661" ny="-0.0365307" nz="-0.131138"/> +<v x="0.113624" y="0.00258687" z="-0.311837" nx="0.990692" ny="-3.05185e-05" nz="-0.13596"/> +<v x="0.113569" y="-0.0780061" z="-0.301227" nx="0.990661" ny="-0.0365307" nz="-0.131138"/> <t v1="202" v2="204" v3="203"/> <t v1="202" v2="203" v3="201"/> -<v x="-0.625366" y="0.372363" z="1.13974" nx="0.833125" ny="-0.000152593" nz="-0.553026"/> -<v x="-0.625432" y="0.277836" z="1.15218" nx="0.833064" ny="-0.14423" nz="-0.534013"/> +<v x="0.0982208" y="0.00258687" z="-0.365758" nx="0.833125" ny="-0.000152593" nz="-0.553026"/> +<v x="0.0981547" y="-0.0919401" z="-0.353313" nx="0.833064" ny="-0.14423" nz="-0.534013"/> <t v1="204" v2="206" v3="205"/> <t v1="204" v2="205" v3="203"/> -<v x="-0.63034" y="0.372363" z="1.13575" nx="0.356761" ny="-0.000274667" nz="-0.934172"/> -<v x="-0.719693" y="0.372363" z="1.13101" nx="0.00521867" ny="-0.000305185" nz="-0.999969"/> -<v x="-0.71976" y="0.275705" z="1.14373" nx="0.00503555" ny="-0.258797" nz="-0.965911"/> -<v x="-0.630405" y="0.276811" z="1.14833" nx="0.356639" ny="-0.242256" nz="-0.90228"/> +<v x="0.0932468" y="0.00258687" z="-0.369743" nx="0.356761" ny="-0.000274667" nz="-0.934172"/> +<v x="0.00389373" y="0.00258687" z="-0.374485" nx="0.00521867" ny="-0.000305185" nz="-0.999969"/> +<v x="0.00382674" y="-0.0940711" z="-0.36176" nx="0.00503555" ny="-0.258797" nz="-0.965911"/> +<v x="0.0931817" y="-0.0929651" z="-0.357164" nx="0.356639" ny="-0.242256" nz="-0.90228"/> <t v1="210" v2="209" v3="208"/> <t v1="210" v2="208" v3="207"/> -<v x="-0.809092" y="0.372363" z="1.13481" nx="-0.346995" ny="-0.000274667" nz="-0.937834"/> -<v x="-0.809158" y="0.276811" z="1.1474" nx="-0.347179" ny="-0.242256" nz="-0.905942"/> +<v x="-0.0855052" y="0.00258687" z="-0.370679" nx="-0.346995" ny="-0.000274667" nz="-0.937834"/> +<v x="-0.0855713" y="-0.0929651" z="-0.358099" nx="-0.347179" ny="-0.242256" nz="-0.905942"/> <t v1="209" v2="212" v3="211"/> <t v1="209" v2="211" v3="208"/> -<v x="-0.814106" y="0.372363" z="1.13875" nx="-0.827326" ny="-0.000152593" nz="-0.561693"/> -<v x="-0.830073" y="0.372363" z="1.19251" nx="-0.989227" ny="-3.05185e-05" nz="-0.146336"/> -<v x="-0.830129" y="0.29177" z="1.20311" nx="-0.989257" ny="-0.0365307" nz="-0.141514"/> -<v x="-0.814171" y="0.277836" z="1.15119" nx="-0.827418" ny="-0.14423" nz="-0.54268"/> +<v x="-0.0905192" y="0.00258687" z="-0.366745" nx="-0.827326" ny="-0.000152593" nz="-0.561693"/> +<v x="-0.106486" y="0.00258687" z="-0.312989" nx="-0.989227" ny="-3.05185e-05" nz="-0.146336"/> +<v x="-0.106542" y="-0.0780061" z="-0.302379" nx="-0.989257" ny="-0.0365307" nz="-0.141514"/> +<v x="-0.0905843" y="-0.0919401" z="-0.354301" nx="-0.827418" ny="-0.14423" nz="-0.54268"/> <t v1="216" v2="215" v3="214"/> <t v1="216" v2="214" v3="213"/> -<v x="-0.830438" y="0.372363" z="1.26397" nx="-0.981536" ny="9.15555e-05" nz="0.191107"/> -<v x="-0.830481" y="0.310268" z="1.27215" nx="-0.981506" ny="0.0507828" nz="0.184423"/> +<v x="-0.106851" y="0.00258687" z="-0.241521" nx="-0.981536" ny="9.15555e-05" nz="0.191107"/> +<v x="-0.106894" y="-0.0595081" z="-0.233346" nx="-0.981506" ny="0.0507828" nz="0.184423"/> <t v1="215" v2="218" v3="217"/> <t v1="215" v2="217" v3="214"/> -<v x="-0.816709" y="0.372363" z="1.29738" nx="-0.98114" ny="-9.15555e-05" nz="-0.193243"/> -<v x="-0.816746" y="0.318894" z="1.30441" nx="-0.98117" ny="-0.048677" nz="-0.186804"/> +<v x="-0.0931222" y="0.00258687" z="-0.208118" nx="-0.98114" ny="-9.15555e-05" nz="-0.193243"/> +<v x="-0.0931593" y="-0.0508821" z="-0.201079" nx="-0.98117" ny="-0.048677" nz="-0.186804"/> <t v1="218" v2="220" v3="219"/> <t v1="218" v2="219" v3="217"/> -<v x="-0.820704" y="0.372363" z="1.30141" nx="-0.979888" ny="-9.15555e-05" nz="-0.199438"/> -<v x="-0.82074" y="0.319943" z="1.30831" nx="-0.979919" ny="-0.050264" nz="-0.192816"/> +<v x="-0.0971172" y="0.00258687" z="-0.204087" nx="-0.979888" ny="-9.15555e-05" nz="-0.199438"/> +<v x="-0.0971532" y="-0.0498331" z="-0.197186" nx="-0.979919" ny="-0.050264" nz="-0.192816"/> <t v1="220" v2="222" v3="221"/> <t v1="220" v2="221" v3="219"/> -<v x="-0.816792" y="0.372363" z="1.31128" nx="-0.593005" ny="0.000488296" nz="0.80517"/> -<v x="-0.816826" y="0.322493" z="1.31784" nx="-0.592883" ny="0.209174" nz="0.777612"/> +<v x="-0.0932053" y="0.00258687" z="-0.194215" nx="-0.593005" ny="0.000488296" nz="0.80517"/> +<v x="-0.0932392" y="-0.0472831" z="-0.187649" nx="-0.592883" ny="0.209174" nz="0.777612"/> <t v1="222" v2="224" v3="223"/> <t v1="222" v2="223" v3="221"/> -<v x="-0.778408" y="0.372363" z="1.31403" nx="-0.347087" ny="0.000579852" nz="0.937803"/> -<v x="-0.778442" y="0.323153" z="1.32051" nx="-0.346934" ny="0.243171" nz="0.905789"/> +<v x="-0.0548213" y="0.00258687" z="-0.191464" nx="-0.347087" ny="0.000579852" nz="0.937803"/> +<v x="-0.0548553" y="-0.0466231" z="-0.184985" nx="-0.346934" ny="0.243171" nz="0.905789"/> <t v1="224" v2="226" v3="225"/> <t v1="224" v2="225" v3="223"/> -<v x="-0.729607" y="0.372363" z="1.35011" nx="-0.809595" ny="0.000396741" nz="0.586932"/> -<v x="-0.729635" y="0.332424" z="1.35537" nx="-0.866421" ny="0.113163" nz="0.486282"/> +<v x="-0.00602025" y="0.00258687" z="-0.155387" nx="-0.809595" ny="0.000396741" nz="0.586932"/> +<v x="-0.00604826" y="-0.0373521" z="-0.150129" nx="-0.866421" ny="0.113163" nz="0.486282"/> <t v1="226" v2="228" v3="227"/> <t v1="226" v2="227" v3="225"/> -<v x="-0.727292" y="0.372363" z="1.35704" nx="-0.588733" ny="0.000122074" nz="0.808283"/> -<v x="-0.727381" y="0.34472" z="1.36047" nx="-0.650075" ny="0.40083" nz="0.645528"/> +<v x="-0.00370526" y="0.00258687" z="-0.148457" nx="-0.588733" ny="0.000122074" nz="0.808283"/> +<v x="-0.00379425" y="-0.0250561" z="-0.145026" nx="-0.650075" ny="0.40083" nz="0.645528"/> <t v1="228" v2="230" v3="229"/> <t v1="228" v2="229" v3="227"/> -<v x="-0.706383" y="0.295165" z="1.37037" nx="0.99765" ny="0.0174566" nz="0.0660726"/> -<v x="-0.67325" y="0.344586" z="1.43735" nx="0.980255" ny="-0.0777001" nz="-0.181707"/> +<v x="0.0172037" y="-0.0746111" z="-0.135126" nx="0.99765" ny="0.0174566" nz="0.0660726"/> +<v x="0.0503367" y="-0.0251901" z="-0.0681441" nx="0.980255" ny="-0.0777001" nz="-0.181707"/> <t v1="232" v2="231" v3="193"/> -<v x="-0.626342" y="0.276237" z="1.338" nx="0.675222" ny="0.367656" nz="0.639393"/> +<v x="0.0972447" y="-0.0935391" z="-0.167492" nx="0.675222" ny="0.367656" nz="0.639393"/> <t v1="231" v2="233" v3="196"/> <t v1="231" v2="196" v3="193"/> -<v x="-0.620613" y="0.271312" z="1.3295" nx="0.992676" ny="-0.0625629" nz="-0.10303"/> +<v x="0.102974" y="-0.0984641" z="-0.175994" nx="0.992676" ny="-0.0625629" nz="-0.10303"/> <t v1="233" v2="234" v3="198"/> <t v1="233" v2="198" v3="196"/> -<v x="-0.624569" y="0.269285" z="1.32597" nx="0.982971" ny="-0.0941496" nz="-0.157689"/> +<v x="0.0990177" y="-0.100491" z="-0.179524" nx="0.982971" ny="-0.0941496" nz="-0.157689"/> <t v1="234" v2="235" v3="200"/> <t v1="234" v2="200" v3="198"/> -<v x="-0.610514" y="0.25262" z="1.29718" nx="0.979644" ny="0.0982086" nz="0.175024"/> +<v x="0.113073" y="-0.117156" z="-0.208316" nx="0.979644" ny="0.0982086" nz="0.175024"/> <t v1="235" v2="236" v3="202"/> <t v1="235" v2="202" v3="200"/> -<v x="-0.610181" y="0.216886" z="1.23529" nx="0.9906" ny="-0.0705893" nz="-0.117008"/> +<v x="0.113406" y="-0.15289" z="-0.270209" nx="0.9906" ny="-0.0705893" nz="-0.117008"/> <t v1="236" v2="237" v3="204"/> <t v1="236" v2="204" v3="202"/> -<v x="-0.625622" y="0.189966" z="1.18858" nx="0.832759" ny="-0.278817" nz="-0.478225"/> +<v x="0.0979648" y="-0.17981" z="-0.316917" nx="0.832759" ny="-0.278817" nz="-0.478225"/> <t v1="237" v2="238" v3="206"/> <t v1="237" v2="206" v3="204"/> -<v x="-0.719955" y="0.185849" z="1.18095" nx="0.00451674" ny="-0.500259" nz="-0.865841"/> -<v x="-0.630598" y="0.187987" z="1.18512" nx="0.356151" ny="-0.468245" nz="-0.808618"/> +<v x="0.00363171" y="-0.183927" z="-0.324541" nx="0.00451674" ny="-0.500259" nz="-0.865841"/> +<v x="0.0929887" y="-0.181789" z="-0.320372" nx="0.356151" ny="-0.468245" nz="-0.808618"/> <t v1="240" v2="239" v3="209"/> <t v1="240" v2="209" v3="210"/> -<v x="-0.80935" y="0.187987" z="1.18419" nx="-0.347667" ny="-0.468245" nz="-0.812281"/> +<v x="-0.0857633" y="-0.181789" z="-0.321307" nx="-0.347667" ny="-0.468245" nz="-0.812281"/> <t v1="239" v2="241" v3="212"/> <t v1="239" v2="212" v3="209"/> -<v x="-0.830291" y="0.216886" z="1.23413" nx="-0.989319" ny="-0.0706198" nz="-0.127384"/> -<v x="-0.814362" y="0.189966" z="1.18759" nx="-0.827723" ny="-0.278817" nz="-0.486923"/> +<v x="-0.106704" y="-0.15289" z="-0.271361" nx="-0.989319" ny="-0.0706198" nz="-0.127384"/> +<v x="-0.0907753" y="-0.17981" z="-0.317904" nx="-0.827723" ny="-0.278817" nz="-0.486923"/> <t v1="243" v2="242" v3="215"/> <t v1="243" v2="215" v3="216"/> -<v x="-0.830606" y="0.25262" z="1.29603" nx="-0.981414" ny="0.0982086" nz="0.164769"/> +<v x="-0.107019" y="-0.117156" z="-0.209468" nx="-0.981414" ny="0.0982086" nz="0.164769"/> <t v1="242" v2="244" v3="218"/> <t v1="242" v2="218" v3="215"/> -<v x="-0.816853" y="0.269285" z="1.32496" nx="-0.981292" ny="-0.0941191" nz="-0.167913"/> +<v x="-0.0932662" y="-0.100491" z="-0.180531" nx="-0.981292" ny="-0.0941191" nz="-0.167913"/> <t v1="244" v2="245" v3="220"/> <t v1="244" v2="220" v3="218"/> -<v x="-0.820845" y="0.271312" z="1.32845" nx="-0.980041" ny="-0.0972015" nz="-0.173315"/> +<v x="-0.0972583" y="-0.0984641" z="-0.177042" nx="-0.980041" ny="-0.0972015" nz="-0.173315"/> <t v1="245" v2="246" v3="222"/> <t v1="245" v2="222" v3="220"/> -<v x="-0.816926" y="0.276237" z="1.337" nx="-0.592486" ny="0.404523" nz="0.696616"/> +<v x="-0.0933393" y="-0.0935391" z="-0.16849" nx="-0.592486" ny="0.404523" nz="0.696616"/> <t v1="246" v2="247" v3="224"/> <t v1="246" v2="224" v3="222"/> -<v x="-0.778541" y="0.277512" z="1.33941" nx="-0.346477" ny="0.470321" nz="0.811609"/> +<v x="-0.0549543" y="-0.0922641" z="-0.16608" nx="-0.346477" ny="0.470321" nz="0.811609"/> <t v1="247" v2="248" v3="226"/> <t v1="247" v2="226" v3="224"/> -<v x="-0.729715" y="0.295423" z="1.37069" nx="-0.890927" ny="0.246895" nz="0.381115"/> +<v x="-0.00612825" y="-0.0743531" z="-0.134802" nx="-0.890927" ny="0.246895" nz="0.381115"/> <t v1="248" v2="249" v3="228"/> <t v1="248" v2="228" v3="226"/> -<v x="-0.694949" y="0.372363" z="1.45387" nx="-0.996765" ny="0.0136418" nz="-0.079165"/> -<v x="-0.694984" y="0.347211" z="1.46057" nx="-0.816706" ny="-0.24424" nz="-0.522782"/> +<v x="0.0286378" y="0.00258687" z="-0.0516291" nx="-0.996765" ny="0.0136418" nz="-0.079165"/> +<v x="0.0286027" y="-0.0225651" z="-0.0449212" nx="-0.816706" ny="-0.24424" nz="-0.522782"/> <t v1="249" v2="251" v3="250"/> <t v1="249" v2="250" v3="228"/> -<v x="-0.745768" y="0.372363" z="1.4536" nx="-0.0863063" ny="-0.00061037" nz="-0.996246"/> -<v x="-0.745803" y="0.347211" z="1.46031" nx="-0.0731529" ny="-0.530564" nz="-0.844447"/> +<v x="-0.0221813" y="0.00258687" z="-0.0518951" nx="-0.0863063" ny="-0.00061037" nz="-0.996246"/> +<v x="-0.0222163" y="-0.0225651" z="-0.0451871" nx="-0.0731529" ny="-0.530564" n... [truncated message content] |
From: <cf...@us...> - 2007-09-28 07:06:25
|
Revision: 1151 http://automanic.svn.sourceforge.net/automanic/?rev=1151&view=rev Author: cfraz89 Date: 2007-09-28 00:06:24 -0700 (Fri, 28 Sep 2007) Log Message: ----------- added test voyager Modified Paths: -------------- trunk/celstart.cfg trunk/ioData/maps/crater/entities_world trunk/ioData/menus/ioAutoUpdater.py trunk/ioData/menus/ioGameMenu.py trunk/ioData/scripts/ioNetworkEnt.py trunk/ioData/scripts/ioNetworkEntBase.py trunk/ioData/scripts/ioNetworkEntCl.py trunk/ioData/server/game/celstart.cfg trunk/ioData/server/game/ioGameServer.py trunk/ioData/server/ioServerBase.py trunk/ioData/vehicles/ioVehicle.py trunk/ioData/vehicles/ioVehicleBase.py trunk/ioData/vehicles/ioVehicleCl.py trunk/outlaws.py Added Paths: ----------- trunk/ioData/vehicles/voyager/ trunk/ioData/vehicles/voyager/entities_world trunk/ioData/vehicles/voyager/factories/ trunk/ioData/vehicles/voyager/factories/genVoyagerBody trunk/ioData/vehicles/voyager/factories/genVoyagerWheel trunk/ioData/vehicles/voyager/info.cfg trunk/ioData/vehicles/voyager/world Modified: trunk/celstart.cfg =================================================================== --- trunk/celstart.cfg 2007-09-13 06:57:15 UTC (rev 1150) +++ trunk/celstart.cfg 2007-09-28 07:06:24 UTC (rev 1151) @@ -39,7 +39,7 @@ ;We compare the main versions of servers with clients Outlaws.Version.Compat = 0.1 -Outlaws.Version.Name = 0.1.3a +Outlaws.Version.Name = 0.1.3b ; Key bindings for Outlaws Outlaws.Keys.Vehicle.Accelerate = up Modified: trunk/ioData/maps/crater/entities_world =================================================================== --- trunk/ioData/maps/crater/entities_world 2007-09-13 06:57:15 UTC (rev 1150) +++ trunk/ioData/maps/crater/entities_world 2007-09-28 07:06:24 UTC (rev 1151) @@ -3,7 +3,7 @@ <sector name="Scene"> <addon entityname="map" plugin="cel.addons.celentity"> - <propclass name="pcmesh.object"> + <propclass name="pcobject.mesh"> <action name="SetMesh"> <par string="Terrain" name="name"/> </action> Modified: trunk/ioData/menus/ioAutoUpdater.py =================================================================== --- trunk/ioData/menus/ioAutoUpdater.py 2007-09-13 06:57:15 UTC (rev 1150) +++ trunk/ioData/menus/ioAutoUpdater.py 2007-09-28 07:06:24 UTC (rev 1151) @@ -243,7 +243,6 @@ #Now we really leave def pctimer_wakeup(self, pc, args): timer = celTimer(self.entity) - timer.Clear() RemoveEntity(self.entity) def scroller_down(self, pc, args): @@ -258,6 +257,5 @@ ioDataBin.Store('updateskipped', self.updateskipped) self.killdescwindow() self.menu.clear() - self.entity.PropertyClassList.RemoveAll() ioinit = Entities['ioInit'] - ioinit.Behaviour.SendMessage('updatecomplete', None, celGenericParameterBlock(0)) + ioinit.Behaviour.SendMessage('updatecomplete', None, celGenericParameterBlock(0)) \ No newline at end of file Modified: trunk/ioData/menus/ioGameMenu.py =================================================================== --- trunk/ioData/menus/ioGameMenu.py 2007-09-13 06:57:15 UTC (rev 1150) +++ trunk/ioData/menus/ioGameMenu.py 2007-09-28 07:06:24 UTC (rev 1151) @@ -73,11 +73,11 @@ def pollserver(self): self.serverfound = False self.net.sendData('ioGSrv', 'poll', [self.entity.Name]) - timer = celTimer(self.entity) - timer.WakeUp(250, False) + self.timer = celTimer(self.entity) + self.timer.WakeUp(1000, False, 'poll_wait') #Now ask the user if they want to quit the server if it exists - def pctimer_wakeup(self, pc, args): + def pctimer_poll_wait(self, pc, args): if self.serverfound: if ioDataBin.Get('mpgame'): self.menu.clear() @@ -90,14 +90,14 @@ #If its a single player game just quit else: self.net.sendData('ioGSrv', 'quit', []) - self.afterpoll() + self.timer.WakeUp(1000, False, 'quit_wait') else: - self.afterpoll() + self.timer.WakeUp(1000, False, 'quit_wait') #The user wants to quit the server def yes_click(self, pc, args): self.net.sendData('ioGSrv', 'quit', []) - self.afterpoll() + self.timer.WakeUp(1000, False, 'quit_wait') #Just do the rest def no_click(self, pc, args): @@ -106,12 +106,17 @@ #There is a local server def r_pollreply(self, pc, args): self.serverfound = True + self.timer.Clear() + self.afterpoll() def quitgame(self): q = CS_QUERY_REGISTRY (oreg, iEventQueue) if q: q.GetEventOutlet().Broadcast (csevQuit (oreg)) + def pctimer_quit_wait(self, pc, args): + self.afterpoll() + def returntomenu(self): netgame = Entities['ioNetMgrCl'] netgame.Behaviour.SendMessage('leavegame', None, celGenericParameterBlock(0)) Modified: trunk/ioData/scripts/ioNetworkEnt.py =================================================================== --- trunk/ioData/scripts/ioNetworkEnt.py 2007-09-13 06:57:15 UTC (rev 1150) +++ trunk/ioData/scripts/ioNetworkEnt.py 2007-09-28 07:06:24 UTC (rev 1151) @@ -28,25 +28,17 @@ if entmgr: pars = parblock({'entity' : self.entity.Name}) self.owneraddr = cPickle.loads(entmgr.Behaviour.SendMessage('getaddr', None, pars)) - - #We send our state to the server to update it. - def pctimer_wakeup(self, pc, args): - self.ticks += 1 - #Send the quaternion more often as it tends to desync easier - if self.ticks == 2: - self.net.sendToClients(self.entity.Name, 'q', self.getQuat(), self.owneraddr, False) - if self.ticks == 4: - self.net.sendToClients(self.entity.Name, 'p', self.getPos(), self.owneraddr, False) - self.ticks = 0 - + #We need to check that the correct client sent the update - def r_p(self, pc, args): + def r_q(self, pc, args): addr, data = self.net.getNetData(args) if addr == self.owneraddr: - ioNetworkEntBase.r_p(self, pc, args) + ioNetworkEntBase.r_q(self, pc, args) + self.net.sendToClients(self.entity.Name, 'q', data, self.owneraddr, False) #We need to check that the correct client sent the update - def r_q(self, pc, args): + def r_p(self, pc, args): addr, data = self.net.getNetData(args) if addr == self.owneraddr: - ioNetworkEntBase.r_q(self, pc, args) \ No newline at end of file + ioNetworkEntBase.r_p(self, pc, args) + self.net.sendToClients(self.entity.Name, 'p', data, self.owneraddr, False) \ No newline at end of file Modified: trunk/ioData/scripts/ioNetworkEntBase.py =================================================================== --- trunk/ioData/scripts/ioNetworkEntBase.py 2007-09-13 06:57:15 UTC (rev 1150) +++ trunk/ioData/scripts/ioNetworkEntBase.py 2007-09-28 07:06:24 UTC (rev 1151) @@ -43,7 +43,7 @@ self.unstuck(False) #Otherwise do a little correction elif distance > 0.1: - correction = diff * 2.0 + correction = diff * 5.0 self.body.SetLinearVelocity(lvel + correction) #Get quaternion from server. Work out some stuff in order to add a torque to our body to correct it. @@ -117,4 +117,4 @@ info = [pos.x, pos.y, pos.z, lv.x, lv.y, lv.z] #We round to reduce bandwidth sendinfo = [round(x, 3) for x in info] - return sendinfo \ No newline at end of file + return sendinfo Modified: trunk/ioData/scripts/ioNetworkEntCl.py =================================================================== --- trunk/ioData/scripts/ioNetworkEntCl.py 2007-09-13 06:57:15 UTC (rev 1150) +++ trunk/ioData/scripts/ioNetworkEntCl.py 2007-09-28 07:06:24 UTC (rev 1151) @@ -41,12 +41,11 @@ self.net.sendData(self.entity.Name, 'inp', [inp]) #We send our state to the server to update it. - def pctimer_wakeup(self, pc, args): + def pctimer_send_rot(self, pc, args): if self.registered: - self.ticks += 1 - #Send the quaternion more often as it tends to desync easier - if self.ticks == 2: - self.net.sendData(self.entity.Name, 'q', self.getQuat(), None, False) - if self.ticks == 4: - self.net.sendData(self.entity.Name, 'p', self.getPos(), None, False) - self.ticks = 0 \ No newline at end of file + self.net.sendData(self.entity.Name, 'q', self.getQuat(), None, False) + + #We send our state to the server to update it. + def pctimer_send_pos(self, pc, args): + if self.registered: + self.net.sendData(self.entity.Name, 'p', self.getPos(), None, False) \ No newline at end of file Modified: trunk/ioData/server/game/celstart.cfg =================================================================== --- trunk/ioData/server/game/celstart.cfg 2007-09-13 06:57:15 UTC (rev 1150) +++ trunk/ioData/server/game/celstart.cfg 2007-09-28 07:06:24 UTC (rev 1151) @@ -40,4 +40,4 @@ Outlaws.Settings.Video.DustTrails = false Outlaws.Settings.Video.Foliage = Off -System.Plugins.iBugPlug = crystalspace.utilities.bugplug \ No newline at end of file +System.Plugins.iBugPlug = crystalspace.utilities.bugplug Modified: trunk/ioData/server/game/ioGameServer.py =================================================================== --- trunk/ioData/server/game/ioGameServer.py 2007-09-13 06:57:15 UTC (rev 1150) +++ trunk/ioData/server/game/ioGameServer.py 2007-09-28 07:06:24 UTC (rev 1151) @@ -152,6 +152,12 @@ def clientpop(self, pc, args): for ent in [self.gamebehave, self.netmgr, self.entmgr]: ent.Behaviour.SendMessage('clientpop', None, args) + + #If it was a sp game and the client died, we kill ourselves + def dropaddr(self, addr): + ioServerBase.dropaddr(self, addr) + if self.server == (None, None) and addr[0] == '127.0.0.1': + self.killserver() #A local client is polling for the server def r_poll(self, pc, args): Modified: trunk/ioData/server/ioServerBase.py =================================================================== --- trunk/ioData/server/ioServerBase.py 2007-09-13 06:57:15 UTC (rev 1150) +++ trunk/ioData/server/ioServerBase.py 2007-09-28 07:06:24 UTC (rev 1151) @@ -255,6 +255,7 @@ addr, data = self.net.getNetData(args) if addr[0] == '127.0.0.1': self.killserver() + print 'quitting!!' #Exit server process def killserver(self): Modified: trunk/ioData/vehicles/ioVehicle.py =================================================================== --- trunk/ioData/vehicles/ioVehicle.py 2007-09-13 06:57:15 UTC (rev 1150) +++ trunk/ioData/vehicles/ioVehicle.py 2007-09-28 07:06:24 UTC (rev 1151) @@ -13,7 +13,7 @@ self.entity = celEntity ioNetworkEnt.__init__(self, self.entity) ioVehicleBase.__init__(self, self.entity) - + self.timer.WakeUp(50, True, 'send_damage') #We batch send damage messages to send bandwidth #self.damages is our buffer. its keys are tuples of zones and indexes #This ensures each type of damage will only be sent once. @@ -36,10 +36,6 @@ inpmethod = getattr(self, 'pccommandinput_' + inpstring) inpmethod(self.entity, celGenericParameterBlock(0)) self.net.sendToClients(self.entity.Name, 'inp', [inp], addr) - - def pctimer_wakeup(self, pc, args): - ioNetworkEnt.pctimer_wakeup(self, pc, args) - ioVehicleBase.pctimer_wakeup(self, pc, args) def setcodename(self, pc, args): ioNetworkEnt.setcodename(self, pc, args) @@ -160,9 +156,7 @@ def pctimer_wakeupframe(self, pc, args): ioNetworkEnt.pctimer_wakeupframe(self, pc, args) - def pctimer_wakeup(self, pc, args): - ioNetworkEnt.pctimer_wakeup(self, pc, args) - ioVehicleBase.pctimer_wakeup(self, pc, args) + def pctimer_send_damage(self, pc, args): #Send our batch of damage messages for type, damage in self.damages.iteritems(): zone, idx = type Modified: trunk/ioData/vehicles/ioVehicleBase.py =================================================================== --- trunk/ioData/vehicles/ioVehicleBase.py 2007-09-13 06:57:15 UTC (rev 1150) +++ trunk/ioData/vehicles/ioVehicleBase.py 2007-09-28 07:06:24 UTC (rev 1151) @@ -74,8 +74,10 @@ self.shatterfact = Engine.FindMeshFactory('windowShatter') #When subclassed by ioVehicle, has to be kept in sync with the timer time in ioNetworkEnt - timer = celTimer(self.entity) - timer.WakeUp(100, True) + self.timer = celTimer(self.entity) + self.timer.WakeUp(50, True, 'update') + self.timer.WakeUp(25, True, 'send_rot') + self.timer.WakeUp(50, True, 'send_pos') #timer.WakeUpFrame(0) #This dict matches up sets of similar weapons. eg {'FLMR' : [0,2,4], 'BRWNG' : [1,5]} @@ -667,7 +669,7 @@ #self.shadow = self.decal_mgr.CreateDecal(self.dt, self.scene, result.isect, t.GetFront(), t.GetUp(), self.width, self.height, self.shadow) #Add a drag force proportional to frame damage. Also reset the car one off at the start - def pctimer_wakeup(self, pc, args): + def pctimer_update(self, pc, args): vel = self.mech.GetLinearVelocity() movable = self.mesh.Mesh.GetMovable() trans = movable.GetTransform() @@ -919,4 +921,4 @@ self.bot = True def gettargetname(self, pc, args): - return self.targetname \ No newline at end of file + return self.targetname Modified: trunk/ioData/vehicles/ioVehicleCl.py =================================================================== --- trunk/ioData/vehicles/ioVehicleCl.py 2007-09-13 06:57:15 UTC (rev 1150) +++ trunk/ioData/vehicles/ioVehicleCl.py 2007-09-28 07:06:24 UTC (rev 1151) @@ -251,16 +251,6 @@ ioNetworkEntCl.setcodename(self, pc, args) ioVehicleBase.setcodename(self, pc, args) - def pctimer_wakeup(self, pc, args): - ioNetworkEntCl.pctimer_wakeup(self, pc, args) - ioVehicleBase.pctimer_wakeup(self, pc, args) - #Reset the vehicle 2 sec after creation. Sometimes the wheels spawn stuck in the ground - #if self.resetticks >= 0 and self.registered: - #self.resetticks += 1 - #if self.resetticks >= 20: - #self.resetticks = -1 - #self.entity.Behaviour.SendMessage('pccommandinput_recover1', None, celGenericParameterBlock(0)) - def pctimer_wakeupframe(self, pc, args): ioNetworkEntCl.pctimer_wakeupframe(self, pc, args) #ioVehicleBase.pctimer_wakeupframe(self, pc, args) Added: trunk/ioData/vehicles/voyager/entities_world =================================================================== --- trunk/ioData/vehicles/voyager/entities_world (rev 0) +++ trunk/ioData/vehicles/voyager/entities_world 2007-09-28 07:06:24 UTC (rev 1151) @@ -0,0 +1,151 @@ +<?xml version="1.0" encoding="UTF-8"?> +<world> + <sector name="Scene"> + <addon entityname="Voyager-tpl" plugin="cel.addons.celentitytpl"> + <propclass name="pcobject.mesh"> + <action name="LoadMesh"> + <par string="genVoyagerBody" name="factoryname"/> + </action> + <action name="MoveMesh"> + <par string="Scene" name="sector"/> + <par vector="0,0,0" name="position"/> + <par vector="0,0,0" name="rotation"/> + </action> + </propclass> + <propclass name="pcobject.mesh.deform"> + <property name="deformfactor" float="50.0" /> + <property name="noise" float="0.25" /> + <property name="maxdeform" float="0.05" /> + <property name="radius" float="0.85" /> + </propclass> + <propclass name="pctools.properties"> + <property name="codename" string="Voyager" /> + </propclass> + <propclass name="pcphysics.object"> + <action name="InitPhys"> + <par float="0.4" name="friction"/> + <par float="1800.0" name="mass"/> + <par float="0" name="elasticity"/> + <par float="1" name="density"/> + <par float="0" name="softness"/> + <par bool="true" name="enabled" /> + </action> + <action name="SetColliderBoundingBox"> + <par vector="-0.2,-0.2,-0.2" name="sizeadjustment" /> + </action> + </propclass> + <propclass name="pcvehicle.wheeled"> + <property name="tankmode" bool="false"/> + <property name="autotransmission" bool="true"/> + <property name="autoreverse" bool="true"/> + <property name="brakeforce" float="2000.0"/> + <property name="abs" bool="false"/> + <property name="steeramount" float="0.7"/> + <!--Front Left Wheel--> + <action name="AddWheel"> + <par vector="0.55, 0.0, -0.95" name="position"/> + <par float="2.0" name="turnspeed"/> + <par float="2.0" name="returnspeed"/> + <par float="0.0002" name="suspensionsoftness"/> + <par float="0.1" name="suspensiondamping"/> + <par float="0.7" name="brakepower"/> + <par float="0.4" name="enginepower"/> + <par float="1.0" name="leftsteersensitivity"/> + <par float="0.8" name="rightsteersensitivity"/> + <par float="1.2" name="friction"/> + <par float="0.0000265" name="slip"/> + <par float="10.0" name="mass"/> + <par bool="false" name="handbrakeaffected"/> + <par bool="false" name="steerinverted"/> + <par vector="0,0,0" name="rotation"/> + <par string="genVoyagerWheel" name="meshfact"/> + </action> + <!--Front Right Wheel--> + <action name="AddWheel"> + <par vector="-0.55, 0.0, -0.95" name="position"/> + <par float="2.0" name="turnspeed"/> + <par float="2.0" name="returnspeed"/> + <par float="0.0002" name="suspensionsoftness"/> + <par float="0.1" name="suspensiondamping"/> + <par float="0.7" name="brakepower"/> + <par float="0.4" name="enginepower"/> + <par float="0.8" name="leftsteersensitivity"/> + <par float="1.0" name="rightsteersensitivity"/> + <par float="1.2" name="friction"/> + <par float="0.0000265" name="slip"/> + <par float="10.0" name="mass"/> + <par bool="false" name="handbrakeaffected"/> + <par bool="false" name="steerinverted"/> + <par vector="0,0,0" name="rotation"/> + <par string="genVoyagerWheel" name="meshfact"/> + </action> + <!--Rear Left Wheel--> + <action name="AddWheel"> + <par vector="0.55, 0.0, 0.9" name="position"/> + <par float="0.0" name="turnspeed"/> + <par float="0.0" name="returnspeed"/> + <par float="0.0002" name="suspensionsoftness"/> + <par float="0.1" name="suspensiondamping"/> + <par float="0.3" name="brakepower"/> + <par float="0.6" name="enginepower"/> + <par float="1.0" name="leftsteersensitivity"/> + <par float="0.8" name="rightsteersensitivity"/> + <par float="1.2" name="friction"/> + <par float="0.0000105" name="slip"/> + <par float="10.0" name="mass"/> + <par bool="true" name="handbrakeaffected"/> + <par bool="true" name="steerinverted"/> + <par vector="0,0,0" name="rotation"/> + <par string="genVoyagerWheel" name="meshfact"/> + </action> + <!--Rear Right Wheel--> + <action name="AddWheel"> + <par vector="-0.55, 0.0, 0.9" name="position"/> + <par float="0.0" name="turnspeed"/> + <par float="0.0" name="returnspeed"/> + <par float="0.0002" name="suspensionsoftness"/> + <par float="0.1" name="suspensiondamping"/> + <par float="0.3" name="brakepower"/> + <par float="0.6" name="enginepower"/> + <par float="0.8" name="leftsteersensitivity"/> + <par float="1.0" name="rightsteersensitivity"/> + <par float="1.2" name="friction"/> + <par float="0.0000105" name="slip"/> + <par float="10.0" name="mass"/> + <par bool="true" name="handbrakeaffected"/> + <par bool="true" name="steerinverted"/> + <par vector="0,0,0" name="rotation"/> + <par string="genVoyagerWheel" name="meshfact"/> + </action> + <action name="SetGearSettings"> + <par float="-1" name="gear"/> + <par float="3000.0" name="force"/> + <par float="-50.0" name="velocity"/> + </action> + <action name="SetGearSettings"> + <par float="1" name="gear"/> + <par float="1600.0" name="force"/> + <par float="50.0" name="velocity"/> + </action> + <action name="SetGearSettings"> + <par float="2" name="gear"/> + <par float="900.0" name="force"/> + <par float="84.0" name="velocity"/> + </action> + <action name="SetGearSettings"> + <par float="3" name="gear"/> + <par float="600.0" name="force"/> + <par float="125.0" name="velocity"/> + </action> + <action name="SetGearSettings"> + <par float="4" name="gear"/> + <par float="250.0" name="force"/> + <par float="192.0" name="velocity"/> + </action> + </propclass> + <behaviour layer="blpython" name="ioVehicle"/> + + + </addon> + </sector> +</world> Property changes on: trunk/ioData/vehicles/voyager/entities_world ___________________________________________________________________ Name: svn:executable + * Added: trunk/ioData/vehicles/voyager/factories/genVoyagerBody =================================================================== --- trunk/ioData/vehicles/voyager/factories/genVoyagerBody (rev 0) +++ trunk/ioData/vehicles/voyager/factories/genVoyagerBody 2007-09-28 07:06:24 UTC (rev 1151) @@ -0,0 +1,28536 @@ +<library> +<meshfact name='genVoyagerBody'> +<plugin>genmeshfact</plugin> +<zuse/> +<params> +<material>LF_Softener_BodySno</material> +<v x="-0.581652" y="0.423935" z="-1.13021" nx="0.996185" ny="-0.0871303" nz="0"/> +<v x="-0.586713" y="0.424378" z="-1.11795" nx="0.704398" ny="-0.0616169" nz="0.707083"/> +<v x="-0.568059" y="0.63759" z="-1.11795" nx="0.704398" ny="-0.0616169" nz="0.707083"/> +<v x="-0.562999" y="0.637147" z="-1.13021" nx="0.996185" ny="-0.0871303" nz="0"/> +<t v1="3" v2="2" v3="1"/> +<t v1="3" v2="1" v3="0"/> +<v x="-0.59893" y="0.425447" z="-1.11287" nx="0" ny="0" nz="1"/> +<v x="-0.580277" y="0.638659" z="-1.11287" nx="0" ny="0" nz="1"/> +<t v1="2" v2="5" v3="4"/> +<t v1="2" v2="4" v3="1"/> +<v x="-0.611148" y="0.426516" z="-1.11795" nx="-0.704398" ny="0.0616169" nz="0.707083"/> +<v x="-0.592494" y="0.639728" z="-1.11795" nx="-0.704398" ny="0.0616169" nz="0.707083"/> +<t v1="5" v2="7" v3="6"/> +<t v1="5" v2="6" v3="4"/> +<v x="-0.616208" y="0.426958" z="-1.13021" nx="-0.996185" ny="0.0871303" nz="0"/> +<v x="-0.597555" y="0.64017" z="-1.13021" nx="-0.996185" ny="0.0871303" nz="0"/> +<t v1="7" v2="9" v3="8"/> +<t v1="7" v2="8" v3="6"/> +<v x="-0.611148" y="0.426516" z="-1.14248" nx="-0.704398" ny="0.0616169" nz="-0.707083"/> +<v x="-0.592494" y="0.639728" z="-1.14248" nx="-0.704398" ny="0.0616169" nz="-0.707083"/> +<t v1="9" v2="11" v3="10"/> +<t v1="9" v2="10" v3="8"/> +<v x="-0.59893" y="0.425447" z="-1.14755" nx="0" ny="0" nz="-1"/> +<v x="-0.580277" y="0.638659" z="-1.14755" nx="0" ny="0" nz="-1"/> +<t v1="11" v2="13" v3="12"/> +<t v1="11" v2="12" v3="10"/> +<v x="-0.586713" y="0.424378" z="-1.14248" nx="0.704398" ny="-0.0616169" nz="-0.707083"/> +<v x="-0.568059" y="0.63759" z="-1.14248" nx="0.704398" ny="-0.0616169" nz="-0.707083"/> +<t v1="13" v2="15" v3="14"/> +<t v1="13" v2="14" v3="12"/> +<t v1="15" v2="3" v3="0"/> +<t v1="15" v2="0" v3="14"/> +<v x="-0.512574" y="0.612578" z="1.50489" nx="0.286172" ny="-0.958159" nz="0"/> +<v x="-0.519763" y="0.614504" z="1.52286" nx="0.137791" ny="-0.918424" nz="0.3708"/> +<v x="-0.467095" y="0.811063" z="1.52286" nx="0.683004" ny="-0.182989" nz="0.707083"/> +<v x="-0.459907" y="0.809137" z="1.50489" nx="0.965911" ny="-0.258797" nz="0"/> +<t v1="19" v2="18" v3="17"/> +<t v1="19" v2="17" v3="16"/> +<v x="-0.537118" y="0.619154" z="1.5303" nx="-0.123173" ny="-0.459731" nz="0.879452"/> +<v x="-0.48445" y="0.815714" z="1.5303" nx="0" ny="0" nz="1"/> +<t v1="18" v2="21" v3="20"/> +<t v1="18" v2="20" v3="17"/> +<v x="-0.554473" y="0.623805" z="1.52286" nx="-0.653584" ny="-0.585284" nz="0.479812"/> +<v x="-0.501805" y="0.820364" z="1.52286" nx="-0.683004" ny="0.182989" nz="0.707083"/> +<t v1="21" v2="23" v3="22"/> +<t v1="21" v2="22" v3="20"/> +<v x="-0.561661" y="0.625731" z="1.50489" nx="-0.72692" ny="-0.686697" nz="0"/> +<v x="-0.508994" y="0.82229" z="1.50489" nx="-0.965911" ny="0.258797" nz="0"/> +<t v1="23" v2="25" v3="24"/> +<t v1="23" v2="24" v3="22"/> +<v x="-0.554473" y="0.623805" z="1.48692" nx="-0.57857" ny="-0.726463" nz="-0.3708"/> +<v x="-0.501805" y="0.820364" z="1.48692" nx="-0.683004" ny="0.182989" nz="-0.707083"/> +<t v1="25" v2="27" v3="26"/> +<t v1="25" v2="26" v3="24"/> +<v x="-0.537118" y="0.619154" z="1.47948" nx="-0.123173" ny="-0.459731" nz="-0.879452"/> +<v x="-0.48445" y="0.815714" z="1.47948" nx="0" ny="0" nz="-1"/> +<t v1="27" v2="29" v3="28"/> +<t v1="27" v2="28" v3="26"/> +<v x="-0.519763" y="0.614504" z="1.48692" nx="0.273354" ny="-0.833674" nz="-0.479812"/> +<v x="-0.467095" y="0.811063" z="1.48692" nx="0.683004" ny="-0.182989" nz="-0.707083"/> +<t v1="29" v2="31" v3="30"/> +<t v1="29" v2="30" v3="28"/> +<t v1="31" v2="19" v3="16"/> +<t v1="31" v2="16" v3="30"/> +<v x="0.48525" y="0.534127" z="-1.65968" nx="-0.760979" ny="0.580645" nz="-0.289315"/> +<v x="0.48525" y="0.51529" z="-1.67145" nx="-0.4738" ny="0.15772" nz="-0.866359"/> +<v x="0.546057" y="0.51529" z="-1.67145" nx="0.4738" ny="0.15772" nz="-0.866359"/> +<v x="0.546057" y="0.534127" z="-1.65968" nx="0.760979" ny="0.580645" nz="-0.289315"/> +<t v1="35" v2="34" v3="33"/> +<t v1="35" v2="33" v3="32"/> +<v x="0.48525" y="0.491098" z="-1.66659" nx="-0.747551" ny="-0.415082" nz="-0.518509"/> +<v x="0.546057" y="0.491098" z="-1.66659" nx="0.747551" ny="-0.415082" nz="-0.518509"/> +<t v1="34" v2="37" v3="36"/> +<t v1="34" v2="36" v3="33"/> +<v x="0.48525" y="0.480685" z="-1.64321" nx="-0.750511" ny="-0.658956" nz="0.0494705"/> +<v x="0.546057" y="0.480685" z="-1.64321" nx="0.750511" ny="-0.658956" nz="0.0494705"/> +<t v1="37" v2="39" v3="38"/> +<t v1="37" v2="38" v3="36"/> +<v x="0.48525" y="0.495099" z="-1.62066" nx="-0.744835" ny="-0.663289" nz="0.0720542"/> +<v x="0.546057" y="0.495099" z="-1.62066" nx="0.744835" ny="-0.663289" nz="0.0720542"/> +<t v1="39" v2="41" v3="40"/> +<t v1="39" v2="40" v3="38"/> +<v x="0.48525" y="0.440564" z="-1.47236" nx="-0.707266" ny="-0.670949" nz="-0.222571"/> +<v x="0.546057" y="0.440564" z="-1.47236" nx="0.707266" ny="-0.670949" nz="-0.222571"/> +<t v1="41" v2="43" v3="42"/> +<t v1="41" v2="42" v3="40"/> +<v x="0.48525" y="0.379635" z="-1.2669" nx="-0.707205" ny="-0.682852" nz="-0.183111"/> +<v x="0.546057" y="0.379635" z="-1.2669" nx="0.707205" ny="-0.682852" nz="-0.183111"/> +<t v1="43" v2="45" v3="44"/> +<t v1="43" v2="44" v3="42"/> +<v x="0.48525" y="0.347198" z="-1.13186" nx="-0.707083" ny="-0.687521" nz="-0.165136"/> +<v x="0.546057" y="0.347198" z="-1.13186" nx="0.707083" ny="-0.687521" nz="-0.165136"/> +<t v1="45" v2="47" v3="46"/> +<t v1="45" v2="46" v3="44"/> +<v x="0.48525" y="0.399022" z="-1.12639" nx="-0.707083" ny="0.695883" nz="0.125431"/> +<v x="0.48525" y="0.423368" z="-1.26144" nx="-0.707175" ny="0.693014" nz="0.140049"/> +<v x="0.546057" y="0.423368" z="-1.26144" nx="0.707175" ny="0.693014" nz="0.140049"/> +<v x="0.546057" y="0.399022" z="-1.12639" nx="0.707083" ny="0.695883" nz="0.125431"/> +<t v1="51" v2="50" v3="49"/> +<t v1="51" v2="49" v3="48"/> +<v x="0.48525" y="0.469986" z="-1.46942" nx="-0.707358" ny="0.683248" nz="0.181005"/> +<v x="0.546057" y="0.469986" z="-1.46942" nx="0.707358" ny="0.683248" nz="0.181005"/> +<t v1="50" v2="53" v3="52"/> +<t v1="50" v2="52" v3="49"/> +<v x="0.48525" y="0.515503" z="-1.61792" nx="-0.717795" ny="0.595965" nz="0.359905"/> +<v x="0.546057" y="0.515503" z="-1.61792" nx="0.717795" ny="0.595965" nz="0.359905"/> +<t v1="53" v2="55" v3="54"/> +<t v1="53" v2="54" v3="52"/> +<v x="0.48525" y="0.531882" z="-1.63418" nx="-0.728935" ny="0.6198" nz="0.290628"/> +<v x="0.546057" y="0.531882" z="-1.63418" nx="0.728935" ny="0.6198" nz="0.290628"/> +<t v1="55" v2="57" v3="56"/> +<t v1="55" v2="56" v3="54"/> +<t v1="57" v2="35" v3="32"/> +<t v1="57" v2="32" v3="56"/> +<t v1="38" v2="56" v3="32"/> +<t v1="38" v2="32" v3="36"/> +<t v1="55" v2="41" v3="39"/> +<t v1="55" v2="39" v3="57"/> +<t v1="44" v2="46" v3="48"/> +<t v1="44" v2="48" v3="49"/> +<t v1="50" v2="51" v3="47"/> +<t v1="50" v2="47" v3="45"/> +<t v1="42" v2="44" v3="49"/> +<t v1="42" v2="49" v3="52"/> +<t v1="53" v2="50" v3="45"/> +<t v1="53" v2="45" v3="43"/> +<t v1="40" v2="42" v3="52"/> +<t v1="40" v2="52" v3="54"/> +<t v1="55" v2="53" v3="43"/> +<t v1="55" v2="43" v3="41"/> +<t v1="38" v2="40" v3="54"/> +<t v1="38" v2="54" v3="56"/> +<t v1="39" v2="37" v3="35"/> +<t v1="39" v2="35" v3="57"/> +<t v1="36" v2="32" v3="33"/> +<t v1="37" v2="34" v3="35"/> +<v x="0.549128" y="0.554691" z="-1.67531" nx="-0.707083" ny="0.0620136" nz="-0.704367"/> +<v x="0.549128" y="0.503663" z="-1.6798" nx="-0.716941" ny="-0.102847" nz="-0.689444"/> +<v x="0.572864" y="0.503663" z="-1.6798" nx="0.698752" ny="-0.18363" nz="-0.691366"/> +<v x="0.578995" y="0.554691" z="-1.67531" nx="0.698447" ny="-0.0209052" nz="-0.715323"/> +<t v1="61" v2="60" v3="59"/> +<t v1="61" v2="59" v3="58"/> +<v x="0.549128" y="0.484263" z="-1.67196" nx="-0.73101" ny="-0.465621" nz="-0.498764"/> +<v x="0.570732" y="0.484263" z="-1.67196" nx="0.693564" ny="-0.526994" nz="-0.491104"/> +<t v1="60" v2="63" v3="62"/> +<t v1="60" v2="62" v3="59"/> +<v x="0.549128" y="0.473667" z="-1.65018" nx="-0.462233" ny="-0.874538" nz="-0.146489"/> +<v x="0.569933" y="0.473667" z="-1.65018" nx="0.438032" ny="-0.886502" nz="-0.14893"/> +<t v1="63" v2="65" v3="64"/> +<t v1="63" v2="64" v3="62"/> +<v x="0.549128" y="0.476882" z="-1.62372" nx="-0.729911" ny="-0.606494" nz="0.315195"/> +<v x="0.570865" y="0.476882" z="-1.62372" nx="0.692709" ny="-0.661702" nz="0.286843"/> +<t v1="65" v2="67" v3="66"/> +<t v1="65" v2="66" v3="64"/> +<v x="0.549128" y="0.49243" z="-1.60972" nx="-0.714438" ny="-0.353282" nz="0.6039"/> +<v x="0.572997" y="0.49243" z="-1.60972" nx="0.69509" ny="-0.428419" nz="0.577288"/> +<t v1="67" v2="69" v3="68"/> +<t v1="67" v2="68" v3="66"/> +<v x="0.549128" y="0.54134" z="-1.59321" nx="-0.707083" ny="-0.226081" nz="0.669973"/> +<v x="0.579128" y="0.54134" z="-1.59321" nx="0.695822" ny="-0.306406" nz="0.649525"/> +<t v1="69" v2="71" v3="70"/> +<t v1="69" v2="70" v3="68"/> +<t v1="59" v2="68" v3="70"/> +<t v1="59" v2="70" v3="58"/> +<t v1="67" v2="63" v3="60"/> +<t v1="67" v2="60" v3="69"/> +<t v1="59" v2="62" v3="66"/> +<t v1="59" v2="66" v3="68"/> +<t v1="60" v2="61" v3="71"/> +<t v1="60" v2="71" v3="69"/> +<t v1="67" v2="65" v3="63"/> +<t v1="62" v2="64" v3="66"/> +<v x="0.482872" y="0.554691" z="-1.67531" nx="0.707083" ny="0.0620136" nz="-0.704367"/> +<v x="0.453005" y="0.554691" z="-1.67531" nx="-0.698447" ny="-0.0209052" nz="-0.715323"/> +<v x="0.459136" y="0.503663" z="-1.6798" nx="-0.698752" ny="-0.18363" nz="-0.691366"/> +<v x="0.482872" y="0.503663" z="-1.6798" nx="0.716941" ny="-0.102847" nz="-0.689444"/> +<t v1="75" v2="74" v3="73"/> +<t v1="75" v2="73" v3="72"/> +<v x="0.461268" y="0.484263" z="-1.67196" nx="-0.693564" ny="-0.526994" nz="-0.491104"/> +<v x="0.482872" y="0.484263" z="-1.67196" nx="0.73101" ny="-0.465621" nz="-0.498764"/> +<t v1="77" v2="76" v3="74"/> +<t v1="77" v2="74" v3="75"/> +<v x="0.462067" y="0.473667" z="-1.65018" nx="-0.438032" ny="-0.886502" nz="-0.14893"/> +<v x="0.482872" y="0.473667" z="-1.65018" nx="0.462233" ny="-0.874538" nz="-0.146489"/> +<t v1="79" v2="78" v3="76"/> +<t v1="79" v2="76" v3="77"/> +<v x="0.461135" y="0.476882" z="-1.62372" nx="-0.692709" ny="-0.661702" nz="0.286843"/> +<v x="0.482872" y="0.476882" z="-1.62372" nx="0.729911" ny="-0.606494" nz="0.315195"/> +<t v1="81" v2="80" v3="78"/> +<t v1="81" v2="78" v3="79"/> +<v x="0.459003" y="0.49243" z="-1.60972" nx="-0.69509" ny="-0.428419" nz="0.577288"/> +<v x="0.482872" y="0.49243" z="-1.60972" nx="0.714438" ny="-0.353282" nz="0.6039"/> +<t v1="83" v2="82" v3="80"/> +<t v1="83" v2="80" v3="81"/> +<v x="0.452872" y="0.54134" z="-1.59321" nx="-0.695822" ny="-0.306406" nz="0.649525"/> +<v x="0.482872" y="0.54134" z="-1.59321" nx="0.707083" ny="-0.226081" nz="0.669973"/> +<t v1="85" v2="84" v3="82"/> +<t v1="85" v2="82" v3="83"/> +<t v1="75" v2="72" v3="85"/> +<t v1="75" v2="85" v3="83"/> +<t v1="74" v2="76" v3="80"/> +<t v1="74" v2="80" v3="82"/> +<t v1="81" v2="77" v3="75"/> +<t v1="81" v2="75" v3="83"/> +<t v1="84" v2="73" v3="74"/> +<t v1="84" v2="74" v3="82"/> +<t v1="78" v2="80" v3="76"/> +<t v1="79" v2="77" v3="81"/> +<v x="-0.572269" y="0.420958" z="1.50489" nx="0.965911" ny="-0.258797" nz="0"/> +<v x="-0.577175" y="0.422273" z="1.51715" nx="0.683004" ny="-0.182989" nz="0.707083"/> +<v x="-0.521781" y="0.629006" z="1.51715" nx="0.683004" ny="-0.182989" nz="0.707083"/> +<v x="-0.516874" y="0.627691" z="1.50489" nx="0.965911" ny="-0.258797" nz="0"/> +<t v1="89" v2="88" v3="87"/> +<t v1="89" v2="87" v3="86"/> +<v x="-0.589022" y="0.425447" z="1.52223" nx="0" ny="0" nz="1"/> +<v x="-0.533628" y="0.63218" z="1.52223" nx="0" ny="0" nz="1"/> +<t v1="88" v2="91" v3="90"/> +<t v1="88" v2="90" v3="87"/> +<v x="-0.600868" y="0.428621" z="1.51715" nx="-0.683004" ny="0.182989" nz="0.707083"/> +<v x="-0.545474" y="0.635355" z="1.51715" nx="-0.683004" ny="0.182989" nz="0.707083"/> +<t v1="91" v2="93" v3="92"/> +<t v1="91" v2="92" v3="90"/> +<v x="-0.605775" y="0.429936" z="1.50489" nx="-0.965911" ny="0.258797" nz="0"/> +<v x="-0.550381" y="0.636669" z="1.50489" nx="-0.965911" ny="0.258797" nz="0"/> +<t v1="93" v2="95" v3="94"/> +<t v1="93" v2="94" v3="92"/> +<v x="-0.600868" y="0.428621" z="1.49262" nx="-0.683004" ny="0.182989" nz="-0.707083"/> +<v x="-0.545474" y="0.635355" z="1.49262" nx="-0.683004" ny="0.182989" nz="-0.707083"/> +<t v1="95" v2="97" v3="96"/> +<t v1="95" v2="96" v3="94"/> +<v x="-0.589022" y="0.425447" z="1.48755" nx="0" ny="0" nz="-1"/> +<v x="-0.533628" y="0.63218" z="1.48755" nx="0" ny="0" nz="-1"/> +<t v1="97" v2="99" v3="98"/> +<t v1="97" v2="98" v3="96"/> +<v x="-0.577175" y="0.422273" z="1.49262" nx="0.683004" ny="-0.182989" nz="-0.707083"/> +<v x="-0.521781" y="0.629006" z="1.49262" nx="0.683004" ny="-0.182989" nz="-0.707083"/> +<t v1="99" v2="101" v3="100"/> +<t v1="99" v2="100" v3="98"/> +<t v1="101" v2="89" v3="86"/> +<t v1="101" v2="86" v3="100"/> +<v x="0.606834" y="0.627439" z="-1.13021" nx="0.596637" ny="-0.802484" nz="0"/> +<v x="0.59942" y="0.62679" z="-1.11224" nx="0.443617" ny="-0.815882" nz="0.3708"/> +<v x="0.581685" y="0.829509" z="-1.11224" nx="0.704398" ny="0.0616169" nz="0.707083"/> +<v x="0.589099" y="0.830158" z="-1.13021" nx="0.996185" ny="0.0871303" nz="0"/> +<t v1="105" v2="104" v3="103"/> +<t v1="105" v2="103" v3="102"/> +<v x="0.581522" y="0.625224" z="-1.1048" nx="0.0414747" ny="-0.474136" nz="0.879452"/> +<v x="0.563786" y="0.827943" z="-1.1048" nx="0" ny="0" nz="1"/> +<t v1="104" v2="107" v3="106"/> +<t v1="104" v2="106" v3="103"/> +<v x="0.563623" y="0.623658" z="-1.11224" nx="-0.413984" ny="-0.773522" nz="0.479812"/> +<v x="0.545887" y="0.826377" z="-1.11224" nx="-0.704398" ny="-0.0616169" nz="0.707083"/> +<t v1="107" v2="109" v3="108"/> +<t v1="107" v2="108" v3="106"/> +<v x="0.556209" y="0.62301" z="-1.13021" nx="-0.448195" ny="-0.893918" nz="0"/> +<v x="0.538473" y="0.825729" z="-1.13021" nx="-0.996185" ny="-0.0871303" nz="0"/> +<t v1="109" v2="111" v3="110"/> +<t v1="109" v2="110" v3="108"/> +<v x="0.563623" y="0.623658" z="-1.14818" nx="-0.295175" ny="-0.88052" nz="-0.3708"/> +<v x="0.545887" y="0.826377" z="-1.14818" nx="-0.704398" ny="-0.0616169" nz="-0.707083"/> +<t v1="111" v2="113" v3="112"/> +<t v1="111" v2="112" v3="110"/> +<v x="0.581522" y="0.625224" z="-1.15562" nx="0.0414747" ny="-0.474136" nz="-0.879452"/> +<v x="0.563786" y="0.827943" z="-1.15562" nx="0" ny="0" nz="-1"/> +<t v1="113" v2="115" v3="114"/> +<t v1="113" v2="114" v3="112"/> +<v x="0.59942" y="0.62679" z="-1.14818" nx="0.542009" ny="-0.689871" nz="-0.479812"/> +<v x="0.581685" y="0.829509" z="-1.14818" nx="0.704398" ny="0.0616169" nz="-0.707083"/> +<t v1="115" v2="117" v3="116"/> +<t v1="115" v2="116" v3="114"/> +<t v1="117" v2="105" v3="102"/> +<t v1="117" v2="102" v3="116"/> +<v x="0.000436" y="0.372415" z="0.794968" nx="0" ny="-0.956603" nz="0.29136"/> +<v x="0.045468" y="0.378028" z="0.794968" nx="0.274209" ny="-0.911618" nz="0.306101"/> +<v x="0.045468" y="0.378028" z="0.530948" nx="0.274209" ny="-0.911618" nz="-0.306101"/> +<v x="0.000436" y="0.372415" z="0.530948" nx="0" ny="-0.956603" nz="-0.29136"/> +<t v1="121" v2="120" v3="119"/> +<t v1="121" v2="119" v3="118"/> +<v x="0.096503" y="0.403523" z="0.794968" nx="0.611255" ny="-0.706076" nz="0.357402"/> +<v x="0.096503" y="0.403523" z="0.530948" nx="0.611255" ny="-0.706076" nz="-0.357402"/> +<t v1="120" v2="123" v3="122"/> +<t v1="120" v2="122" v3="119"/> +<v x="0.131607" y="0.45555" z="0.794968" nx="0.844722" ny="-0.329661" nz="0.421552"/> +<v x="0.131607" y="0.45555" z="0.530948" nx="0.844722" ny="-0.329661" nz="-0.421552"/> +<t v1="123" v2="125" v3="124"/> +<t v1="123" v2="124" v3="122"/> +<v x="0.144073" y="0.539425" z="0.794968" nx="0.868557" ny="0.0790429" nz="0.489181"/> +<v x="0.144073" y="0.539425" z="0.530948" nx="0.868557" ny="0.0790429" nz="-0.489181"/> +<t v1="125" v2="127" v3="126"/> +<t v1="125" v2="126" v3="124"/> +<v x="0.126065" y="0.592092" z="0.794968" nx="0.722922" ny="0.436232" nz="0.535783"/> +<v x="0.126065" y="0.592092" z="0.530948" nx="0.722922" ny="0.436232" nz="-0.535783"/> +<t v1="127" v2="129" v3="128"/> +<t v1="127" v2="128" v3="126"/> +<v x="0.103893" y="0.617069" z="0.794968" nx="0.319895" ny="0.765404" nz="0.558367"/> +<v x="0.103893" y="0.617069" z="0.530948" nx="0.319895" ny="0.765404" nz="-0.558367"/> +<t v1="129" v2="131" v3="130"/> +<t v1="129" v2="130" v3="128"/> +<v x="0.103893" y="0.617069" z="0.794968" nx="0" ny="1" nz="-0"/> +<v x="-0.103021" y="0.617069" z="0.794968" nx="0" ny="1" nz="-0"/> +<v x="-0.103021" y="0.617069" z="0.530948" nx="0" ny="1" nz="-0"/> +<v x="0.103893" y="0.617069" z="0.530948" nx="0" ny="1" nz="-0"/> +<t v1="135" v2="134" v3="133"/> +<t v1="135" v2="133" v3="132"/> +<v x="-0.125193" y="0.592092" z="0.794968" nx="-0.722922" ny="0.436232" nz="0.535783"/> +<v x="-0.125193" y="0.592092" z="0.530948" nx="-0.722922" ny="0.436232" nz="-0.535783"/> +<t v1="134" v2="137" v3="136"/> +<t v1="134" v2="136" v3="133"/> +<v x="-0.143201" y="0.539425" z="0.794968" nx="-0.868557" ny="0.0790429" nz="0.489181"/> +<v x="-0.143201" y="0.539425" z="0.530948" nx="-0.868557" ny="0.0790429" nz="-0.489181"/> +<t v1="137" v2="139" v3="138"/> +<t v1="137" v2="138" v3="136"/> +<v x="-0.130736" y="0.45555" z="0.794968" nx="-0.844722" ny="-0.329661" nz="0.421552"/> +<v x="-0.130736" y="0.45555" z="0.530948" nx="-0.844722" ny="-0.329661" nz="-0.421552"/> +<t v1="139" v2="141" v3="140"/> +<t v1="139" v2="140" v3="138"/> +<v x="-0.095631" y="0.403523" z="0.794968" nx="-0.611255" ny="-0.706107" nz="0.357402"/> +<v x="-0.095631" y="0.403523" z="0.530948" nx="-0.611255" ny="-0.706107" nz="-0.357402"/> +<t v1="141" v2="143" v3="142"/> +<t v1="141" v2="142" v3="140"/> +<v x="-0.044596" y="0.378028" z="0.794968" nx="-0.274209" ny="-0.911618" nz="0.306101"/> +<v x="-0.044596" y="0.378028" z="0.530948" nx="-0.274209" ny="-0.911618" nz="-0.306101"/> +<t v1="143" v2="145" v3="144"/> +<t v1="143" v2="144" v3="142"/> +<t v1="145" v2="121" v3="118"/> +<t v1="145" v2="118" v3="144"/> +<v x="0.000436" y="0.409622" z="0.850468" nx="0" ny="-0.616962" nz="0.786981"/> +<v x="0.02127" y="0.412219" z="0.850468" nx="0.130284" ny="-0.435987" nz="0.890439"/> +<t v1="147" v2="146" v3="118"/> +<t v1="147" v2="118" v3="119"/> +<v x="-0.020398" y="0.412219" z="0.850468" nx="-0.103549" ny="-0.346538" nz="0.932279"/> +<t v1="146" v2="148" v3="144"/> +<t v1="146" v2="144" v3="118"/> +<v x="-0.043043" y="0.423531" z="0.850468" nx="-0.208716" ny="-0.24546" nz="0.946654"/> +<t v1="148" v2="149" v3="142"/> +<t v1="148" v2="142" v3="144"/> +<v x="-0.058502" y="0.446442" z="0.850468" nx="-0.254067" ny="-0.099826" nz="0.962004"/> +<t v1="149" v2="150" v3="140"/> +<t v1="149" v2="140" v3="142"/> +<v x="-0.058894" y="0.474135" z="0.850468" nx="-0.217811" ny="0.019715" nz="0.975768"/> +<t v1="150" v2="151" v3="138"/> +<t v1="150" v2="138" v3="140"/> +<v x="-0.046999" y="0.502906" z="0.850468" nx="-0.14835" ny="0.0966826" nz="0.984191"/> +<t v1="151" v2="152" v3="136"/> +<t v1="151" v2="136" v3="138"/> +<v x="-0.027314" y="0.515629" z="0.850468" nx="-0.0950041" ny="0.270425" nz="0.958007"/> +<t v1="152" v2="153" v3="133"/> +<t v1="152" v2="133" v3="136"/> +<v x="0.028186" y="0.515629" z="0.850468" nx="0.0712912" ny="0.202887" nz="0.976592"/> +<t v1="153" v2="154" v3="130"/> +<t v1="153" v2="130" v3="133"/> +<v x="0.047871" y="0.502906" z="0.850468" nx="0.14835" ny="0.0966826" nz="0.984191"/> +<t v1="154" v2="155" v3="128"/> +<t v1="154" v2="128" v3="130"/> +<v x="0.059766" y="0.474135" z="0.850468" nx="0.217811" ny="0.019715" nz="0.975768"/> +<t v1="155" v2="156" v3="126"/> +<t v1="155" v2="126" v3="128"/> +<v x="0.059374" y="0.446442" z="0.850468" nx="0.254067" ny="-0.099826" nz="0.962004"/> +<t v1="156" v2="157" v3="124"/> +<t v1="156" v2="124" v3="126"/> +<v x="0.043915" y="0.423531" z="0.850468" nx="0.208716" ny="-0.24546" nz="0.946654"/> +<t v1="157" v2="158" v3="122"/> +<t v1="157" v2="122" v3="124"/> +<t v1="158" v2="147" v3="119"/> +<t v1="158" v2="119" v3="122"/> +<v x="0.02127" y="0.412219" z="0.475448" nx="0.130284" ny="-0.435987" nz="-0.890439"/> +<v x="0.000436" y="0.409622" z="0.475448" nx="0" ny="-0.616962" nz="-0.786981"/> +<t v1="160" v2="159" v3="120"/> +<t v1="160" v2="120" v3="121"/> +<v x="0.043915" y="0.423531" z="0.475448" nx="0.208716" ny="-0.24546" nz="-0.946654"/> +<t v1="159" v2="161" v3="123"/> +<t v1="159" v2="123" v3="120"/> +<v x="0.059374" y="0.446442" z="0.475448" nx="0.254067" ny="-0.099826" nz="-0.962004"/> +<t v1="161" v2="162" v3="125"/> +<t v1="161" v2="125" v3="123"/> +<v x="0.059766" y="0.474135" z="0.475448" nx="0.217811" ny="0.019715" nz="-0.975768"/> +<t v1="162" v2="163" v3="127"/> +<t v1="162" v2="127" v3="125"/> +<v x="0.047871" y="0.502906" z="0.475448" nx="0.14835" ny="0.0966826" nz="-0.984191"/> +<t v1="163" v2="164" v3="129"/> +<t v1="163" v2="129" v3="127"/> +<v x="0.028186" y="0.515629" z="0.475448" nx="0.0712912" ny="0.202887" nz="-0.976592"/> +<t v1="164" v2="165" v3="131"/> +<t v1="164" v2="131" v3="129"/> +<v x="-0.027314" y="0.515629" z="0.475448" nx="-0.0950041" ny="0.270425" nz="-0.958007"/> +<t v1="165" v2="166" v3="134"/> +<t v1="165" v2="134" v3="131"/> +<v x="-0.046999" y="0.502906" z="0.475448" nx="-0.14835" ny="0.0966826" nz="-0.984191"/> +<t v1="166" v2="167" v3="137"/> +<t v1="166" v2="137" v3="134"/> +<v x="-0.058894" y="0.474135" z="0.475448" nx="-0.217811" ny="0.019715" nz="-0.975768"/> +<t v1="167" v2="168" v3="139"/> +<t v1="167" v2="139" v3="137"/> +<v x="-0.058502" y="0.446442" z="0.475448" nx="-0.254067" ny="-0.099826" nz="-0.962004"/> +<t v1="168" v2="169" v3="141"/> +<t v1="168" v2="141" v3="139"/> +<v x="-0.043043" y="0.423531" z="0.475448" nx="-0.208716" ny="-0.24546" nz="-0.946654"/> +<t v1="169" v2="170" v3="143"/> +<t v1="169" v2="143" v3="141"/> +<v x="-0.020398" y="0.412219" z="0.475448" nx="-0.103549" ny="-0.346538" nz="-0.932279"/> +<t v1="170" v2="171" v3="145"/> +<t v1="170" v2="145" v3="143"/> +<t v1="171" v2="160" v3="121"/> +<t v1="171" v2="121" v3="145"/> +<v x="-0.600238" y="0.430923" z="1.50399" nx="0.964507" ny="0.264016" nz="0"/> +<v x="-0.630313" y="0.502076" z="1.50399" nx="0.753105" ny="0.657857" nz="0"/> +<v x="-0.630313" y="0.494252" z="1.45962" nx="0.753105" ny="0.618183" nz="-0.224982"/> +<v x="-0.600238" y="0.427391" z="1.48395" nx="0.980102" ny="0.186407" nz="-0.0678426"/> +<t v1="175" v2="174" v3="173"/> +<t v1="175" v2="173" v3="172"/> +<v x="-0.647619" y="0.512255" z="1.50399" nx="-0.0909452" ny="0.995849" nz="0"/> +<v x="-0.647619" y="0.503818" z="1.45614" nx="-0.0909452" ny="0.935789" nz="-0.340587"/> +<t v1="174" v2="177" v3="176"/> +<t v1="174" v2="176" v3="173"/> +<v x="-0.666347" y="0.496092" z="1.50399" nx="-0.910031" ny="0.414472" nz="0"/> +<v x="-0.666347" y="0.488629" z="1.46166" nx="-0.910062" ny="0.389447" nz="-0.141728"/> +<t v1="177" v2="179" v3="178"/> +<t v1="177" v2="178" v3="176"/> +<v x="-0.666347" y="0.488954" z="1.50399" nx="-0.856349" ny="-0.516343" nz="0"/> +<v x="-0.666347" y="0.481921" z="1.46411" nx="-0.856349" ny="-0.485183" nz="0.17658"/> +<t v1="179" v2="181" v3="180"/> +<t v1="179" v2="180" v3="178"/> +<v x="-0.652601" y="0.481828" z="1.50399" nx="-0.857418" ny="-0.514573" nz="0"/> +<v x="-0.652601" y="0.475225" z="1.46654" nx="-0.857418" ny="-0.483535" nz="0.17597"/> +<t v1="181" v2="183" v3="182"/> +<t v1="181" v2="182" v3="180"/> +<v x="-0.652709" y="0.455456" z="1.50399" nx="-0.800287" ny="0.599567" nz="0"/> +<v x="-0.652709" y="0.450443" z="1.47556" nx="-0.800287" ny="0.563402" nz="-0.205054"/> +<t v1="183" v2="185" v3="184"/> +<t v1="183" v2="184" v3="182"/> +<v x="-0.674087" y="0.449348" z="1.50399" nx="-0.801538" ny="0.597919" nz="0"/> +<v x="-0.674087" y="0.444704" z="1.47765" nx="-0.801538" ny="0.561846" nz="-0.204505"/> +<t v1="185" v2="187" v3="186"/> +<t v1="185" v2="186" v3="184"/> +<v x="-0.782335" y="0.393546" z="1.50399" nx="-0.621906" ny="0.783074" nz="0"/> +<v x="-0.790645" y="0.372342" z="1.50399" nx="-1" ny="0" nz="0"/> +<v x="-0.782335" y="0.392268" z="1.49674" nx="-0.621906" ny="0.735862" nz="-0.2678"/> +<t v1="190" v2="189" v3="188"/> +<v x="-0.630313" y="0.471724" z="1.4206" nx="0.753105" ny="0.503952" nz="-0.422864"/> +<v x="-0.600238" y="0.417218" z="1.46633" nx="0.987335" ny="0.121433" nz="-0.101901"/> +<t v1="192" v2="191" v3="174"/> +<t v1="192" v2="174" v3="175"/> +<v x="-0.647619" y="0.479522" z="1.41405" nx="-0.0909452" ny="0.762841" nz="-0.640095"/> +<t v1="191" v2="193" v3="177"/> +<t v1="191" v2="177" v3="174"/> +<v x="-0.666347" y="0.46714" z="1.42444" nx="-0.910062" ny="0.317484" nz="-0.266396"/> +<t v1="193" v2="194" v3="179"/> +<t v1="193" v2="179" v3="177"/> +<v x="-0.666347" y="0.461672" z="1.42903" nx="-0.856349" ny="-0.39552" nz="0.331889"/> +<t v1="194" v2="195" v3="181"/> +<t v1="194" v2="181" v3="179"/> +<v x="-0.652601" y="0.456213" z="1.43361" nx="-0.857418" ny="-0.394177" nz="0.33076"/> +<t v1="195" v2="196" v3="183"/> +<t v1="195" v2="183" v3="181"/> +<v x="-0.652709" y="0.436011" z="1.45056" nx="-0.800287" ny="0.459304" nz="-0.385388"/> +<t v1="196" v2="197" v3="185"/> +<t v1="196" v2="185" v3="183"/> +<v x="-0.674087" y="0.431332" z="1.45449" nx="-0.801538" ny="0.458022" nz="-0.38432"/> +<t v1="197" v2="198" v3="187"/> +<t v1="197" v2="187" v3="185"/> +<v x="-0.782335" y="0.388586" z="1.49036" nx="-0.621906" ny="0.599872" nz="-0.503342"/> +<t v1="199" v2="189" v3="190"/> +<v x="-0.630313" y="0.437209" z="1.39164" nx="0.753105" ny="0.328929" nz="-0.56972"/> +<v x="-0.600238" y="0.401633" z="1.45326" nx="0.987335" ny="0.0792566" nz="-0.137272"/> +<t v1="201" v2="200" v3="191"/> +<t v1="201" v2="191" v3="192"/> +<v x="-0.647619" y="0.442299" z="1.38282" nx="-0.0909452" ny="0.497909" nz="-0.862423"/> +<t v1="200" v2="202" v3="193"/> +<t v1="200" v2="193" v3="191"/> +<v x="-0.666347" y="0.434217" z="1.39682" nx="-0.910062" ny="0.207221" nz="-0.358928"/> +<t v1="202" v2="203" v3="194"/> +<t v1="202" v2="194" v3="193"/> +<v x="-0.666347" y="0.430648" z="1.403" nx="-0.856349" ny="-0.258156" nz="0.447157"/> +<t v1="203" v2="204" v3="195"/> +<t v1="203" v2="195" v3="194"/> +<v x="-0.652601" y="0.427085" z="1.40917" nx="-0.857418" ny="-0.257271" nz="0.445631"/> +<t v1="204" v2="205" v3="196"/> +<t v1="204" v2="196" v3="195"/> +<v x="-0.652709" y="0.413899" z="1.43201" nx="-0.800287" ny="0.299783" nz="-0.519242"/> +<t v1="205" v2="206" v3="197"/> +<t v1="205" v2="197" v3="196"/> +<v x="-0.674087" y="0.410845" z="1.4373" nx="-0.801538" ny="0.298959" nz="-0.517808"/> +<t v1="206" v2="207" v3="198"/> +<t v1="206" v2="198" v3="197"/> +<v x="-0.782335" y="0.382944" z="1.48563" nx="-0.621906" ny="0.391522" nz="-0.678182"/> +<t v1="208" v2="189" v3="199"/> +<v x="-0.630313" y="0.39487" z="1.37623" nx="0.753105" ny="0.114231" nz="-0.647877"/> +<v x="-0.600238" y="0.382514" z="1.4463" nx="0.987335" ny="0.0275277" nz="-0.156133"/> +<t v1="210" v2="209" v3="200"/> +<t v1="210" v2="200" v3="201"/> +<v x="-0.647619" y="0.396638" z="1.3662" nx="-0.0909452" ny="0.172918" nz="-0.980712"/> +<t v1="209" v2="211" v3="202"/> +<t v1="209" v2="202" v3="200"/> +<v x="-0.666347" y="0.393831" z="1.38212" nx="-0.910062" ny="0.0719626" nz="-0.408155"/> +<t v1="211" v2="212" v3="203"/> +<t v1="211" v2="203" v3="202"/> +<v x="-0.666347" y="0.392591" z="1.38915" nx="-0.856349" ny="-0.0896634" nz="0.508499"/> +<t v1="212" v2="213" v3="204"/> +<t v1="212" v2="204" v3="203"/> +<v x="-0.652601" y="0.391354" z="1.39617" nx="-0.857418" ny="-0.0893277" nz="0.50676"/> +<t v1="213" v2="214" v3="205"/> +<t v1="213" v2="205" v3="204"/> +<v x="-0.652709" y="0.386774" z="1.42214" nx="-0.800287" ny="0.104099" nz="-0.590472"/> +<t v1="214" v2="215" v3="206"/> +<t v1="214" v2="206" v3="205"/> +<v x="-0.674087" y="0.385714" z="1.42815" nx="-0.801538" ny="0.103824" nz="-0.588824"/> +<t v1="215" v2="216" v3="207"/> +<t v1="215" v2="207" v3="206"/> +<v x="-0.782335" y="0.376024" z="1.48311" nx="-0.621906" ny="0.13596" nz="-0.771172"/> +<t v1="217" v2="189" v3="208"/> +<v x="-0.630313" y="0.349814" z="1.37623" nx="0.753105" ny="-0.114231" nz="-0.647877"/> +<v x="-0.600238" y="0.362169" z="1.4463" nx="0.987335" ny="-0.0275277" nz="-0.156133"/> +<t v1="219" v2="218" v3="209"/> +<t v1="219" v2="209" v3="210"/> +<v x="-0.647619" y="0.348046" z="1.3662" nx="-0.0909452" ny="-0.172918" nz="-0.980712"/> +<t v1="218" v2="220" v3="211"/> +<t v1="218" v2="211" v3="209"/> +<v x="-0.666347" y="0.350853" z="1.38212" nx="-0.910062" ny="-0.0719626" nz="-0.408155"/> +<t v1="220" v2="221" v3="212"/> +<t v1="220" v2="212" v3="211"/> +<v x="-0.666347" y="0.352092" z="1.38915" nx="-0.856349" ny="0.0896634" nz="0.508499"/> +<t v1="221" v2="222" v3="213"/> +<t v1="221" v2="213" v3="212"/> +<v x="-0.652601" y="0.35333" z="1.39617" nx="-0.857418" ny="0.0893277" nz="0.50676"/> +<t v1="222" v2="223" v3="214"/> +<t v1="222" v2="214" v3="213"/> +<v x="-0.652709" y="0.357909" z="1.42214" nx="-0.800287" ny="-0.104099" nz="-0.590442"/> +<t v1="223" v2="224" v3="215"/> +<t v1="223" v2="215" v3="214"/> +<v x="-0.674087" y="0.35897" z="1.42815" nx="-0.801538" ny="-0.103824" nz="-0.588824"/> +<t v1="224" v2="225" v3="216"/> +<t v1="224" v2="216" v3="215"/> +<v x="-0.782335" y="0.36866" z="1.48311" nx="-0.621906" ny="-0.13596" nz="-0.771172"/> +<t v1="226" v2="189" v3="217"/> +<v x="-0.630313" y="0.307475" z="1.39164" nx="0.753105" ny="-0.328929" nz="-0.56972"/> +<v x="-0.600238" y="0.343051" z="1.45326" nx="0.987335" ny="-0.0792566" nz="-0.137272"/> +<t v1="228" v2="227" v3="218"/> +<t v1="228" v2="218" v3="219"/> +<v x="-0.647619" y="0.302385" z="1.38282" nx="-0.0909452" ny="-0.497909" nz="-0.862423"/> +<t v1="227" v2="229" v3="220"/> +<t v1="227" v2="220" v3="218"/> +<v x="-0.666347" y="0.310467" z="1.39682" nx="-0.910062" ny="-0.207221" nz="-0.358928"/> +<t v1="229" v2="230" v3="221"/> +<t v1="229" v2="221" v3="220"/> +<v x="-0.666347" y="0.314036" z="1.403" nx="-0.856349" ny="0.258156" nz="0.447157"/> +<t v1="230" v2="231" v3="222"/> +<t v1="230" v2="222" v3="221"/> +<v x="-0.652601" y="0.317599" z="1.40917" nx="-0.857418" ny="0.257271" nz="0.445631"/> +<t v1="231" v2="232" v3="223"/> +<t v1="231" v2="223" v3="222"/> +<v x="-0.652709" y="0.330785" z="1.43201" nx="-0.800287" ny="-0.299783" nz="-0.519242"/> +<t v1="232" v2="233" v3="224"/> +<t v1="232" v2="224" v3="223"/> +<v x="-0.674087" y="0.333839" z="1.4373" nx="-0.801538" ny="-0.298959" nz="-0.517808"/> +<t v1="233" v2="234" v3="225"/> +<t v1="233" v2="225" v3="224"/> +<v x="-0.782335" y="0.36174" z="1.48563" nx="-0.621906" ny="-0.391522" nz="-0.678152"/> +<t v1="235" v2="189" v3="226"/> +<v x="-0.630313" y="0.27296" z="1.4206" nx="0.753105" ny="-0.503952" nz="-0.422864"/> +<v x="-0.600238" y="0.327466" z="1.46633" nx="0.987335" ny="-0.121433" nz="-0.101901"/> +<t v1="237" v2="236" v3="227"/> +<t v1="237" v2="227" v3="228"/> +<v x="-0.647619" y="0.265162" z="1.41405" nx="-0.0909452" ny="-0.762841" nz="-0.640095"/> +<t v1="236" v2="238" v3="229"/> +<t v1="236" v2="229" v3="227"/> +<v x="-0.666347" y="0.277543" z="1.42444" nx="-0.910031" ny="-0.317484" nz="-0.266396"/> +<t v1="238" v2="239" v3="230"/> +<t v1="238" v2="230" v3="229"/> +<v x="-0.666347" y="0.283012" z="1.42903" nx="-0.856349" ny="0.39552" nz="0.331889"/> +<t v1="239" v2="240" v3="231"/> +<t v1="239" v2="231" v3="230"/> +<v x="-0.652601" y="0.288471" z="1.43361" nx="-0.857418" ny="0.394177" nz="0.33076"/> +<t v1="240" v2="241" v3="232"/> +<t v1="240" v2="232" v3="231"/> +<v x="-0.652709" y="0.308673" z="1.45056" nx="-0.800287" ny="-0.459304" nz="-0.385388"/> +<t v1="241" v2="242" v3="233"/> +<t v1="241" v2="233" v3="232"/> +<v x="-0.674087" y="0.313352" z="1.45449" nx="-0.801538" ny="-0.458022" nz="-0.38432"/> +<t v1="242" v2="243" v3="234"/> +<t v1="242" v2="234" v3="233"/> +<v x="-0.782335" y="0.356098" z="1.49036" nx="-0.621906" ny="-0.599872" nz="-0.503342"/> +<t v1="244" v2="189" v3="235"/> +<v x="-0.630313" y="0.250432" z="1.45962" nx="0.753105" ny="-0.618183" nz="-0.224982"/> +<v x="-0.600238" y="0.317293" z="1.48395" nx="0.987335" ny="-0.148961" nz="-0.0542009"/> +<t v1="246" v2="245" v3="236"/> +<t v1="246" v2="236" v3="237"/> +<v x="-0.647619" y="0.240866" z="1.45614" nx="-0.0909146" ny="-0.935789" nz="-0.340587"/> +<t v1="245" v2="247" v3="238"/> +<t v1="245" v2="238" v3="236"/> +<v x="-0.666347" y="0.256054" z="1.46166" nx="-0.910031" ny="-0.389477" nz="-0.141758"/> +<t v1="247" v2="248" v3="239"/> +<t v1="247" v2="239" v3="238"/> +<v x="-0.666347" y="0.262762" z="1.46411" nx="-0.85638" ny="0.485183" nz="0.17658"/> +<t v1="248" v2="249" v3="240"/> +<t v1="248" v2="240" v3="239"/> +<v x="-0.652601" y="0.269459" z="1.46654" nx="-0.857418" ny="0.483535" nz="0.17597"/> +<t v1="249" v2="250" v3="241"/> +<t v1="249" v2="241" v3="240"/> +<v x="-0.652709" y="0.29424" z="1.47556" nx="-0.800317" ny="-0.563402" nz="-0.205054"/> +<t v1="250" v2="251" v3="242"/> +<t v1="250" v2="242" v3="241"/> +<v x="-0.674087" y="0.29998" z="1.47765" nx="-0.801538" ny="-0.561846" nz="-0.204474"/> +<t v1="251" v2="252" v3="243"/> +<t v1="251" v2="243" v3="242"/> +<v x="-0.782335" y="0.352416" z="1.49674" nx="-0.621906" ny="-0.735832" nz="-0.26783"/> +<t v1="253" v2="189" v3="244"/> +<v x="-0.630313" y="0.242608" z="1.50399" nx="0.753105" ny="-0.657857" nz="0"/> +<v x="-0.600238" y="0.31376" z="1.50399" nx="0.964507" ny="-0.264016" nz="0"/> +<t v1="255" v2="254" v3="245"/> +<t v1="255" v2="245" v3="246"/> +<v x="-0.647619" y="0.232428" z="1.50399" nx="-0.0909452" ny="-0.995849" nz="0"/> +<t v1="254" v2="256" v3="247"/> +<t v1="254" v2="247" v3="245"/> +<v x="-0.666347" y="0.248591" z="1.50399" nx="-0.910031" ny="-0.414472" nz="0"/> +<t v1="256" v2="257" v3="248"/> +<t v1="256" v2="248" v3="247"/> +<v x="-0.666347" y="0.25573" z="1.50399" nx="-0.85638" ny="0.516343" nz="0"/> +<t v1="257" v2="258" v3="249"/> +<t v1="257" v2="249" v3="248"/> +<v x="-0.652601" y="0.262856" z="1.50399" nx="-0.857418" ny="0.514573" nz="0"/> +<t v1="258" v2="259" v3="250"/> +<t v1="258" v2="250" v3="249"/> +<v x="-0.652709" y="0.289228" z="1.50399" nx="-0.800317" ny="-0.599567" nz="0"/> +<t v1="259" v2="260" v3="251"/> +<t v1="259" v2="251" v3="250"/> +<v x="-0.674087" y="0.295336" z="1.50399" nx="-0.801538" ny="-0.597888" nz="0"/> +<t v1="260" v2="261" v3="252"/> +<t v1="260" v2="252" v3="251"/> +<v x="-0.782335" y="0.351137" z="1.50399" nx="-0.621906" ny="-0.783074" nz="0"/> +<t v1="262" v2="189" v3="253"/> +<v x="-0.630313" y="0.250432" z="1.54836" nx="0.753105" ny="-0.618183" nz="0.224982"/> +<v x="-0.600238" y="0.317293" z="1.52402" nx="0.980102" ny="-0.186407" nz="0.0678426"/> +<t v1="264" v2="263" v3="254"/> +<t v1="264" v2="254" v3="255"/> +<v x="-0.647619" y="0.240866" z="1.55184" nx="-0.0909452" ny="-0.935789" nz="0.340587"/> +<t v1="263" v2="265" v3="256"/> +<t v1="263" v2="256" v3="254"/> +<v x="-0.666347" y="0.256054" z="1.54631" nx="-0.910031" ny="-0.389477" nz="0.141758"/> +<t v1="265" v2="266" v3="257"/> +<t v1="265" v2="257" v3="256"/> +<v x="-0.666347" y="0.262762" z="1.54387" nx="-0.85638" ny="0.485183" nz="-0.17658"/> +<t v1="266" v2="267" v3="258"/> +<t v1="266" v2="258" v3="257"/> +<v x="-0.652601" y="0.269459" z="1.54144" nx="-0.857418" ny="0.483535" nz="-0.17597"/> +<t v1="267" v2="268" v3="259"/> +<t v1="267" v2="259" v3="258"/> +<v x="-0.652709" y="0.29424" z="1.53242" nx="-0.800317" ny="-0.563402" nz="0.205054"/> +<t v1="268" v2="269" v3="260"/> +<t v1="268" v2="260" v3="259"/> +<v x="-0.674087" y="0.29998" z="1.53033" nx="-0.801538" ny="-0.561846" nz="0.204474"/> +<t v1="269" v2="270" v3="261"/> +<t v1="269" v2="261" v3="260"/> +<v x="-0.782335" y="0.352416" z="1.51124" nx="-0.621906" ny="-0.735832" nz="0.26783"/> +<t v1="271" v2="189" v3="262"/> +<v x="-0.630313" y="0.27296" z="1.58738" nx="0.753105" ny="-0.503952" nz="0.422864"/> +<v x="-0.600238" y="0.327466" z="1.54165" nx="0.987335" ny="-0.121433" nz="0.101901"/> +<t v1="273" v2="272" v3="263"/> +<t v1="273" v2="263" v3="264"/> +<v x="-0.647619" y="0.265162" z="1.59392" nx="-0.0909452" ny="-0.762841" nz="0.640095"/> +<t v1="272" v2="274" v3="265"/> +<t v1="272" v2="265" v3="263"/> +<v x="-0.666347" y="0.277544" z="1.58353" nx="-0.910062" ny="-0.317484" nz="0.266396"/> +<t v1="274" v2="275" v3="266"/> +<t v1="274" v2="266" v3="265"/> +<v x="-0.666347" y="0.283012" z="1.57895" nx="-0.856349" ny="0.39552" nz="-0.331889"/> +<t v1="275" v2="276" v3="267"/> +<t v1="275" v2="267" v3="266"/> +<v x="-0.652601" y="0.288471" z="1.57437" nx="-0.857418" ny="0.394177" nz="-0.33076"/> +<t v1="276" v2="277" v3="268"/> +<t v1="276" v2="268" v3="267"/> +<v x="-0.652709" y="0.308673" z="1.55741" nx="-0.800287" ny="-0.459273" nz="0.385388"/> +<t v1="277" v2="278" v3="269"/> +<t v1="277" v2="269" v3="268"/> +<v x="-0.674087" y="0.313352" z="1.55349" nx="-0.801538" ny="-0.458022" nz="0.38432"/> +<t v1="278" v2="279" v3="270"/> +<t v1="278" v2="270" v3="269"/> +<v x="-0.782335" y="0.356098" z="1.51762" nx="-0.621906" ny="-0.599872" nz="0.503342"/> +<t v1="280" v2="189" v3="271"/> +<v x="-0.630313" y="0.307475" z="1.61634" nx="0.753105" ny="-0.328929" nz="0.56972"/> +<v x="-0.600238" y="0.343051" z="1.55472" nx="0.987335" ny="-0.0792566" nz="0.137272"/> +<t v1="282" v2="281" v3="272"/> +<t v1="282" v2="272" v3="273"/> +<v x="-0.647619" y="0.302385" z="1.62516" nx="-0.0909452" ny="-0.497909" nz="0.862423"/> +<t v1="281" v2="283" v3="274"/> +<t v1="281" v2="274" v3="272"/> +<v x="-0.666347" y="0.310467" z="1.61116" nx="-0.910062" ny="-0.207221" nz="0.358928"/> +<t v1="283" v2="284" v3="275"/> +<t v1="283" v2="275" v3="274"/> +<v x="-0.666347" y="0.314036" z="1.60498" nx="-0.856349" ny="0.258156" nz="-0.447157"/> +<t v1="284" v2="285" v3="276"/> +<t v1="284" v2="276" v3="275"/> +<v x="-0.652601" y="0.317599" z="1.59881" nx="-0.857418" ny="0.257271" nz="-0.445631"/> +<t v1="285" v2="286" v3="277"/> +<t v1="285" v2="277" v3="276"/> +<v x="-0.652709" y="0.330785" z="1.57597" nx="-0.800287" ny="-0.299783" nz="0.519242"/> +<t v1="286" v2="287" v3="278"/> +<t v1="286" v2="278" v3="277"/> +<v x="-0.674087" y="0.333839" z="1.57068" nx="-0.80153... [truncated message content] |
From: <cf...@us...> - 2007-09-13 06:57:11
|
Revision: 1150 http://automanic.svn.sourceforge.net/automanic/?rev=1150&view=rev Author: cfraz89 Date: 2007-09-12 23:57:15 -0700 (Wed, 12 Sep 2007) Log Message: ----------- bit on map editor Added Paths: ----------- trunk/iomapedit/scripts/terrainent.py Added: trunk/iomapedit/scripts/terrainent.py =================================================================== --- trunk/iomapedit/scripts/terrainent.py (rev 0) +++ trunk/iomapedit/scripts/terrainent.py 2007-09-13 06:57:15 UTC (rev 1150) @@ -0,0 +1,19 @@ +from pycel import * + +class terrainent: + api_version = 2 + def __init__(self, entity): + self.entity = entity + self.mesh = celMesh(self.entity) + self.mesh.Mesh = Engine.FindMeshObject('Terrain') + self.meshselect = celMeshSelect(self.entity) + self.pcinput = celCommandInput(self.entity) + self.pcinput.Bind('mouse0', 'geomod') + self.mouse = CS_QUERY_REGISTRY(oreg, iMouseDriver) + + def pccommandinput_geomod1(self, pc, args): + mx = self.mouse.GetLastX() + my = self.mouse.GetLastY() + width = Graphics2D.GetWidth() + height = Graphics2D.GetHeight() + print mx, width \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cf...@us...> - 2007-09-13 06:55:55
|
Revision: 1149 http://automanic.svn.sourceforge.net/automanic/?rev=1149&view=rev Author: cfraz89 Date: 2007-09-12 23:55:58 -0700 (Wed, 12 Sep 2007) Log Message: ----------- bit on map editor Modified Paths: -------------- trunk/iomapedit/scripts/ioMapEdit.py Modified: trunk/iomapedit/scripts/ioMapEdit.py =================================================================== --- trunk/iomapedit/scripts/ioMapEdit.py 2007-09-13 06:04:48 UTC (rev 1148) +++ trunk/iomapedit/scripts/ioMapEdit.py 2007-09-13 06:55:58 UTC (rev 1149) @@ -14,7 +14,5 @@ zonemgr.SetLoadingMode(CEL_ZONE_LOADALL) Engine.Prepare() Engine.PrecacheDraw() - #Vfs.ChDir('/iomapedit/cod') - #Loader.LoadMapFile('world') - #Engine.Prepare() - cament = CreateEntity('cam', BehaviourLayers['blpython'], 'cament') \ No newline at end of file + cament = CreateEntity('cam', BehaviourLayers['blpython'], 'cament') + terrainent = CreateEntity('terrain', BehaviourLayers['blpython'], 'terrainent') \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |