Changeset 669 for abuseTweet

Timestamp:

May 16, 2011, 2:37:23 AM (12 years ago)

Author:

Sam Hocevar

Message:

imlib: clean up the Sprite class and get rid of the dead sprite
controller code.

Location:

abuse/trunk

Files:

• TODO (modified) (1 diff)
• src/imlib/event.cpp (modified) (1 diff)
• src/imlib/event.h (modified) (4 diffs)
• src/imlib/jwindow.cpp (modified) (4 diffs)
• src/imlib/sprite.cpp (modified) (1 diff)
• src/imlib/sprite.h (modified) (1 diff)

abuse/trunk/TODO

@@ -65 +65 @@
 Jwindow::_x1 _x2
 
-sprite::x,y -> m_pos
 console::draw_char : vec2i
 VolumeWindow::draw_vol plus grand !!

abuse/trunk/src/imlib/event.cpp

@@ -60 +60 @@
     f.Apply(im);
 
-    m_sprite = new sprite(screen, im, 100, 100);
+    m_sprite = new Sprite(screen, im, vec2i(100, 100));
     m_pos = screen->Size() / 2;
     m_center = vec2i(0, 0);

abuse/trunk/src/imlib/event.h

@@ -26 +26 @@
 #define RIGHT_BUTTON   2
 #define MIDDLE_BUTTON  4
+
 #include "keys.h"
 #include "sprite.h"
@@ -81 +82 @@
     void SetMouseShape(image *im, vec2i center)
     {
-        m_sprite->change_visual(im, 1);
+        m_sprite->SetVisual(im, 1);
         m_center = center;
     }
@@ -94 +95 @@
     linked_list m_events;
     int m_pending, last_key;
-    sprite_controller sc;
 
     image *m_screen;
@@ -100 +100 @@
 protected:
     /* Mouse information */
-    sprite *m_sprite;
+    Sprite *m_sprite;
     vec2i m_pos, m_center;
     int m_button;

abuse/trunk/src/imlib/jwindow.cpp

@@ -334 +334 @@
     {
         m1 = m_pos - m_center;
-        vec2i m2 = m1 + m_sprite->visual->Size();
-
-        m_sprite->save->PutPart(m_surf, vec2i(0, 0), m1, m2);
-        m_surf->PutImage(m_sprite->visual, m1, 1);
+        vec2i m2 = m1 + m_sprite->m_visual->Size();
+
+        m_sprite->m_save->PutPart(m_surf, vec2i(0, 0), m1, m2);
+        m_surf->PutImage(m_sprite->m_visual, m1, 1);
     }
 
@@ -346 +346 @@
 
     if (has_mouse())
-        m_surf->PutImage(m_sprite->save, m1);
+        m_surf->PutImage(m_sprite->m_save, m1);
 
     for (Jwindow *p = m_first; p; p = p->next)
@@ -355 +355 @@
         if (has_mouse())
         {
-            m_sprite->save->PutPart(p->m_surf, vec2i(0, 0), m1 - p->m_pos,
-                                    m1 - p->m_pos + m_sprite->visual->Size());
-            p->m_surf->PutImage(m_sprite->visual, m1 - p->m_pos, 1);
+            m_sprite->m_save->PutPart(p->m_surf, vec2i(0, 0), m1 - p->m_pos,
+                                      m1 - p->m_pos + m_sprite->m_visual->Size());
+            p->m_surf->PutImage(m_sprite->m_visual, m1 - p->m_pos, 1);
         }
 
@@ -368 +368 @@
         update_dirty(p->m_surf, p->m_pos.x, p->m_pos.y);
         if (has_mouse())
-            p->m_surf->PutImage(m_sprite->save, m1 - p->m_pos, 0);
+            p->m_surf->PutImage(m_sprite->m_save, m1 - p->m_pos, 0);
     }
 }

abuse/trunk/src/imlib/sprite.cpp

@@ -23 +23 @@
 #include "sprite.h"
 
+Sprite::Sprite(image *screen, image *visual, vec2i pos)
+{
+    CHECK(visual && screen);
+    m_pos = pos;
+    m_visual = visual;
+    m_screen = screen;
+    m_save = new image(visual->Size());
 
-void sprite::restore_background()
-{ if (x+save->Size().x>=0 && y+save->Size().y>=0 && x<=xres && y<=yres)
-      screen->PutImage(save, vec2i(x, y)); }
-
-void sprite::get_background()
-{ if (x+visual->Size().x>=0 && y+visual->Size().y>=0 && x<=xres && y<=yres)
-   save->PutPart(screen,vec2i(0,0), vec2i(x,y), vec2i(x+save->Size().x,y+save->Size().y)); }
-
-void sprite::draw()
-{ if (x+visual->Size().x>=0 && y+visual->Size().y>=0 && x<=xres && y<=yres)
-   screen->PutImage(visual, vec2i(x, y), 1); }
-
-sprite::sprite(image *Screen, image *Visual, int X, int Y)
-{
-  CHECK(Visual && Screen);
-  x=X; y=Y; visual=Visual; screen=Screen;
-  save = new image(visual->Size());
-  get_background();
+    if (m_pos + visual->Size() >= 0 && m_pos < vec2i(xres, yres))
+        m_save->PutPart(m_screen, vec2i(0,0), m_pos, m_pos + m_save->Size());
 }
 
-sprite::~sprite()
+Sprite::~Sprite()
 {
-  delete save;
+    delete m_save;
 }
 
-void sprite_controller::add_sprite(sprite *sp)
-{ sprites.add_end(sp); }
+void Sprite::SetVisual(image *visual, int delete_old)
+{
+    if (delete_old)
+        delete m_visual;
+    m_visual = visual;
+    if (m_save->Size() != visual->Size())
+    {
+        delete m_save;
+        m_save = new image(visual->Size());
+    }
 
-#define loopt(type,controll,first,inside) { controll=(type *)(first); \
-  if (first) do { inside controll=(type *)(controll->Next()); } \
-  while (controll!=(type *)(first)); }
-
-void sprite_controller::remove_sprites()
-{ sprite *sp; loopt(sprite,sp,sprites.first(),sp->restore_background(); ); }
-
-void sprite_controller::put_sprites()
-{ sprite *sp; loopt(sprite,sp,sprites.first(),sp->draw(); ); }
-
-void sprite_controller::get_backgrounds()
-{ sprite *sp; loopt(sprite,sp,sprites.first(),sp->get_background(); ); }
-
-void sprite::change_visual(image *Visual, int delete_old)
-{ if (delete_old)
-    delete visual;
-  visual=Visual;
-  if (save->Size() != Visual->Size())
-  {
-    delete save;
-    save = new image(visual->Size());
-  }
-  get_background();
+    if (m_pos + visual->Size() >= 0 && m_pos < vec2i(xres, yres))
+        m_save->PutPart(m_screen, vec2i(0,0), m_pos, m_pos + m_save->Size());
 }
 
-void sprite_controller::bring_front(sprite *sp)
-{
-  ERROR(sprites.unlink(sp),"unlink failure");
-  sprites.add_end(sp);
-}
-
-void sprite_controller::delete_sprite(sprite *sp)
-{
-  ERROR(sprites.unlink(sp),"unlink failure");
-  delete sp;
-}
-

abuse/trunk/src/imlib/sprite.h

@@ -11 +11 @@
 #ifndef __SPRITE_HPP
 #define __SPRITE_HPP
+
 #include "image.h"
 #include "linked.h"
 
-class sprite : public linked_node
+class Sprite : public linked_node
 {
 public:
-  image *visual,*screen,*save;
-  int x,y;
-  sprite(image *Screen, image *Visual, int X, int Y);
-  void get_background();
-  void restore_background();
-  void draw();
-  void change_visual(image *Visual, int delete_old=0);
-  ~sprite();
-} ;
+    Sprite(image *screen, image *visual, vec2i pos);
+    ~Sprite();
 
-class sprite_controller
-{
-public :
-  linked_list sprites;
-  void add_sprite(sprite *sp);
-  void remove_sprites();
-  void get_backgrounds();
-  void put_sprites();
-  void bring_front(sprite *sp);
-  void delete_sprite(sprite *sp);
-} ;
+    void SetVisual(image *visual, int delete_old = 0);
+
+    image *m_visual, *m_screen, *m_save;
+
+private:
+    vec2i m_pos;
+};
+
 #endif