cambios carteles

escena_basica/Makefile

@@ -0,0 +1,13 @@
+# Attempt to load a config.make file.
+# If none is found, project defaults in config.project.make will be used.
+ifneq ($(wildcard config.make),)
+	include config.make
+endif
+
+# make sure the the OF_ROOT location is defined
+ifndef OF_ROOT
+    OF_ROOT=../../..
+endif
+
+# call the project makefile!
+include $(OF_ROOT)/libs/openFrameworksCompiled/project/makefileCommon/compile.project.mk

escena_basica/addons.make

@@ -1 +1,11 @@
 ofxBox2d
+ofxSpriteSheetRenderer
+ofxPostProcessing
+ofxSvg
+ofxAnimatable
+ofxUI
+ofxScreenCurtain
+ofxTuio
+ofxOsc
+ofxXmlSettings
+ofxBox2d

escena_basica/bin/data/gui_nuclear_fuerte.xml

@@ -18,7 +18,7 @@
 <Widget>
     <Kind>4</Kind>
     <Name>Magnetic Force</Name>
-    <Value>0.512190819</Value>
+    <Value>0.497990370</Value>
 </Widget>
 <Widget>
     <Kind>2</Kind>

escena_basica/config.make

@@ -0,0 +1,141 @@
+################################################################################
+# CONFIGURE PROJECT MAKEFILE (optional)
+#   This file is where we make project specific configurations.
+################################################################################
+
+################################################################################
+# OF ROOT
+#   The location of your root openFrameworks installation
+#       (default) OF_ROOT = ../../.. 
+################################################################################
+# OF_ROOT = ../../..
+
+################################################################################
+# PROJECT ROOT
+#   The location of the project - a starting place for searching for files
+#       (default) PROJECT_ROOT = . (this directory)
+#    
+################################################################################
+# PROJECT_ROOT = .
+
+################################################################################
+# PROJECT SPECIFIC CHECKS
+#   This is a project defined section to create internal makefile flags to 
+#   conditionally enable or disable the addition of various features within 
+#   this makefile.  For instance, if you want to make changes based on whether
+#   GTK is installed, one might test that here and create a variable to check. 
+################################################################################
+# None
+
+################################################################################
+# PROJECT EXTERNAL SOURCE PATHS
+#   These are fully qualified paths that are not within the PROJECT_ROOT folder.
+#   Like source folders in the PROJECT_ROOT, these paths are subject to 
+#   exlclusion via the PROJECT_EXLCUSIONS list.
+#
+#     (default) PROJECT_EXTERNAL_SOURCE_PATHS = (blank) 
+#
+#   Note: Leave a leading space when adding list items with the += operator
+################################################################################
+# PROJECT_EXTERNAL_SOURCE_PATHS = 
+
+################################################################################
+# PROJECT EXCLUSIONS
+#   These makefiles assume that all folders in your current project directory 
+#   and any listed in the PROJECT_EXTERNAL_SOURCH_PATHS are are valid locations
+#   to look for source code. The any folders or files that match any of the 
+#   items in the PROJECT_EXCLUSIONS list below will be ignored.
+#
+#   Each item in the PROJECT_EXCLUSIONS list will be treated as a complete 
+#   string unless teh user adds a wildcard (%) operator to match subdirectories.
+#   GNU make only allows one wildcard for matching.  The second wildcard (%) is
+#   treated literally.
+#
+#      (default) PROJECT_EXCLUSIONS = (blank)
+#
+#		Will automatically exclude the following:
+#
+#			$(PROJECT_ROOT)/bin%
+#			$(PROJECT_ROOT)/obj%
+#			$(PROJECT_ROOT)/%.xcodeproj
+#
+#   Note: Leave a leading space when adding list items with the += operator
+################################################################################
+# PROJECT_EXCLUSIONS =
+
+################################################################################
+# PROJECT LINKER FLAGS
+#	These flags will be sent to the linker when compiling the executable.
+#
+#		(default) PROJECT_LDFLAGS = -Wl,-rpath=./libs
+#
+#   Note: Leave a leading space when adding list items with the += operator
+#
+# Currently, shared libraries that are needed are copied to the 
+# $(PROJECT_ROOT)/bin/libs directory.  The following LDFLAGS tell the linker to
+# add a runtime path to search for those shared libraries, since they aren't 
+# incorporated directly into the final executable application binary.
+################################################################################
+# PROJECT_LDFLAGS=-Wl,-rpath=./libs
+
+################################################################################
+# PROJECT DEFINES
+#   Create a space-delimited list of DEFINES. The list will be converted into 
+#   CFLAGS with the "-D" flag later in the makefile.
+#
+#		(default) PROJECT_DEFINES = (blank)
+#
+#   Note: Leave a leading space when adding list items with the += operator
+################################################################################
+# PROJECT_DEFINES = 
+
+################################################################################
+# PROJECT CFLAGS
+#   This is a list of fully qualified CFLAGS required when compiling for this 
+#   project.  These CFLAGS will be used IN ADDITION TO the PLATFORM_CFLAGS 
+#   defined in your platform specific core configuration files. These flags are
+#   presented to the compiler BEFORE the PROJECT_OPTIMIZATION_CFLAGS below. 
+#
+#		(default) PROJECT_CFLAGS = (blank)
+#
+#   Note: Before adding PROJECT_CFLAGS, note that the PLATFORM_CFLAGS defined in 
+#   your platform specific configuration file will be applied by default and 
+#   further flags here may not be needed.
+#
+#   Note: Leave a leading space when adding list items with the += operator
+################################################################################
+ PROJECT_CFLAGS = -w
+
+################################################################################
+# PROJECT OPTIMIZATION CFLAGS
+#   These are lists of CFLAGS that are target-specific.  While any flags could 
+#   be conditionally added, they are usually limited to optimization flags. 
+#   These flags are added BEFORE the PROJECT_CFLAGS.
+#
+#   PROJECT_OPTIMIZATION_CFLAGS_RELEASE flags are only applied to RELEASE targets.
+#
+#		(default) PROJECT_OPTIMIZATION_CFLAGS_RELEASE = (blank)
+#
+#   PROJECT_OPTIMIZATION_CFLAGS_DEBUG flags are only applied to DEBUG targets.
+#
+#		(default) PROJECT_OPTIMIZATION_CFLAGS_DEBUG = (blank)
+#
+#   Note: Before adding PROJECT_OPTIMIZATION_CFLAGS, please note that the 
+#   PLATFORM_OPTIMIZATION_CFLAGS defined in your platform specific configuration 
+#   file will be applied by default and further optimization flags here may not 
+#   be needed.
+#
+#   Note: Leave a leading space when adding list items with the += operator
+################################################################################
+# PROJECT_OPTIMIZATION_CFLAGS_RELEASE = 
+# PROJECT_OPTIMIZATION_CFLAGS_DEBUG = 
+
+################################################################################
+# PROJECT COMPILERS
+#   Custom compilers can be set for CC and CXX
+#		(default) PROJECT_CXX = (blank)
+#		(default) PROJECT_CC = (blank)
+#   Note: Leave a leading space when adding list items with the += operator
+################################################################################
+# PROJECT_CXX = 
+# PROJECT_CC = 

escena_basica/src/menu/display.h

@@ -14,7 +14,7 @@
 #include "cheapComm.h"
 #define RADIO 130
 #define LOADINGTIME 4.0
-
+#define DISPLAY_INFO_TIME 7000
 /*
  DISPLAY CENTRAL 
  Estado OFF DESACTIVADO
@@ -25,37 +25,60 @@
 class display{
 public:
         int scene;
-    enum statuses{PREVIOUS, COUNTING, OFF};
+    enum statuses{PREVIOUS, COUNTING, OFF,DISPLAY_INFO};
 
     display(){
         status=OFF;
          myfont.loadFont("akzidenz.ttf", 80);
         ofTrueTypeFont::setGlobalDpi(72);
+        display_info_time=0;
+        alphaInfoText=0;
     }
     void init(int sc){
         if(status==OFF){
             time0=ofGetElapsedTimeMillis();
             scene=sc;
             status=PREVIOUS;
             if(sc==EM)
-                textEm.loadImage("em.png");
+            { 
+               textEm.loadImage("em.png");
+                infoEm.loadImage("info_em.png");
+            }
             if(sc==FUERTE)
-                textEm.loadImage("fuerte.png");
+            { 
+               textEm.loadImage("fuerte.png");
+                infoEm.loadImage("info_fuerte.png");
+            }
             if(sc==DEBIL)
-                textEm.loadImage("debil.png");
+            { 
+               textEm.loadImage("debil.png");
+                infoEm.loadImage("info_debil.png");
+            }
             if(sc==GRAVEDAD)
+            {
                 textEm.loadImage("gravedad.png");
-
+                infoEm.loadImage("info_gravedad.png");
+            }
+
         }
     }
 
     void interrupt(int sc ){
+        if(status==DISPLAY_INFO) return;
         if(scene==sc){
             status=OFF;
             cheapComm::getInstance()->sendSync0("/sync/menu/hand_off_event");
         }
     }
 
+    void changeScene(){
+        init_time=ofGetElapsedTimeMillis(); 
+            a=0;
+            radioIncreasing=0;
+            ofSendMessage("changeScene" +ofToString(scene)); 
+            status=OFF;
+            alphaInfoText=0;
+    }
     void draw(){
 
         if(status==COUNTING) a<255?a+=10:a; //velocidad del fade
@@ -70,15 +93,22 @@ class display{
             }
             return;
         }
-        //LO QUE VIENE AHORA SOLO SE EJECUTA CON status == COUNTING
+        //LO QUE VIENE AHORA SOLO SE EJECUTA CON status == COUNTING o status == DISPLAY_INFO
 
         int tim=ofGetElapsedTimeMillis()-init_time;
         int timeleft=LOADINGTIME*1000-tim;
         if(timeleft<800) {
-            init_time=ofGetElapsedTimeMillis(); a=0;
-            ofSendMessage("changeScene" +ofToString(scene)); status==OFF;
-            return;
+            if(status!=DISPLAY_INFO) { 
+                display_info_time=ofGetElapsedTimeMillis()+DISPLAY_INFO_TIME;
+            }
+            status=DISPLAY_INFO;
+            if(ofGetElapsedTimeMillis()>display_info_time){
+                changeScene();
+                return;
+            }
+
         }
+        if(status==DISPLAY_INFO) radioIncreasing++;
         int timeleft_sec=ceil(timeleft/1000);
 
         string timeleft_str=ofToString(timeleft_sec);
@@ -92,35 +122,43 @@ class display{
             ofEnableAlphaBlending();
             ofSetColor(0,0,0,min(a,200));
 
-            ofCircle(W_WIDTH/2, W_HEIGHT/2, RADIO);
+            ofCircle(W_WIDTH/2, W_HEIGHT/2, RADIO+radioIncreasing);
             ofSetColor(255,a);
             ofPushMatrix();
                 ofTranslate(W_WIDTH/2, W_HEIGHT/2);
                 ofRotateZ(rotation_angle);
-                textEm.draw(-textEm.width/2,-textEm.height/2);
-            ofPopMatrix();
-
-            ofPushMatrix();
-                ofTranslate(W_WIDTH/2, W_HEIGHT/2);
-               // ofRotateZ(rotation_angle);
-                int wt= myfont.stringWidth(timeleft_str);
-                int ht= myfont.stringHeight(timeleft_str);
-                myfont.drawString(timeleft_str,-wt/2,+ht/2);
+                if(status==COUNTING){
+                    textEm.draw(-textEm.width/2,-textEm.height/2);
+                }
+                else if (status==DISPLAY_INFO){
+                    ofSetColor(255,alphaInfoText);
+                    alphaInfoText=((++alphaInfoText)%255);
+                    infoEm.draw(-RADIO,-RADIO,RADIO*2,RADIO*2);
+                }
             ofPopMatrix();
 
+            if(status==COUNTING){
+                ofPushMatrix();
+                    ofTranslate(W_WIDTH/2, W_HEIGHT/2);
+                   // ofRotateZ(rotation_angle);
+                    int wt= myfont.stringWidth(timeleft_str);
+                    int ht= myfont.stringHeight(timeleft_str);
+                    myfont.drawString(timeleft_str,-wt/2,+ht/2);
+                ofPopMatrix();
+
 
-            ofPushMatrix();
-            ofTranslate(W_WIDTH/2, W_HEIGHT/2);
-            int r=RADIO-6;
-            ofSetColor(27,117,187,a);
-            for(int i=0; i<ofMap(tim,0,LOADINGTIME*1000,0,360); i+=6){
-//                int x1=r*sin(ofDegToRad(i))
-//                int y1=r*cos(ofDegToRad(i))
-                ofRotateZ(6);
-                ofRect(-r,0,6,4);
+                ofPushMatrix();
+                ofTranslate(W_WIDTH/2, W_HEIGHT/2);
+                int r=RADIO-6;
+                ofSetColor(27,117,187,a);
+                for(int i=0; i<ofMap(tim,0,LOADINGTIME*1000,0,360); i+=6){
+    //                int x1=r*sin(ofDegToRad(i))
+    //                int y1=r*cos(ofDegToRad(i))
+                    ofRotateZ(6);
+                    ofRect(-r,0,6,4);
+                }
+                ofPopMatrix();
             }
-            ofPopMatrix();
-
             ofDisableAlphaBlending();
             ofPopStyle();
 
@@ -130,11 +168,15 @@ class display{
     }
 private:
     int init_time, time0; //time0 es el momento en el que se pulsa el boton, pero hasta que no pasan 2 segundos no se guarda init_time que es el momento de inicio de la cuenta atras
+    int display_info_time;
     float rotation_angle;
     ofImage textEm;
+    ofImage infoEm;
     ofTrueTypeFont myfont;
     int a;
+    int alphaInfoText;
     int status;
+    int radioIncreasing;
 
 
 };

escena_basica/src/nuclear_debil.cpp

@@ -96,7 +96,7 @@ void nuclear_debil::setup() {
 	velocNeutronLanz = 120;
 
 
-	cargaSounds();
+	//cargaSounds();
 	mas_particulas_img.loadImage("mas_particulas.png");
     mas_acel_img.loadImage("mas_aceleracion.png");