Changeset 45

Timestamp:

07/12/07 19:58:02 (1 year ago)

Author:

Deformative

Message:

Added stretch and boundries

Files:

• trunk/src/demo2/main.d (modified) (3 diffs)
• trunk/src/yage/gui/surface.d (modified) (12 diffs)
• trunk/src/yage/resource/texture.d (modified) (1 diff)
• trunk/src/yage/system/device.d (modified) (2 diffs)
• trunk/src/yage/system/input.d (modified) (6 diffs)

trunk/src/demo2/main.d

@@ -57 +57 @@
-    CameraNode camera = new CameraNode(ship.getCameraSpot());
-    camera.setView(2, 20000, 60, 0, 1); // wide angle view
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    disp.setVisibility(true);
-
+
-    Surface first = new Surface(disp);
-
-
-
+
+
+
+
-    first.setVisibility(true);
-    
+    Surface third = new Surface(disp);
+    third.setTexture(new GPUTexture("box.png"));
+    third.fill = stretched;
+    third.topLeft = Vec2f(.8, .05);
+    third.bottomRight = Vec2f(.95, .2);
+    third.setVisibility(true);
+    
+    Surface fourth = new Surface(disp);
+    fourth.setTexture(new GPUTexture("test/button2.png"));
+    fourth.fill = stretched;
+    fourth.topLeft = Vec2f(.05, .8);
+    fourth.bottomRight = Vec2f(.2, .95);
+    fourth.setVisibility(true);
+    
+    Surface fifth = new Surface(disp);
+    fifth.setTexture(new GPUTexture("test/radio1.png"));
+    fifth.fill = stretched;
+    fifth.topLeft = Vec2f(.05, .05);
+    fifth.bottomRight = Vec2f(.2, .2);
+    fifth.setVisibility(true);
+    
-    Surface second = new Surface(disp);
-texture = camera.getTexture(
-5,.25
-1,1
+setTexture(camera.getTexture()
+,.2
+.8, .8
-    second.setVisibility(true);
+    
+    Surface clear = new Surface(second);
+    clear.setTexture(new GPUTexture("test/clear.png"));
+    clear.topLeft = Vec2f(.1,.1);
+    clear.bottomRight = Vec2f(.9, .9);
+    clear.fill = stretched;
+    clear.setVisibility(true);
-    
-    void onMousedown(Surface self, byte buttons, Vec2i coordinates){
@@ -81 +119 @@
-    }
-    
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    second.onMousedown = &onMousedown;  
-
+
+
+
+
+
+
+
+
+
+
+
-    
-    // Music
@@ -151 +211 @@
-        Input.processInput();
-        camera.toTexture();
-disp
+bg
-        
-        

trunk/src/yage/gui/surface.d

@@ -13 +13 @@
-import yage.system.device;
-import yage.system.constant;
+import yage.system.input;
-import yage.resource.texture;
-import yage.gui.style;
-
+
+//move to constants
+enum{
+    traditional, //default
+    stretched,
+    tiled
+}
+
+float third = 1.0/3.0;
-
-/** 
@@ -23 +33 @@
- * The children will be positioned relative to the borders of their parent. */
-class Surface{
-static final Style defaultStyle;
-Style style;
-
-//Style style;  //move style into a higher level clas, perhaps make a geometry struct isntead
-GPUTexture texture;  
-
-//Linked list would be faster for raising a window.
-//Perhaps this should be changed into a linked list...
+//Not sure that a Surface should have a style... I think surface should be a lower abstraction, for only geometry, rendering, and input.
+//static final Style defaultStyle; //Default style should be more fitting as something that is global.
+//Style style;
+
+
+private GPUTexture texture;
+
+
-    //Not sure if I should have a reference to Parent or not, but for now, I will.
-    Surface parent;
-    
-
-
-
+
-    Vec2f bottomRight;
-    
-calculation
+for user
-    Vec2i position1;
-    Vec2i position2;
-    
-
-
+
+
+
+
-    
-    bool visible;
-
-
-
+
+
-    
-    //Not sure how to impelement gluUnProject
-    
+    //Perhaps add some of these for global events.
-    void delegate(typeof(this) self) onBlur;
-void blur(){ if(onBlur)onBlur(this);}
-
+
+
-    void delegate(typeof(this) self, byte buttons, Vec2i coordinates) onClick;
-
+    //dunno how
-    void delegate(typeof(this) self, byte buttons, Vec2i coordinates) onDblclick;
-
-
+ //Done -- See Raise, no fall through
-
-    void delegate(typeof(this) self, byte key, byte modifiers) onKeydown;
@@ -68 +79 @@
-    void delegate(typeof(this) self, byte key, byte modifiers) onKeyup;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-    void delegate(typeof(this) self, byte buttons, Vec2i coordinates) onMouseout;
@@ -78 +95 @@
-    void delegate(typeof(this) self, byte buttons, Vec2i coordinates) onMouseover;
-
-
-
-
-
+
+
+
+
+
+
+
-    
-    
@@ -88 +108 @@
-        if(parent is null){
-            Device.subs ~= this;
-recalculate(Device.getHeight(), Device.getWidth()
+this.recalculate(
-        }
-        else{
-            parent.subs ~= this;
-recalculate(parent.size.x, parent.size.y
+this.recalculate(
-        }
-    }
@@ -101 +121 @@
-    }
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        foreach(sub ;this.subs)
-size.x, size.y
+position1, position2
-    }
-    
-    void recalculate(){
-==
-Device.width, Device.height
+is
+Vec2i(0,0), Vec2i(Device.width, Device.height)
-        else
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        portion.x = texture.requested_width/cast(float)texture.getWidth();
-        portion.y = texture.requested_height/cast(float)texture.getHeight();
@@ -147 +206 @@
-        glDisable(GL_LIGHTING);
-        
+        glEnable(GL_BLEND);
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+        //glColor4f(1, 1, 1, 1);
+        
+        
-        glEnable(GL_TEXTURE_2D);
-        
@@ -167 +231 @@
-        
-                glBegin(GL_QUADS);
-
-                glTexCoord2f(0, 0);
-                glVertex2i(position1.x, position2.y);
-                
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                glEnd();
-            }
-            
+            //I am clueless about this, so it's commented
-            // Sort subs
-
-   subs.radixSort((Surface s){return s.style.zIndex;} );           
+//
+// subs.radixSort((Surface s){return s.style.zIndex;} );
-            
-            foreach(sub; subs)
@@ -201 +435 @@
-            for(; index < Device.subs.length - 1; index++)
-                Device.subs[index] = Device.subs[index+1];
-
+-1
-        }
-        else{
@@ -209 +443 @@
-            parent.subs[$-1] = this;
-        }
-
+
+
-}
-
+//Perhaps put into yage.system.input
+//Could be better, a method perhaps...
-Surface findSurface(int x, int y){
+    if(Input.surfaceLock) return Input.surfaceLock;
-    foreach_reverse(sub; Device.subs){
-        if(sub.position1.x <= x && x <= sub.position2.x && sub.position1.y <= y && y <= sub.position2.y){
@@ -220 +458 @@
-    return null;
-}
-
+
-Surface findSurface(Surface surface,int x, int y){
-    foreach_reverse(sub; surface.subs){
@@ -234 +472 @@
-        if(current == surface) return  index;
-    }
-
+  //Implement this for not in subs
-}

trunk/src/yage/resource/texture.d

@@ -318 +318 @@
-
-        }
+        if(this.requested_width == 0) this.requested_width = this.getWidth();
+        if(this.requested_height == 0) this.requested_height = this.getHeight();
-    }
-

trunk/src/yage/system/device.d

@@ -18 +18 @@
-import derelict.ogg.vorbis;
-import derelict.ogg.vorbisfile;
-
+//
-import yage.gui.surface;
-import yage.system.log;
-import yage.system.constant;
-import yage.system.input;
+import yage.core.vector;
-
-// Enable specular highlights with textures.
@@ -321 +322 @@
-        height = _height;
-        
-width, height
+Vec2i(0, 0), Vec2i(width, height)
-        
-        // For some reason, SDL Linux requires a call to SDL_SetVideoMode for a screen resize that's

trunk/src/yage/system/input.d

@@ -26 +26 @@
-    static int mousex, mousey;      /// The current pixel location of the mouse cursor; (0, 0) is top left.
-    static int mousedx, mousedy;    /// The number of pixels the mouse has moved since the last time input was queried.
-
+
+
+
+
-    /// A structure to track various state variables associated with each mouse button.
-    struct Buttons
@@ -41 +44 @@
-    static bool exit = false;       /// A termination request has been received.
-
-
+
-
-    /** This function fills the above fields with the current intput data.
@@ -79 +82 @@
-
-                    auto surface = findSurface(mousex, mousey);
-!(surface is null)
+surface !is null
-
-                    break;
@@ -89 +92 @@
-
-                    auto surface = findSurface(mousex, mousey);
-!(surface is null)
+surface !is null
-
-                    break;
@@ -99 +102 @@
-                    mousedx += event.motion.xrel;   // these seem to behave differently on linux
-                    mousedy += event.motion.yrel;   // than on win32.  Testing should be done.
+                    
+                    xdiff = mousex - event.motion.x;
+                    ydiff = mousey - event.motion.y;
+                    
-                    mousex = event.motion.x;
-                    mousey = event.motion.y;
-                    
-//
-//if(!(surface is null)) surface.mousemove(event.button.button, Vec2i(mousex,mousey
+
+if(surface !is null) surface.mousemove(event.button.button, Vec2i(xdiff,ydiff
-                    break;
-
@@ -147 +154 @@
-    {   return grabbed;
-    }
+    
+    static void setSurfaceLock(Surface lock){
+        surfaceLock = lock;
+    }
+    static void unlockSurface(){
+        surfaceLock = null;
+    }
-}