From c6280f52753c235c4cdaa7883cd972aab75ff592 Mon Sep 17 00:00:00 2001 From: Le_dahut Date: Wed, 21 May 2014 23:29:42 +0200 Subject: [PATCH] =?UTF-8?q?-Pour=20modification=20des=20=C3=A9v=C3=A8nemen?= =?UTF-8?q?ts=20pour=20modification/editions=20de=20niveaux=20en=20mode=20?= =?UTF-8?q?d=C3=A9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TODO.md | 4 ++-- dbdata | Bin 77824 -> 77824 bytes dbsrc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TODO.md b/TODO.md index 2659065..742bc35 100644 --- a/TODO.md +++ b/TODO.md @@ -40,10 +40,10 @@ le temps est limité. #### STRUCTURE/PROGRAMMATION * Modifier la méthode d'accès aux variables "dat" & "art". -* Optimiser le code pour rendre l'usage d'OpenGL plus efficient. +* Optimiser le code pour rendre l'usage d'OpenGL plus efficient en +utilisant les vertex list et les batch graphic. * Repenser le mode simulation de façon orienté objet. * Ajouter un makefile pour automatiser la construction du programme. -* Ajouter l'évènement "scroll,release" à la gestion des menus. * Creer un gestionnaire de zones sensibles pour gérer le menu de selection des labos et les bulles d'aide. diff --git a/dbdata b/dbdata index 82e4d6f41dca71240d7496873c2da0047e0e760b..398e003ddbe5011c019f6fdd96966f02f06df1b9 100644 GIT binary patch delta 4776 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 delta 4657 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 diff --git a/dbsrc b/dbsrc index f118351..f21c65d 100644 --- a/dbsrc +++ b/dbsrc @@ -1261,7 +1261,7 @@ menus=[ {'motion':'motion_popup','click': 'click_stat', 'tech':2, 'value':'Statistiques electrons', 'size':0, 'icon': 'drawstat', 'params': '''[stat[0],stat[1],stat[3],stat[4],stat[5],stat[6]],[art['headb2']['color'],art['headb']['color'],art['head']['color'],art['head2']['color'],art['headr']['color'],art['headr2']['color']]''', 'variable':True,'visible':'win.width>=1280','separe':False,'squarred':False,'active': True}, {'motion':'motion_popup','click': 'click_stat', 'tech':2, 'value':'Statistiques hors electrons', 'size':0, 'icon': 'drawstat', 'params': '''[stat[2],stat[7],stat[8]],[art['headp']['color'],art['neut']['color'],art['prot']['color']]''','variable':True,'visible':'win.width>=1280','separe':False,'squarred':False,'active': True}, {'motion':'motion_popup','click': 'click_cout', 'tech':0,'text':'#str(cout-thecout)', 'value':'Argent', 'size':140, 'icon': 'picture/cout.png','variable':False,'visible':True,'separe':False,'squarred':False,'active': True}, -{'motion':'motion_popup','click': 'click_tech', 'tech':1,'text':'#str(tech)', 'value':'Degre technologique', 'size':65, 'icon': 'picture/tech.png','variable':False,'visible':True,'separe':False,'squarred':False,'active': True}, +{'motion':'motion_popup','scroll': 'scroll_tech', 'click': 'click_tech', 'tech':1,'text':'#str(tech)', 'value':'Degre technologique', 'size':65, 'icon': 'picture/tech.png','variable':False,'visible':True,'separe':False,'squarred':False,'active': True}, ] , [