fixed up video and texture handling

author Charles McGarvey <chazmcgarvey@brokenzipper.com>

Sat, 1 Aug 2009 01:12:25 +0000 (19:12 -0600)

committer Charles McGarvey <chazmcgarvey@brokenzipper.com>

Sat, 1 Aug 2009 01:12:25 +0000 (19:12 -0600)
author Charles McGarvey <chazmcgarvey@brokenzipper.com>
Sat, 1 Aug 2009 01:12:25 +0000 (19:12 -0600)
committer Charles McGarvey <chazmcgarvey@brokenzipper.com>
Sat, 1 Aug 2009 01:12:25 +0000 (19:12 -0600)
diff --git a/Makefile.am b/Makefile.am

index 95437f2ee2027a5ac276ec2045336f6adf28762e..b77b1f2b3520bc622f9a6b78d7bb13b0294d22c8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,9 +5,16 @@ SUBDIRS = yajl src data doc
  
  EXTRA_DIST = yajl
  
  
  EXTRA_DIST = yajl
  
+
  run: all
         $(MAKE) -C src run
  
  debug: all
         $(MAKE) -C src debug
  
  run: all
         $(MAKE) -C src run
  
  debug: all
         $(MAKE) -C src debug
  
+
+RPMBUILD = rpmbuild
+
+RPM: dist-bzip2
+       $(RPMBUILD) -ba --nodeps extra/yoink.spec 
+
diff --git a/configure.ac b/configure.ac

index cc0e8be8c8f81a22ef3de62313f2ff6c6b20da78..4aafa8126d55e5676bdb01b23546faa69dc5efec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -156,9 +156,9 @@ AC_SUBST([DATA_FILES])
  
  AC_CONFIG_FILES([Makefile
                                  data/Makefile
  
  AC_CONFIG_FILES([Makefile
                                  data/Makefile
-                 src/Makefile
                                  doc/Makefile
                                  doc/yoink.6
                                  doc/Makefile
                                  doc/yoink.6
+                 src/Makefile
                                  yajl/Makefile])
  
  AC_CONFIG_HEADERS([src/config.h])
                                  yajl/Makefile])
  
  AC_CONFIG_HEADERS([src/config.h])
diff --git a/data/Makefile.am b/data/Makefile.am

index 0ab79587e2201606825cc87b4626456c83335717..61318d22ba4d39c6adc67a0e6aafe14d1f4b453e 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,5 @@
  
  
-nobase_dist_pkgdata_DATA = @DATA_FILES@
+nobase_dist_pkgdata_DATA = @DATA_FILES@ yoinkrc
  
  appsdir=$(prefix)/share/applications
  dist_apps_DATA = yoink.desktop
  
  appsdir=$(prefix)/share/applications
  dist_apps_DATA = yoink.desktop
diff --git a/data/animations/AlienWarrior.json b/data/animations/AlienWarrior.json

index 15d28cf894cf40d788f51f21372f5e663d032a3c..2268fca21fd7214fe1ec5c7dafe64a6330ab2668 100644 (file)
--- a/data/animations/AlienWarrior.json
+++ b/data/animations/AlienWarrior.json
@@ -1,184 +1,214 @@
  {
  {
-  "Stand": {
-    "type": "Stand",
-    "delay": 1,
-    "frames": [
-      {
-        "index": 0,
-        "duration": 2
-      },
-      {
-        "index": 1,
-        "duration": 0.25
-      },
-      {
-        "index": 2,
-        "duration": 2
-      },
-      {
-        "index": 1,
-        "duration": 0.25
-      }
-    ]
-  },
-  "Run": {
-    "type": "Run",
-    "delay": 0.25,
-    "frames": [
-      {
-        "index": 3
-      },
-      {
-        "index": 4
-      },
-      {
-        "index": 5
-      },
-      {
-        "index": 6
-      }
-    ]
-  },
-  "StopRunning": {
-    "type": "Stand",
-    "next": "Stand",
-    "delay": 10,
-    "loop": true,
-    "frames": [
-      {
-        "index": 7
-      }
-    ]
-  },
-  "Jump": {
-    "type": "Jump",
-    "next": "FlyDiagonallyUp",
-    "delay": 0.25,
-    "frames": [
-      {
-        "index": 17
-      }
-    ]
-  },
-  "Land": {
-    "type": "Stand",
-    "next": "Stand",
-    "delay": 1,
-    "loop": true,
-    "frames": [
-      {
-        "index": 13,
-        "duration": 0.25
-      }
-    ]
-  },
-  "FlyDiagonallyUp": {
-    "type": "Fly",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 18
-      }
-    ]
-  },
-  "FlyDiagonallyDown": {
-    "type": "Fly",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 19
-      }
-    ]
-  },
-  "FlyStraightUp": {
-    "type": "Fly",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 19
-      }
-    ]
-  },
-  "FlyHorizontally": {
-    "type": "Fly",
-    "frames": [
-      {
-        "index": 3
-      }
-    ]
-  },
-  "Punch": {
-    "type": "Attack",
-    "delay": 0.2,
-    "frames": [
-      {
-        "index": 8
-      },
-      {
-        "index": 9
-      }
-    ]
-  },
-  "StartFiring": {
-    "type": "Attack",
-    "next": "Fire",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 0
-      },
-      {
-        "index": 8
-      }
-    ]
-  },
-  "Fire": {
-    "type": "Attack",
-    "delay": 1,
-    "frames": [
-      {
-        "index": 10,
-        "duration": 0.2
-      },
-      {
-        "index": 11,
-        "duration": 0.2
-      }
-    ]
-  },
-  "StopFiring": {
-    "type": "Attack",
-    "next": "Stand",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 8
-      },
-      {
-        "index": 0
-      }
-    ]
-  },
-  "KnockedDown": {
-    "type": "Hit",
-    "delay": 0.1,
-    "loop": true,
-    "frames": [
-      {
-        "index": 16
-      },
-      {
-        "index": 15
-      }
-    ]
-  },
-  "Flattened": {
-    "type": "Hit",
-    "delay": 1,
-    "frames": [
-      {
-        "index": 13
-      }
-    ]
-  }
+       "Stand":
+       {
+               "type": "Stand",
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 0,
+                               "duration": 2
+                       },
+                       {
+                               "index": 1,
+                               "duration": 0.25
+                       },
+                       {
+                               "index": 2,
+                               "duration": 2
+                       },
+                       {
+                               "index": 1,
+                               "duration": 0.25
+                       }
+               ]
+       },
+       "Run":
+       {
+               "type": "Run",
+               "delay": 0.25,
+               "frames":
+               [
+                       {
+                               "index": 3
+                       },
+                       {
+                               "index": 4
+                       },
+                       {
+                               "index": 5
+                       },
+                       {
+                               "index": 6
+                       }
+               ]
+       },
+       "StopRunning":
+       {
+               "type": "Stand",
+               "next": "Stand",
+               "delay": 10,
+               "loop": true,
+               "frames":
+               [
+                       {
+                               "index": 7
+                       }
+               ]
+       },
+       "Jump":
+       {
+               "type": "Jump",
+               "next": "FlyDiagonallyUp",
+               "delay": 0.25,
+               "frames":
+               [
+                       {
+                               "index": 17
+                       }
+               ]
+       },
+       "Land":
+       {
+               "type": "Stand",
+               "next": "Stand",
+               "delay": 1,
+               "loop": true,
+               "frames":
+               [
+                       {
+                               "index": 13,
+                               "duration": 0.25
+                       }
+               ]
+       },
+       "FlyDiagonallyUp":
+       {
+               "type": "Fly",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 18
+                       }
+               ]
+       },
+       "FlyDiagonallyDown":
+       {
+               "type": "Fly",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 19
+                       }
+               ]
+       },
+       "FlyStraightUp":
+       {
+               "type": "Fly",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 19
+                       }
+               ]
+       },
+       "FlyHorizontally":
+       {
+               "type": "Fly",
+               "frames":
+               [
+                       {
+                               "index": 3
+                       }
+               ]
+       },
+       "Punch":
+       {
+               "type": "Attack",
+               "delay": 0.2,
+               "frames":
+               [
+                       {
+                               "index": 8
+                       },
+                       {
+                               "index": 9
+                       }
+               ]
+       },
+       "StartFiring":
+       {
+               "type": "Attack",
+               "next": "Fire",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 0
+                       },
+                       {
+                               "index": 8
+                       }
+               ]
+       },
+       "Fire":
+       {
+               "type": "Attack",
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 10,
+                               "duration": 0.2
+                       },
+                       {
+                               "index": 11,
+                               "duration": 0.2
+                       }
+               ]
+       },
+       "StopFiring":
+       {
+               "type": "Attack",
+               "next": "Stand",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 8
+                       },
+                       {
+                               "index": 0
+                       }
+               ]
+       },
+       "KnockedDown":
+       {
+               "type": "Hit",
+               "delay": 0.1,
+               "loop": true,
+               "frames":
+               [
+                       {
+                               "index": 16
+                       },
+                       {
+                               "index": 15
+                       }
+               ]
+       },
+       "Flattened":
+       {
+               "type": "Hit",
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 13
+                       }
+               ]
+       }
  }
  }
diff --git a/data/animations/BigExplosion.json b/data/animations/BigExplosion.json

index a0cb71924a28be0df5e8f4e68cc59781afd65389..32aad034a9d13e7ba72069ec1a55e819a3cbea26 100644 (file)
--- a/data/animations/BigExplosion.json
+++ b/data/animations/BigExplosion.json
@@ -1,26 +1,28 @@
  {
  {
-  "BigExplosion": {
-    "delay": 0.1,
-    "loop": true,
-    "frames": [
-      {
-        "index": 0
-      },
-      {
-        "index": 1
-      },
-      {
-        "index": 2
-      },
-      {
-        "index": 3
-      },
-      {
-        "index": 4
-      },
-      {
-        "index": 5
-      }
-    ]
-  }
+       "BigExplosion":
+       {
+               "delay": 0.1,
+               "loop": true,
+               "frames":
+               [
+                       {
+                               "index": 0
+                       },
+                       {
+                               "index": 1
+                       },
+                       {
+                               "index": 2
+                       },
+                       {
+                               "index": 3
+                       },
+                       {
+                               "index": 4
+                       },
+                       {
+                               "index": 5
+                       }
+               ]
+       }
  }
  }
diff --git a/data/animations/Bonuses.json b/data/animations/Bonuses.json

index 88cacad9c98da076533dd6aa49e1aff717338679..9bd61b750515e227c0aaed960b60ba930710f0bb 100644 (file)
--- a/data/animations/Bonuses.json
+++ b/data/animations/Bonuses.json
@@ -1,134 +1,158 @@
  {
  {
-  "SmallHealth": {
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 0
-      },
-      {
-        "index": 1
-      },
-      {
-        "index": 2
-      },
-      {
-        "index": 1
-      }
-    ]
-  },
-  "LargeHealth": {
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 3
-      },
-      {
-        "index": 4
-      },
-      {
-        "index": 5
-      },
-      {
-        "index": 4
-      }
-    ]
-  },
-  "SmallRedPotion": {
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 6
-      },
-      {
-        "index": 7
-      },
-      {
-        "index": 8
-      },
-      {
-        "index": 7
-      }
-    ]
-  },
-  "SmallBluePotion": {
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 9
-      },
-      {
-        "index": 10
-      },
-      {
-        "index": 11
-      },
-      {
-        "index": 10
-      }
-    ]
-  },
-  "FirstAidKit": {
-    "delay": 1,
-    "frames": [
-      {
-        "index": 12
-      }
-    ]
-  },
-  "AlienFirstAidKit": {
-    "delay": 1,
-    "frames": [
-      {
-        "index": 13
-      }
-    ]
-  },
-  "Cake": {
-    "delay": 1,
-    "frames": [
-      {
-        "index": 14
-      }
-    ]
-  },
-  "FizzyDrink": {
-    "delay": 1,
-    "frames": [
-      {
-        "index": 15
-      }
-    ]
-  },
-  "Cheese": {
-    "delay": 1,
-    "frames": [
-      {
-        "index": 16
-      }
-    ]
-  },
-  "Chocolate": {
-    "delay": 1,
-    "frames": [
-      {
-        "index": 17
-      }
-    ]
-  },
-  "MilkBottle": {
-    "delay": 1,
-    "frames": [
-      {
-        "index": 18
-      }
-    ]
-  },
-  "OneSadCookie": {
-    "delay": 1,
-    "frames": [
-      {
-        "index": 19
-      }
-    ]
-  }
+       "SmallHealth":
+       {
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 0
+                       },
+                       {
+                               "index": 1
+                       },
+                       {
+                               "index": 2
+                       },
+                       {
+                               "index": 1
+                       }
+               ]
+       },
+       "LargeHealth":
+       {
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 3
+                       },
+                       {
+                               "index": 4
+                       },
+                       {
+                               "index": 5
+                       },
+                       {
+                               "index": 4
+                       }
+               ]
+       },
+       "SmallRedPotion":
+       {
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 6
+                       },
+                       {
+                               "index": 7
+                       },
+                       {
+                               "index": 8
+                       },
+                       {
+                               "index": 7
+                       }
+               ]
+       },
+       "SmallBluePotion":
+       {
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 9
+                       },
+                       {
+                               "index": 10
+                       },
+                       {
+                               "index": 11
+                       },
+                       {
+                               "index": 10
+                       }
+               ]
+       },
+       "FirstAidKit":
+       {
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 12
+                       }
+               ]
+       },
+       "AlienFirstAidKit":
+       {
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 13
+                       }
+               ]
+       },
+       "Cake":
+       {
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 14
+                       }
+               ]
+       },
+       "FizzyDrink":
+       {
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 15
+                       }
+               ]
+       },
+       "Cheese":
+       {
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 16
+                       }
+               ]
+       },
+       "Chocolate":
+       {
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 17
+                       }
+               ]
+       },
+       "MilkBottle":
+       {
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 18
+                       }
+               ]
+       },
+       "OneSadCookie":
+       {
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 19
+                       }
+               ]
+       }
  }
  }
diff --git a/data/animations/Bullets.json b/data/animations/Bullets.json

index caca7af4ee5e2bff069d0e758fcb61eea396f9a2..d92428f1300a7c1dc0674abadd70c2dffd5cbd9a 100644 (file)
--- a/data/animations/Bullets.json
+++ b/data/animations/Bullets.json
@@ -1,65 +1,77 @@
  {
  {
-  "Punch": {
-    "delay": 1,
-    "frames": [
-      {
-        "index": 31
-      }
-    ]
-  },
-  "SmallBullet": {
-    "delay": 0.05,
-    "frames": [
-      {
-        "index": 16
-      },
-      {
-        "index": 17
-      }
-    ]
-  },
-  "MediumBullet": {
-    "delay": 0.05,
-    "frames": [
-      {
-        "index": 17
-      },
-      {
-        "index": 18
-      }
-    ]
-  },
-  "SmallFireball": {
-    "delay": 0.05,
-    "frames": [
-      {
-        "index": 0
-      },
-      {
-        "index": 1
-      }
-    ]
-  },
-  "MediumFireball": {
-    "delay": 0.05,
-    "frames": [
-      {
-        "index": 2
-      },
-      {
-        "index": 1
-      }
-    ]
-  },
-  "LargeFireball": {
-    "delay": 0.05,
-    "frames": [
-      {
-        "index": 21
-      },
-      {
-        "index": 2
-      }
-    ]
-  }
+       "Punch":
+       {
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 31
+                       }
+               ]
+       },
+       "SmallBullet":
+       {
+               "delay": 0.05,
+               "frames":
+               [
+                       {
+                               "index": 16
+                       },
+                       {
+                               "index": 17
+                       }
+               ]
+       },
+       "MediumBullet":
+       {
+               "delay": 0.05,
+               "frames":
+               [
+                       {
+                               "index": 17
+                       },
+                       {
+                               "index": 18
+                       }
+               ]
+       },
+       "SmallFireball":
+       {
+               "delay": 0.05,
+               "frames":
+               [
+                       {
+                               "index": 0
+                       },
+                       {
+                               "index": 1
+                       }
+               ]
+       },
+       "MediumFireball":
+       {
+               "delay": 0.05,
+               "frames":
+               [
+                       {
+                               "index": 2
+                       },
+                       {
+                               "index": 1
+                       }
+               ]
+       },
+       "LargeFireball":
+       {
+               "delay": 0.05,
+               "frames":
+               [
+                       {
+                               "index": 21
+                       },
+                       {
+                               "index": 2
+                       }
+               ]
+       }
  }
  }
diff --git a/data/animations/Effects.json b/data/animations/Effects.json

index 35e046422a223861ca0a816bd648ac854e718a6c..03b877fdc45ae2b985b020c20108d604eeb6d983 100644 (file)
--- a/data/animations/Effects.json
+++ b/data/animations/Effects.json
@@ -1,105 +1,115 @@
  {
  {
-  "Fireball": {
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 0
-      },
-      {
-        "index": 1
-      },
-      {
-        "index": 2
-      },
-      {
-        "index": 1
-      },
-      {
-        "index": 0
-      }
-    ]
-  },
-  "Smoke": {
-    "delay": 0.05,
-    "loop": true,
-    "frames": [
-      {
-        "index": 4
-      },
-      {
-        "index": 5
-      },
-      {
-        "index": 6
-      }
-    ]
-  },
-  "GreenDiamond": {
-    "delay": 0.05,
-    "frames": [
-      {
-        "index": 7
-      },
-      {
-        "index": 8
-      },
-      {
-        "index": 9
-      },
-      {
-        "index": 10
-      },
-      {
-        "index": 11
-      }
-    ]
-  },
-  "ChargeParticle": {
-    "delay": 0.03,
-    "loop": true,
-    "frames": [
-      {
-        "index": 12
-      },
-      {
-        "index": 13
-      },
-      {
-        "index": 1
-      },
-      {
-        "index": 3
-      },
-      {
-        "index": 14
-      },
-      {
-        "index": 13
-      },
-      {
-        "index": 12
-      }
-    ]
-  },
-  "Poof": {
-    "delay": 0.05,
-    "loop": true,
-    "frames": [
-      {
-        "index": 23
-      },
-      {
-        "index": 24
-      },
-      {
-        "index": 25
-      },
-      {
-        "index": 26
-      },
-      {
-        "index": 27
-      }
-    ]
-  }
+       "Fireball":
+       {
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 0
+                       },
+                       {
+                               "index": 1
+                       },
+                       {
+                               "index": 2
+                       },
+                       {
+                               "index": 1
+                       },
+                       {
+                               "index": 0
+                       }
+               ]
+       },
+       "Smoke":
+       {
+               "delay": 0.05,
+               "loop": true,
+               "frames":
+               [
+                       {
+                               "index": 4
+                       },
+                       {
+                               "index": 5
+                       },
+                       {
+                               "index": 6
+                       }
+               ]
+       },
+       "GreenDiamond":
+       {
+               "delay": 0.05,
+               "frames":
+               [
+                       {
+                               "index": 7
+                       },
+                       {
+                               "index": 8
+                       },
+                       {
+                               "index": 9
+                       },
+                       {
+                               "index": 10
+                       },
+                       {
+                               "index": 11
+                       }
+               ]
+       },
+       "ChargeParticle":
+       {
+               "delay": 0.03,
+               "loop": true,
+               "frames":
+               [
+                       {
+                               "index": 12
+                       },
+                       {
+                               "index": 13
+                       },
+                       {
+                               "index": 1
+                       },
+                       {
+                               "index": 3
+                       },
+                       {
+                               "index": 14
+                       },
+                       {
+                               "index": 13
+                       },
+                       {
+                               "index": 12
+                       }
+               ]
+       },
+       "Poof":
+       {
+               "delay": 0.05,
+               "loop": true,
+               "frames":
+               [
+                       {
+                               "index": 23
+                       },
+                       {
+                               "index": 24
+                       },
+                       {
+                               "index": 25
+                       },
+                       {
+                               "index": 26
+                       },
+                       {
+                               "index": 27
+                       }
+               ]
+       }
  }
  }
diff --git a/data/animations/Heroine.json b/data/animations/Heroine.json

index 55ffb7daf26d55f5aadd0e1d59d5c7ddfef86212..ca47ea041f7f556989feaae04151e556bee811cc 100644 (file)
--- a/data/animations/Heroine.json
+++ b/data/animations/Heroine.json
@@ -1,253 +1,283 @@
  {
  {
-  "Stand": {
-    "type": "Stand",
-    "delay": 1,
-    "frames": [
-      {
-        "index": 1,
-        "duration": 4
-      },
-      {
-        "index": 3,
-        "duration": 0.1
-      },
-      {
-        "index": 1,
-        "duration": 0.1
-      },
-      {
-        "index": 3,
-        "duration": 0.1
-      },
-      {
-        "index": 1,
-        "duration": 2
-      },
-      {
-        "index": 0,
-        "duration": 2
-      },
-      {
-        "index": 1,
-        "duration": 0.1
-      },
-      {
-        "index": 2,
-        "duration": 2
-      },
-      {
-        "index": 1,
-        "duration": 3
-      },
-      {
-        "index": 3,
-        "duration": 0.1
-      },
-      {
-        "index": 1,
-        "duration": 0.1
-      },
-      {
-        "index": 3,
-        "duration": 0.1
-      },
-      {
-        "index": 1,
-        "duration": 2
-      },
-      {
-        "index": 0,
-        "duration": 4
-      },
-      {
-        "index": 1,
-        "duration": 0.1
-      },
-      {
-        "index": 2,
-        "duration": 3
-      },
-      {
-        "index": 1,
-        "duration": 0.1
-      },
-      {
-        "index": 0,
-        "duration": 1
-      },
-      {
-        "index": 1,
-        "duration": 2
-      },
-      {
-        "index": 3,
-        "duration": 0.1
-      },
-      {
-        "index": 1,
-        "duration": 0.1
-      },
-      {
-        "index": 3,
-        "duration": 0.1
-      }
-    ]
-  },
-  "Blink": {
-    "type": "Stand",
-    "next": "Stand",
-    "delay": 0.25,
-    "frames": [
-      {
-        "index": 3,
-        "duration": 0.25
-      }
-    ]
-  },
-  "Run": {
-    "type": "Run",
-    "delay": 0.25,
-    "frames": [
-      {
-        "index": 4
-      },
-      {
-        "index": 5
-      },
-      {
-        "index": 6
-      },
-      {
-        "index": 7
-      }
-    ]
-  },
-  "StopRunning": {
-    "type": "Stand",
-    "next": "Stand",
-    "delay": 10,
-    "loop": true,
-    "frames": [
-      {
-        "index": 8
-      }
-    ]
-  },
-  "Jump": {
-    "type": "Jump",
-    "next": "FlyDiagonallyUp",
-    "delay": 0.25,
-    "frames": [
-      {
-        "index": 9,
-        "duration": 0.25
-      }
-    ]
-  },
-  "Land": {
-    "type": "Stand",
-    "next": "StopRunning",
-    "delay": 0.5,
-    "frames": [
-      {
-        "index": 9,
-        "duration": 0.25
-      }
-    ]
-  },
-  "FlyDiagonallyUp": {
-    "type": "Fly",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 10
-      },
-      {
-        "index": 11
-      }
-    ]
-  },
-  "FlyDiagonallyDown": {
-    "type": "Fly",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 12
-      },
-      {
-        "index": 13
-      }
-    ]
-  },
-  "FlyStraightUp": {
-    "type": "Fly",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 0
-      }
-    ]
-  },
-  "FlyHorizontally": {
-    "type": "Fly",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 4
-      },
-      {
-        "index": 14
-      }
-    ]
-  },
-  "KnockedDown": {
-    "type": "Hit",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 17
-      },
-      {
-        "index": 18
-      }
-    ]
-  },
-  "Flattened": {
-    "type": "Hit",
-    "delay": 1,
-    "frames": [
-      {
-        "index": 19
-      }
-    ]
-  },
-  "StartCharging": {
-    "type": "Charge",
-    "next": "Charge",
-    "delay": 0.2,
-    "frames": [
-      {
-        "index": 21
-      }
-    ]
-  },
-  "Charge": {
-    "type": "Charge",
-    "delay": 0.2,
-    "loop": true,
-    "frames": [
-      {
-        "index": 22
-      }
-    ]
-  },
-  "FireCharge": {
-    "type": "Charge",
-    "delay": 0.2,
-    "frames": [
-      {
-        "index": 23
-      }
-    ]
-  }
+       "Stand":
+       {
+               "type": "Stand",
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 1,
+                               "duration": 4
+                       },
+                       {
+                               "index": 3,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 1,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 3,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 1,
+                               "duration": 2
+                       },
+                       {
+                               "index": 0,
+                               "duration": 2
+                       },
+                       {
+                               "index": 1,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 2,
+                               "duration": 2
+                       },
+                       {
+                               "index": 1,
+                               "duration": 3
+                       },
+                       {
+                               "index": 3,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 1,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 3,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 1,
+                               "duration": 2
+                       },
+                       {
+                               "index": 0,
+                               "duration": 4
+                       },
+                       {
+                               "index": 1,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 2,
+                               "duration": 3
+                       },
+                       {
+                               "index": 1,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 0,
+                               "duration": 1
+                       },
+                       {
+                               "index": 1,
+                               "duration": 2
+                       },
+                       {
+                               "index": 3,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 1,
+                               "duration": 0.1
+                       },
+                       {
+                               "index": 3,
+                               "duration": 0.1
+                       }
+               ]
+       },
+       "Blink":
+       {
+               "type": "Stand",
+               "next": "Stand",
+               "delay": 0.25,
+               "frames":
+               [
+                       {
+                               "index": 3,
+                               "duration": 0.25
+                       }
+               ]
+       },
+       "Run":
+       {
+               "type": "Run",
+               "delay": 0.25,
+               "frames":
+               [
+                       {
+                               "index": 4
+                       },
+                       {
+                               "index": 5
+                       },
+                       {
+                               "index": 6
+                       },
+                       {
+                               "index": 7
+                       }
+               ]
+       },
+       "StopRunning":
+       {
+               "type": "Stand",
+               "next": "Stand",
+               "delay": 10,
+               "loop": true,
+               "frames":
+               [
+                       {
+                               "index": 8
+                       }
+               ]
+       },
+       "Jump":
+       {
+               "type": "Jump",
+               "next": "FlyDiagonallyUp",
+               "delay": 0.25,
+               "frames":
+               [
+                       {
+                               "index": 9,
+                               "duration": 0.25
+                       }
+               ]
+       },
+       "Land":
+       {
+               "type": "Stand",
+               "next": "StopRunning",
+               "delay": 0.5,
+               "frames":
+               [
+                       {
+                               "index": 9,
+                               "duration": 0.25
+                       }
+               ]
+       },
+       "FlyDiagonallyUp":
+       {
+               "type": "Fly",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 10
+                       },
+                       {
+                               "index": 11
+                       }
+               ]
+       },
+       "FlyDiagonallyDown":
+       {
+               "type": "Fly",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 12
+                       },
+                       {
+                               "index": 13
+                       }
+               ]
+       },
+       "FlyStraightUp":
+       {
+               "type": "Fly",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 0
+                       }
+               ]
+       },
+       "FlyHorizontally":
+       {
+               "type": "Fly",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 4
+                       },
+                       {
+                               "index": 14
+                       }
+               ]
+       },
+       "KnockedDown":
+       {
+               "type": "Hit",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 17
+                       },
+                       {
+                               "index": 18
+                       }
+               ]
+       },
+       "Flattened":
+       {
+               "type": "Hit",
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 19
+                       }
+               ]
+       },
+       "StartCharging":
+       {
+               "type": "Charge",
+               "next": "Charge",
+               "delay": 0.2,
+               "frames":
+               [
+                       {
+                               "index": 21
+                       }
+               ]
+       },
+       "Charge":
+       {
+               "type": "Charge",
+               "delay": 0.2,
+               "loop": true,
+               "frames":
+               [
+                       {
+                               "index": 22
+                       }
+               ]
+       },
+       "FireCharge":
+       {
+               "type": "Charge",
+               "delay": 0.2,
+               "frames":
+               [
+                       {
+                               "index": 23
+                       }
+               ]
+       }
  }
  }
diff --git a/data/animations/Jetbot.json b/data/animations/Jetbot.json

index 240641ac3b8d21411b31233d952227e7371b269b..f5f315220c811554cbafd5476532a080d10a04da 100644 (file)
--- a/data/animations/Jetbot.json
+++ b/data/animations/Jetbot.json
@@ -1,179 +1,209 @@
  {
  {
-  "Stand": {
-    "type": "Stand",
-    "delay": 1,
-    "frames": [
-      {
-        "index": 0,
-        "duration": 2
-      },
-      {
-        "index": 1,
-        "duration": 0.25
-      },
-      {
-        "index": 2,
-        "duration": 2
-      },
-      {
-        "index": 1,
-        "duration": 0.25
-      }
-    ]
-  },
-  "Run": {
-    "type": "Run",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 3
-      },
-      {
-        "index": 4
-      }
-    ]
-  },
-  "StopRunning": {
-    "type": "Stand",
-    "next": "Stand",
-    "delay": 10,
-    "loop": true,
-    "frames": [
-      {
-        "index": 6
-      }
-    ]
-  },
-  "Jump": {
-    "type": "Jump",
-    "next": "FlyDiagonallyUp",
-    "delay": 0.25,
-    "frames": [
-      {
-        "index": 6
-      }
-    ]
-  },
-  "Land": {
-    "type": "Stand",
-    "next": "Stand",
-    "delay": 1,
-    "loop": true,
-    "frames": [
-      {
-        "index": 6,
-        "duration": 0.25
-      },
-      {
-        "index": 0,
-        "duration": 0.25
-      }
-    ]
-  },
-  "FlyDiagonallyUp": {
-    "type": "Fly",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 3
-      },
-      {
-        "index": 4
-      }
-    ]
-  },
-  "FlyDiagonallyDown": {
-    "type": "Fly",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 3
-      },
-      {
-        "index": 4
-      }
-    ]
-  },
-  "FlyStraightUp": {
-    "type": "Fly",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 3
-      },
-      {
-        "index": 4
-      }
-    ]
-  },
-  "FlyHorizontally": {
-    "type": "Fly",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 3
-      },
-      {
-        "index": 4
-      }
-    ]
-  },
-  "Punch": {
-    "type": "Attack",
-    "next": "Stand",
-    "delay": 0.05,
-    "frames": [
-      {
-        "index": 3
-      }
-    ]
-  },
-  "StartFiring": {
-    "type": "Attack",
-    "next": "Fire",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 3
-      }
-    ]
-  },
-  "Fire": {
-    "type": "Attack",
-    "delay": 1,
-    "frames": [
-      {
-        "index": 3,
-        "duration": 0.2
-      }
-    ]
-  },
-  "StopFiring": {
-    "type": "Attack",
-    "next": "Stand",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 3
-      }
-    ]
-  },
-  "KnockedDown": {
-    "type": "Hit",
-    "delay": 1,
-    "frames": [
-      {
-        "index": 5
-      }
-    ]
-  },
-  "Flattened": {
-    "type": "Hit",
-    "delay": 1,
-    "frames": [
-      {
-        "index": 6
-      }
-    ]
-  }
+       "Stand":
+       {
+               "type": "Stand",
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 0,
+                               "duration": 2
+                       },
+                       {
+                               "index": 1,
+                               "duration": 0.25
+                       },
+                       {
+                               "index": 2,
+                               "duration": 2
+                       },
+                       {
+                               "index": 1,
+                               "duration": 0.25
+                       }
+               ]
+       },
+       "Run":
+       {
+               "type": "Run",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 3
+                       },
+                       {
+                               "index": 4
+                       }
+               ]
+       },
+       "StopRunning":
+       {
+               "type": "Stand",
+               "next": "Stand",
+               "delay": 10,
+               "loop": true,
+               "frames":
+               [
+                       {
+                               "index": 6
+                       }
+               ]
+       },
+       "Jump":
+       {
+               "type": "Jump",
+               "next": "FlyDiagonallyUp",
+               "delay": 0.25,
+               "frames":
+               [
+                       {
+                               "index": 6
+                       }
+               ]
+       },
+       "Land":
+       {
+               "type": "Stand",
+               "next": "Stand",
+               "delay": 1,
+               "loop": true,
+               "frames":
+               [
+                       {
+                               "index": 6,
+                               "duration": 0.25
+                       },
+                       {
+                               "index": 0,
+                               "duration": 0.25
+                       }
+               ]
+       },
+       "FlyDiagonallyUp":
+       {
+               "type": "Fly",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 3
+                       },
+                       {
+                               "index": 4
+                       }
+               ]
+       },
+       "FlyDiagonallyDown":
+       {
+               "type": "Fly",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 3
+                       },
+                       {
+                               "index": 4
+                       }
+               ]
+       },
+       "FlyStraightUp":
+       {
+               "type": "Fly",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 3
+                       },
+                       {
+                               "index": 4
+                       }
+               ]
+       },
+       "FlyHorizontally":
+       {
+               "type": "Fly",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 3
+                       },
+                       {
+                               "index": 4
+                       }
+               ]
+       },
+       "Punch":
+       {
+               "type": "Attack",
+               "next": "Stand",
+               "delay": 0.05,
+               "frames":
+               [
+                       {
+                               "index": 3
+                       }
+               ]
+       },
+       "StartFiring":
+       {
+               "type": "Attack",
+               "next": "Fire",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 3
+                       }
+               ]
+       },
+       "Fire":
+       {
+               "type": "Attack",
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 3,
+                               "duration": 0.2
+                       }
+               ]
+       },
+       "StopFiring":
+       {
+               "type": "Attack",
+               "next": "Stand",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 3
+                       }
+               ]
+       },
+       "KnockedDown":
+       {
+               "type": "Hit",
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 5
+                       }
+               ]
+       },
+       "Flattened":
+       {
+               "type": "Hit",
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 6
+                       }
+               ]
+       }
  }
  }
diff --git a/data/animations/RobotTrooper.json b/data/animations/RobotTrooper.json

index ed68a9b2337c7175d93539c3090b0c3428d123bd..fcdf57958b3661d16e0b2d9b84c6e050d43d19dc 100644 (file)
--- a/data/animations/RobotTrooper.json
+++ b/data/animations/RobotTrooper.json
@@ -1,203 +1,233 @@
  {
  {
-  "Stand": {
-    "type": "Stand",
-    "delay": 1,
-    "frames": [
-      {
-        "index": 0,
-        "duration": 2
-      },
-      {
-        "index": 1,
-        "duration": 0.25
-      },
-      {
-        "index": 2,
-        "duration": 2
-      },
-      {
-        "index": 1,
-        "duration": 0.25
-      }
-    ]
-  },
-  "Run": {
-    "type": "Run",
-    "delay": 0.25,
-    "frames": [
-      {
-        "index": 4
-      },
-      {
-        "index": 5
-      },
-      {
-        "index": 6
-      },
-      {
-        "index": 7
-      }
-    ]
-  },
-  "StopRunning": {
-    "type": "Stand",
-    "next": "Stand",
-    "delay": 10,
-    "loop": true,
-    "frames": [
-      {
-        "index": 5
-      }
-    ]
-  },
-  "Jump": {
-    "type": "Jump",
-    "next": "FlyDiagonallyUp",
-    "delay": 0.25,
-    "frames": [
-      {
-        "index": 17
-      }
-    ]
-  },
-  "Land": {
-    "type": "Stand",
-    "next": "Stand",
-    "delay": 1,
-    "loop": true,
-    "frames": [
-      {
-        "index": 19,
-        "duration": 0.25
-      },
-      {
-        "index": 14,
-        "duration": 0.25
-      }
-    ]
-  },
-  "FlyDiagonallyUp": {
-    "type": "Fly",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 18
-      }
-    ]
-  },
-  "FlyDiagonallyDown": {
-    "type": "Fly",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 18
-      }
-    ]
-  },
-  "FlyStraightUp": {
-    "type": "Fly",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 18
-      }
-    ]
-  },
-  "FlyHorizontally": {
-    "type": "Fly",
-    "frames": [
-      {
-        "index": 18
-      }
-    ]
-  },
-  "Punch": {
-    "type": "Attack",
-    "next": "Stand",
-    "delay": 0.05,
-    "frames": [
-      {
-        "index": 8
-      },
-      {
-        "index": 9
-      },
-      {
-        "index": 10
-      },
-      {
-        "index": 11
-      },
-      {
-        "index": 12
-      },
-      {
-        "index": 13
-      }
-    ]
-  },
-  "StartFiring": {
-    "type": "Attack",
-    "next": "Fire",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 14
-      },
-      {
-        "index": 15
-      },
-      {
-        "index": 16
-      }
-    ]
-  },
-  "Fire": {
-    "type": "Attack",
-    "delay": 1,
-    "frames": [
-      {
-        "index": 17,
-        "duration": 0.2
-      },
-      {
-        "index": 16,
-        "duration": 0.2
-      }
-    ]
-  },
-  "StopFiring": {
-    "type": "Attack",
-    "next": "Stand",
-    "delay": 0.1,
-    "frames": [
-      {
-        "index": 16
-      },
-      {
-        "index": 15
-      },
-      {
-        "index": 14
-      }
-    ]
-  },
-  "KnockedDown": {
-    "type": "Hit",
-    "delay": 1,
-    "frames": [
-      {
-        "index": 18
-      }
-    ]
-  },
-  "Flattened": {
-    "type": "Hit",
-    "delay": 1,
-    "frames": [
-      {
-        "index": 19
-      }
-    ]
-  }
+       "Stand":
+       {
+               "type": "Stand",
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 0,
+                               "duration": 2
+                       },
+                       {
+                               "index": 1,
+                               "duration": 0.25
+                       },
+                       {
+                               "index": 2,
+                               "duration": 2
+                       },
+                       {
+                               "index": 1,
+                               "duration": 0.25
+                       }
+               ]
+       },
+       "Run":
+       {
+               "type": "Run",
+               "delay": 0.25,
+               "frames":
+               [
+                       {
+                               "index": 4
+                       },
+                       {
+                               "index": 5
+                       },
+                       {
+                               "index": 6
+                       },
+                       {
+                               "index": 7
+                       }
+               ]
+       },
+       "StopRunning":
+       {
+               "type": "Stand",
+               "next": "Stand",
+               "delay": 10,
+               "loop": true,
+               "frames":
+               [
+                       {
+                               "index": 5
+                       }
+               ]
+       },
+       "Jump":
+       {
+               "type": "Jump",
+               "next": "FlyDiagonallyUp",
+               "delay": 0.25,
+               "frames":
+               [
+                       {
+                               "index": 17
+                       }
+               ]
+       },
+       "Land":
+       {
+               "type": "Stand",
+               "next": "Stand",
+               "delay": 1,
+               "loop": true,
+               "frames":
+               [
+                       {
+                               "index": 19,
+                               "duration": 0.25
+                       },
+                       {
+                               "index": 14,
+                               "duration": 0.25
+                       }
+               ]
+       },
+       "FlyDiagonallyUp":
+       {
+               "type": "Fly",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 18
+                       }
+               ]
+       },
+       "FlyDiagonallyDown":
+       {
+               "type": "Fly",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 18
+                       }
+               ]
+       },
+       "FlyStraightUp":
+       {
+               "type": "Fly",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 18
+                       }
+               ]
+       },
+       "FlyHorizontally":
+       {
+               "type": "Fly",
+               "frames":
+               [
+                       {
+                               "index": 18
+                       }
+               ]
+       },
+       "Punch":
+       {
+               "type": "Attack",
+               "next": "Stand",
+               "delay": 0.05,
+               "frames":
+               [
+                       {
+                               "index": 8
+                       },
+                       {
+                               "index": 9
+                       },
+                       {
+                               "index": 10
+                       },
+                       {
+                               "index": 11
+                       },
+                       {
+                               "index": 12
+                       },
+                       {
+                               "index": 13
+                       }
+               ]
+       },
+       "StartFiring":
+       {
+               "type": "Attack",
+               "next": "Fire",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 14
+                       },
+                       {
+                               "index": 15
+                       },
+                       {
+                               "index": 16
+                       }
+               ]
+       },
+       "Fire":
+       {
+               "type": "Attack",
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 17,
+                               "duration": 0.2
+                       },
+                       {
+                               "index": 16,
+                               "duration": 0.2
+                       }
+               ]
+       },
+       "StopFiring":
+       {
+               "type": "Attack",
+               "next": "Stand",
+               "delay": 0.1,
+               "frames":
+               [
+                       {
+                               "index": 16
+                       },
+                       {
+                               "index": 15
+                       },
+                       {
+                               "index": 14
+                       }
+               ]
+       },
+       "KnockedDown":
+       {
+               "type": "Hit",
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 18
+                       }
+               ]
+       },
+       "Flattened":
+       {
+               "type": "Hit",
+               "delay": 1,
+               "frames":
+               [
+                       {
+                               "index": 19
+                       }
+               ]
+       }
  }
  }
diff --git a/data/tilemaps/AlienWarrior.json b/data/tilemaps/AlienWarrior.json

index 471fed43677adf1cb485aa584992f254f6f31b36..b1e409d11f6f72e8b63b9071cee8ee9e5f0abf46 100644 (file)
--- a/data/tilemaps/AlienWarrior.json
+++ b/data/tilemaps/AlienWarrior.json
@@ -1,6 +1,6 @@
  {
  {
-       "TilesU": 8,
-       "TilesV": 4,
-       "MinFilter": Nearest,
-       "MagFilter": Nearest
+       "tiles_s": 8,
+       "tiles_t": 4,
+       "min_filter": "nearest",
+       "mag_filter": "nearest"
  }
  }
diff --git a/data/tilemaps/BackgroundFar.json b/data/tilemaps/BackgroundFar.json

index 8780beaac1289fccb9dd9c2efc1dc12e2485400a..564692b2e83564e881e8132eb69945e1d602e170 100644 (file)
--- a/data/tilemaps/BackgroundFar.json
+++ b/data/tilemaps/BackgroundFar.json
@@ -1,8 +1,8 @@
  {
  {
-       "TilesU": 1,
-       "TilesV": 1,
-       "MinFilter": "Linear",
-       "MagFilter": "Linear",
-       "WrapU": "Clamp",
-       "WrapV": "Clamp"
+       "tiles_s": 1,
+       "tiles_t": 1,
+       "min_filter": "linear",
+       "mag_filter": "linear",
+       "wrap_s": "clamp",
+       "wrap_t": "clamp"
  }
  }
diff --git a/data/tilemaps/BackgroundNear.json b/data/tilemaps/BackgroundNear.json

index 2ae063742ae42b8decbfa5e3915372b0771cd68f..c6bb637b235954c69b43e9411e4148d3551184d8 100644 (file)
--- a/data/tilemaps/BackgroundNear.json
+++ b/data/tilemaps/BackgroundNear.json
@@ -1,8 +1,8 @@
  {
  {
-       "TilesU": 1,
-       "TilesV": 1,
-       "MinFilter": "Linear",
-       "MagFilter": "Linear",
-       "WrapU": "Repeat",
-       "WrapV": "Repeat"
+       "tiles_s": 1,
+       "tiles_t": 1,
+       "min_filter": "linear",
+       "mag_filter": "linear",
+       "wrap_s": "repeat",
+       "wrap_t": "repeat"
  }
  }
diff --git a/data/tilemaps/BigExplosion.json b/data/tilemaps/BigExplosion.json

index b57a190ac6414db328508b638be35fc2138cc801..3913ad4dcde4b8347e35ccbc0704cd53e14da8a1 100644 (file)
--- a/data/tilemaps/BigExplosion.json
+++ b/data/tilemaps/BigExplosion.json
@@ -1,8 +1,8 @@
  {
  {
-       "TilesU": 8,
-       "TilesV": 1,
-       "MinFilter": "Linear",
-       "MagFilter": "Linear",
-       "WrapU": "Clamp",
-       "WrapV": "Clamp"
+       "tiles_s": 8,
+       "tiles_t": 1,
+       "min_filter": "nearest",
+       "mag_filter": "nearest",
+       "wrap_s": "clamp",
+       "wrap_t": "clamp"
  }
  }
diff --git a/data/tilemaps/Bonuses.json b/data/tilemaps/Bonuses.json

index 5c024d5ca7557d4c1fc013108400b6028319ab94..e5ac533b7a6e03bea119dbfa9a42ece21730696e 100644 (file)
--- a/data/tilemaps/Bonuses.json
+++ b/data/tilemaps/Bonuses.json
@@ -1,8 +1,8 @@
  {
  {
-       "TilesU": 8,
-       "TilesV": 4,
-       "MinFilter": "Linear",
-       "MagFilter": "Linear",
-       "WrapU": "Clamp",
-       "WrapV": "Clamp"
+       "tiles_s": 8,
+       "tiles_t": 4,
+       "min_filter": "nearest",
+       "mag_filter": "nearest",
+       "wrap_s": "clamp",
+       "wrap_t": "clamp"
  }
  }
diff --git a/data/tilemaps/Building.json b/data/tilemaps/Building.json

index ebc6842f4d27de4222c0854dcaa927d8df41afbc..e5ac533b7a6e03bea119dbfa9a42ece21730696e 100644 (file)
--- a/data/tilemaps/Building.json
+++ b/data/tilemaps/Building.json
@@ -1,8 +1,8 @@
  {
  {
-       "TilesU": 8,
-       "TilesV": 4,
-       "MinFilter": "Nearest",
-       "MagFilter": "Nearest",
-       "WrapU": "Clamp",
-       "WrapV": "Clamp"
+       "tiles_s": 8,
+       "tiles_t": 4,
+       "min_filter": "nearest",
+       "mag_filter": "nearest",
+       "wrap_s": "clamp",
+       "wrap_t": "clamp"
  }
  }
diff --git a/data/tilemaps/Font.json b/data/tilemaps/Font.json

index 8b1214b83ffd948a6a3b6d4014b03bb76aa76e38..57a341c802f29101cd8c3baa8f572ea0ae8491fc 100644 (file)
--- a/data/tilemaps/Font.json
+++ b/data/tilemaps/Font.json
@@ -1,6 +1,6 @@
  {
  {
-       "TilesU": 8,
-       "TilesV": 8,
-       "MinFilter": "Nearest",
-       "MagFilter": "Nearest"
+       "tiles_s": 8,
+       "tiles_t": 8,
+       "min_filter": "nearest",
+       "mag_filter": "nearest"
  }
  }
diff --git a/data/tilemaps/Heroine.json b/data/tilemaps/Heroine.json

index 3420a10389cc2228a3426a107772c0a67f1175fe..b1e409d11f6f72e8b63b9071cee8ee9e5f0abf46 100644 (file)
--- a/data/tilemaps/Heroine.json
+++ b/data/tilemaps/Heroine.json
@@ -1,6 +1,6 @@
  {
  {
-       "TilesU": 8,
-       "TilesV": 4,
-       "MinFilter": "Nearest",
-       "MagFilter": "Nearest"
+       "tiles_s": 8,
+       "tiles_t": 4,
+       "min_filter": "nearest",
+       "mag_filter": "nearest"
  }
  }
diff --git a/data/tilemaps/Jetbot.json b/data/tilemaps/Jetbot.json

index 52af3b06bd5c85f73831fbf4f7586cfe74869463..bf95ae622283b268db94e8fd82fb5d80195414e4 100644 (file)
--- a/data/tilemaps/Jetbot.json
+++ b/data/tilemaps/Jetbot.json
@@ -1,6 +1,6 @@
  {
  {
-       "TilesU": 4,
-       "TilesV": 2,
-       "MinFilter": "Nearest",
-       "MagFilter": "Nearest"
+       "tiles_s": 4,
+       "tiles_t": 2,
+       "min_filter": "nearest",
+       "mag_filter": "nearest"
  }
  }
diff --git a/data/tilemaps/Particles.json b/data/tilemaps/Particles.json

index 5c024d5ca7557d4c1fc013108400b6028319ab94..e5ac533b7a6e03bea119dbfa9a42ece21730696e 100644 (file)
--- a/data/tilemaps/Particles.json
+++ b/data/tilemaps/Particles.json
@@ -1,8 +1,8 @@
  {
  {
-       "TilesU": 8,
-       "TilesV": 4,
-       "MinFilter": "Linear",
-       "MagFilter": "Linear",
-       "WrapU": "Clamp",
-       "WrapV": "Clamp"
+       "tiles_s": 8,
+       "tiles_t": 4,
+       "min_filter": "nearest",
+       "mag_filter": "nearest",
+       "wrap_s": "clamp",
+       "wrap_t": "clamp"
  }
  }
diff --git a/data/tilemaps/RobotTrooper.json b/data/tilemaps/RobotTrooper.json

index 3420a10389cc2228a3426a107772c0a67f1175fe..b1e409d11f6f72e8b63b9071cee8ee9e5f0abf46 100644 (file)
--- a/data/tilemaps/RobotTrooper.json
+++ b/data/tilemaps/RobotTrooper.json
@@ -1,6 +1,6 @@
  {
  {
-       "TilesU": 8,
-       "TilesV": 4,
-       "MinFilter": "Nearest",
-       "MagFilter": "Nearest"
+       "tiles_s": 8,
+       "tiles_t": 4,
+       "min_filter": "nearest",
+       "mag_filter": "nearest"
  }
  }
diff --git a/data/tilemaps/Scenery.json b/data/tilemaps/Scenery.json

index 83339cf551640cdfb222d4baf76500970c6704de..ac6f951d4a9b5baa27e1dd56e6d801cf7212c280 100644 (file)
--- a/data/tilemaps/Scenery.json
+++ b/data/tilemaps/Scenery.json
@@ -1,8 +1,8 @@
  {
  {
-       "TilesU": 4,
-       "TilesV": 4,
-       "MinFilter": "Linear",
-       "MagFilter": "Linear",
-       "WrapU": "Repeat",
-       "WrapV": "Repeat"
+       "tiles_s": 4,
+       "tiles_t": 4,
+       "min_filter": "nearest",
+       "mag_filter": "nearest",
+       "wrap_s": "repeat",
+       "wrap_t": "repeat"
  }
  }
diff --git a/data/tilemaps/StatusBars.json b/data/tilemaps/StatusBars.json

index 01b5ed01c298bc04bab2d0dc6839a8f23259063e..1ff8dcdac88d1af058adec99f1c83a99bbf34349 100644 (file)
--- a/data/tilemaps/StatusBars.json
+++ b/data/tilemaps/StatusBars.json
@@ -1,6 +1,6 @@
  {
  {
-       "TilesU": 4,
-       "TilesV": 1,
-       "MinFilter": "Nearest",
-       "MagFilter": "Nearest"
+       "tiles_s": 4,
+       "tiles_t": 1,
+       "min_filter": "nearest",
+       "mag_filter": "nearest"
  }
  }
diff --git a/data/tilemaps/TowerBlock1.json b/data/tilemaps/TowerBlock1.json

index 98e7587a4a84df5d5d751c769a107edaf4e4666d..1dbed9ecb4c4594993903f0610a869a3952d6dbf 100644 (file)
--- a/data/tilemaps/TowerBlock1.json
+++ b/data/tilemaps/TowerBlock1.json
@@ -1,8 +1,8 @@
  {
  {
-       "TilesU": 4,
-       "TilesV": 4,
-       "MinFilter": "Linear",
-       "MagFilter": "Linear",
-       "WrapU": "Clamp",
-       "WrapV": "Clamp"
+       "tiles_s": 4,
+       "tiles_t": 4,
+       "min_filter": "nearest",
+       "mag_filter": "nearest",
+       "wrap_s": "clamp",
+       "wrap_t": "clamp"
  }
  }
diff --git a/data/tilemaps/Trees.json b/data/tilemaps/Trees.json

index 247ec97500055d3edead3c1b00fa920bf5a55354..b2090e58a6a917fc748332df9d90eace74a503bc 100644 (file)
--- a/data/tilemaps/Trees.json
+++ b/data/tilemaps/Trees.json
@@ -1,8 +1,8 @@
  {
  {
-       "TilesU": 2,
-       "TilesV": 1,
-       "MinFilter": "Linear",
-       "MagFilter": "Linear",
-       "WrapU": "Clamp",
-       "WrapV": "Clamp"
+       "tiles_s": 2,
+       "tiles_t": 1,
+       "min_filter": "nearest",
+       "mag_filter": "nearest",
+       "wrap_s": "clamp",
+       "wrap_t": "clamp"
  }
  }
diff --git a/data/yoinkrc b/data/yoinkrc

index 102848be7ada9c71c84c191eed8c0bd18bbd4841..2faf40dc6bf0d0f2313f1bbaa35405f9cb88331d 100644 (file)
--- a/data/yoinkrc
+++ b/data/yoinkrc
@@ -1,16 +1,16 @@
  /* C-style comments are allowed. */
  {
  /* C-style comments are allowed. */
  {
-       "video.fullscreen": false,
-       "video.resizable": true,
-       "video.mode": [800, 600],
+       "engine.timestep": 0.01,
+       "input.grab": false,
         "video.colorbuffers": [8, 8, 8, 8],
         "video.colorbuffers": [8, 8, 8, 8],
-       "video.multisamplebuffers": 6,
-       "video.multisamplesamples": 6,
         "video.cursor": true,
         "video.cursor": true,
-       "input.grab": false,
         "video.doublebuffer": true,
         "video.doublebuffer": true,
-       "video.swapcontrol": true,
+       "video.fullscreen": false,
         "video.maxfps": 45,
         "video.maxfps": 45,
-       "video.printfps": true,
-       "engine.timestep": 0.01
+       "video.mode": [800, 600],
+       "video.multisamplebuffers": 6,
+       "video.multisamplesamples": 6,
+       "video.resizable": true,
+       //"video.printfps": true,
+       "video.swapcontrol": true
  }
  }
diff --git a/doc/yoink.6.in b/doc/yoink.6.in

index c5eec633ed774b9fce72558e549db4137670ff1b..e712ef24ddb2f845297b50d42901ef62fabdeb5a 100644 (file)
--- a/doc/yoink.6.in
+++ b/doc/yoink.6.in
@@ -131,6 +131,10 @@ to an array with numbers 1024 and 768.  The video size will be 1024x768.
  .PP
  Here is a list of some of the options available:
  .TP
  .PP
  Here is a list of some of the options available:
  .TP
+.B engine.rngseed
+The number value used as a seed for the random number generator.  Set this to
+make the game more predictable.  This is typically only useful for debugging.
+.TP
  .B engine.timestep
  The amount of time in seconds between each update of the physics state.  A value
  of 0.01 or lower is ideal for accurate physics approximations.  Values that are
  .B engine.timestep
  The amount of time in seconds between each update of the physics state.  A value
  of 0.01 or lower is ideal for accurate physics approximations.  Values that are
@@ -277,11 +281,10 @@ option.
  .br
  .SH BUGS
  .PP
  .br
  .SH BUGS
  .PP
-No sound yet.  The original game never had sound, but it would probably be a
-good idea.
+No sound yet.
  .PP
  .PP
-The pixelated graphics are actually intentional.  It adds to the charm of the
-game, don't you think?
+The pixelated graphics are actually intentional.  It adds to the old school
+charm of the game, don't you think?
  .PP
  Send bug reports, patches, and love notes to:
  .br
  .PP
  Send bug reports, patches, and love notes to:
  .br
@@ -289,5 +292,5 @@ Charles McGarvey <onefriedrice@brokenzipper.com>
  .SH AUTHOR
  .PP
  Neil Carter was the original creator of Yoink, his winning entry in the
  .SH AUTHOR
  .PP
  Neil Carter was the original creator of Yoink, his winning entry in the
-uDevGames 2003 Mac game development contest.  Charles McGarvey rewrote the game
-with SDL and is the current maintainer.
+uDevGames 2003 Mac game development contest.  Charles McGarvey restored the game
+and is the current maintainer.
diff --git a/extra/yoink.ebuild b/extra/yoink.ebuild

index 16a430c807aa287bcc39741d5b3c91a476f4e40c..76e15145cb15e8aae4d28405dd7f84bcfba9f2cd 100644 (file)
--- a/extra/yoink.ebuild
+++ b/extra/yoink.ebuild
@@ -15,7 +15,8 @@ KEYWORDS="~amd64 ~ppc ~x86"
  IUSE="debug"
  
  RDEPEND="media-libs/libsdl[opengl]
  IUSE="debug"
  
  RDEPEND="media-libs/libsdl[opengl]
-       media-libs/sdl-image[png]"
+       media-libs/sdl-image[png]
+       virtual/opengl"
  DEPEND="${RDEPEND}
         dev-util/pkgconfig"
  
  DEPEND="${RDEPEND}
         dev-util/pkgconfig"
  
diff --git a/src/Character.hh b/src/Character.hh

index b1965ce7dd129076ff82b3af3484ae3599157270..2894c5ebcd35f0591840b9cf33a6514a915358f4 100644 (file)
--- a/src/Character.hh
+++ b/src/Character.hh
@@ -50,13 +50,6 @@ public:
         Mf::Tilemap& getTilemap();
         Mf::Animation& getAnimation();
  
         Mf::Tilemap& getTilemap();
         Mf::Animation& getAnimation();
  
-
-       struct Exception : public std::runtime_error
-       {
-               explicit Exception(const std::string& what_arg) :
-                       std::runtime_error(what_arg) {}
-       };
-
  private:
         Mf::Tilemap tilemap;
         Mf::Animation animation;
  private:
         Mf::Tilemap tilemap;
         Mf::Animation animation;
diff --git a/src/Makefile.am b/src/Makefile.am

index 9ea7843df9b375f79ce8107849035dc6b7ccb408..0826767c3f359dc3102789f2ae163466d5212491 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,8 +5,10 @@ libmoof_la_SOURCES = \
                                    Moof/Aabb.hh \
                                    Moof/Animation.cc \
                                    Moof/Animation.hh \
                                    Moof/Aabb.hh \
                                    Moof/Animation.cc \
                                    Moof/Animation.hh \
+                                  Moof/Camera.hh \
                                    Moof/ConvertUTF.c \
                                    Moof/ConvertUTF.h \
                                    Moof/ConvertUTF.c \
                                    Moof/ConvertUTF.h \
+                                  Moof/Cullable.hh \
                                    Moof/Deserializer.cc \
                                    Moof/Deserializer.hh \
                                    Moof/Dispatcher.cc \
                                    Moof/Deserializer.cc \
                                    Moof/Deserializer.hh \
                                    Moof/Dispatcher.cc \
@@ -18,6 +20,7 @@ libmoof_la_SOURCES = \
                                    Moof/Interpolator.hh \
                                    Moof/Math.hh \
                                    Moof/Mippleton.hh \
                                    Moof/Interpolator.hh \
                                    Moof/Math.hh \
                                    Moof/Mippleton.hh \
+                                  Moof/OpenGL.cc \
                                    Moof/OpenGL.hh \
                                    Moof/Profiler.hh \
                                    Moof/Random.cc \
                                    Moof/OpenGL.hh \
                                    Moof/Profiler.hh \
                                    Moof/Random.cc \
diff --git a/src/Moof/Engine.cc b/src/Moof/Engine.cc

index bcc336c1244f1f8b0a8ed041507c4b5f3e0f7834..be8ca5fac61e184f0b54a0da244355e5b33e89a2 100644 (file)
--- a/src/Moof/Engine.cc
+++ b/src/Moof/Engine.cc
@@ -28,7 +28,6 @@
  
  #include <cstdlib>                     // exit
  #include <iostream>
  
  #include <cstdlib>                     // exit
  #include <iostream>
-#include <stdexcept>
  #include <string>
  
  #include <SDL/SDL.h>
  #include <string>
  
  #include <SDL/SDL.h>
@@ -48,26 +47,32 @@ namespace Mf {
  class Engine::EngineImpl
  {
  public:
  class Engine::EngineImpl
  {
  public:
-       EngineImpl(const std::string& name, int argc, char* argv[],
-                       const std::string& configFile, Engine* outer) :
-               settings(argc, argv),
-               interface(outer)
+       EngineImpl(int argc, char* argv[], const std::string& configFile,
+                       const std::string& name, const std::string& iconFile,
+                       Engine* outer) :
+               interface(outer),
+               settings(argc, argv)
         {
                 if (SDL_Init(SDL_INIT_EVERYTHING | SDL_INIT_EVENTTHREAD) != 0)
                 {
         {
                 if (SDL_Init(SDL_INIT_EVERYTHING | SDL_INIT_EVENTTHREAD) != 0)
                 {
-                       throw std::runtime_error(SDL_GetError());
+                       throw Exception(SDL_GetError());
                 }
                 if (FE_Init() != 0)
                 {
                 }
                 if (FE_Init() != 0)
                 {
-                       throw std::runtime_error(FE_GetError());
+                       throw Exception(FE_GetError());
                 }
  
                 }
  
-               setSeed();
-
                 settings.loadFromFile(configFile);
  
                 settings.loadFromFile(configFile);
  
-               video = VideoPtr(new Video(name));
-               video->makeActive();
+               long randomSeed;
+               if (settings.get("engine.rngseed", randomSeed))
+               {
+                       setSeed(randomSeed);
+               }
+               else
+               {
+                       setSeed();
+               }
  
                 double ts = 0.01;
                 settings.get("engine.timestep", ts);
  
                 double ts = 0.01;
                 settings.get("engine.timestep", ts);
@@ -79,11 +84,14 @@ public:
  
                 printFps = false;
                 settings.get("video.printfps", printFps);
  
                 printFps = false;
                 settings.get("video.printfps", printFps);
+
+               video = VideoPtr(new Video(name, iconFile));
+               video->makeActive();
         }
  
         ~EngineImpl()
         {
         }
  
         ~EngineImpl()
         {
-               // The video object must be destroyed before we can shutdown SDL.
+               // the video object must be destroyed before we can shutdown SDL
                 video.reset();
  
                 FE_Quit();
                 video.reset();
  
                 FE_Quit();
@@ -201,6 +209,8 @@ public:
         }
  
  
         }
  
  
+       Engine*         interface;
+
         Settings        settings;
         Dispatcher      dispatcher;
         VideoPtr        video;
         Settings        settings;
         Dispatcher      dispatcher;
         VideoPtr        video;
@@ -212,14 +222,13 @@ public:
  
         long            fps;
         bool            printFps;
  
         long            fps;
         bool            printFps;
-
-       Engine*         interface;
  };
  
  
  };
  
  
-Engine::Engine(const std::string& name, int argc, char* argv[],
-               const std::string& configFile) :
-       impl_(new Engine::EngineImpl(name, argc, argv, configFile, this)) {}
+Engine::Engine(int argc, char* argv[], const std::string& configFile,
+               const std::string& name, const std::string& iconFile) :
+       impl_(new Engine::EngineImpl(argc, argv, configFile, name, iconFile, this))
+{}
  
  Engine::~Engine() {}
  
  
  Engine::~Engine() {}
  
diff --git a/src/Moof/Engine.hh b/src/Moof/Engine.hh

index 112b87ea8dba3ea07f8d1cbefe5407003e045b4e..2d7dfd6aa77b9ee56ebb591f7e7954c15b69875a 100644 (file)
--- a/src/Moof/Engine.hh
+++ b/src/Moof/Engine.hh
@@ -29,6 +29,8 @@
  #ifndef _MOOF_ENGINE_HH_
  #define _MOOF_ENGINE_HH_
  
  #ifndef _MOOF_ENGINE_HH_
  #define _MOOF_ENGINE_HH_
  
+#include <stdexcept>
+
  #include <boost/shared_ptr.hpp>
  
  #include <Moof/Dispatcher.hh>
  #include <boost/shared_ptr.hpp>
  
  #include <Moof/Dispatcher.hh>
@@ -46,8 +48,8 @@ class Video;
  class Engine : public Singleton<Engine>
  {
  public:
  class Engine : public Singleton<Engine>
  {
  public:
-       Engine(const std::string& name, int argc, char* argv[],
-                       const std::string& configFile);
+       Engine(int argc, char* argv[], const std::string& configFile,
+                       const std::string& name, const std::string& iconFile);
         virtual ~Engine();
  
         int run();
         virtual ~Engine();
  
         int run();
@@ -66,6 +68,12 @@ public:
         virtual void draw(Scalar alpha);
         virtual void handleEvent(const Event& event);
  
         virtual void draw(Scalar alpha);
         virtual void handleEvent(const Event& event);
  
+       struct Exception : std::runtime_error
+       {
+               explicit Exception(const std::string& what_arg) :
+                       std::runtime_error(what_arg) {}
+       };
+
  private:
         class EngineImpl;
         boost::shared_ptr<EngineImpl> impl_;
  private:
         class EngineImpl;
         boost::shared_ptr<EngineImpl> impl_;
diff --git a/src/Moof/Math.hh b/src/Moof/Math.hh

index 563746e380e5b38fc347f856b3cebd6b3b63c2bd..c4e3484ebebc56b5bad7e05cee6c13f9ef657557 100644 (file)
--- a/src/Moof/Math.hh
+++ b/src/Moof/Math.hh
@@ -37,27 +37,28 @@
  #include <cmath>
  #include <cml/cml.h>
  
  #include <cmath>
  #include <cml/cml.h>
  
-
-namespace Mf {
+#include <Moof/OpenGL.hh>              // GLscalar
  
  
  
  
-// Basic types.
+namespace Mf {
  
  
-typedef float                          Scalar;                         ///< Scalar type.
  
  
-typedef cml::vector2f          Vector2;
-typedef cml::vector3f          Vector3;
-typedef cml::vector4f          Vector4;
+typedef GLscalar                                                               Scalar;
  
  
-typedef cml::matrix33f_c       Matrix3;
-typedef cml::matrix44f_c       Matrix4;
+typedef cml::vector< Scalar, cml::fixed<2> >   Vector2;
+typedef cml::vector< Scalar, cml::fixed<3> >   Vector3;
+typedef cml::vector< Scalar, cml::fixed<4> >   Vector4;
  
  
-typedef cml::quaternionf_p     Quaternion;
+typedef cml::matrix< Scalar, cml::fixed<3,3>,
+               cml::col_basis, cml::col_major >                Matrix3;
+typedef cml::matrix< Scalar, cml::fixed<4,4>,
+               cml::col_basis, cml::col_major >                Matrix4;
  
  
-typedef Vector4                                Color;
+typedef cml::quaternion< Scalar, cml::fixed<>, cml::vector_first,
+               cml::positive_cross >                                   Quaternion;
  
  
  
  
-const Scalar EPSILON = 0.000001f;
+const Scalar EPSILON = 0.000001;
  
  /**
   * Check the equality of scalars with a certain degree of error allowed.
  
  /**
   * Check the equality of scalars with a certain degree of error allowed.
diff --git a/src/Moof/OpenGL.cc b/src/Moof/OpenGL.cc

new file mode 100644 (file)

index 0000000..6f223d1
--- /dev/null
+++ b/src/Moof/OpenGL.cc
@@ -0,0 +1,70 @@
+
+/*******************************************************************************
+
+ Copyright (c) 2009, Charles McGarvey
+ All rights reserved.
+ 
+ Redistribution   and   use  in  source  and  binary  forms,  with  or  without
+ modification, are permitted provided that the following conditions are met:
+ 
+   * Redistributions  of  source  code  must retain the above copyright notice,
+     this list of conditions and the following disclaimer.
+   * Redistributions  in binary form must reproduce the above copyright notice,
+     this  list of conditions and the following disclaimer in the documentation
+     and/or other materials provided with the distribution.
+ 
+ THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "OpenGL.hh"
+
+
+#if USE_DOUBLE_PRECISION
+
+void (*glLoadMatrix)(const GLscalar*)(glLoadMatrixd);
+void (*glMultMatrix)(const GLscalar*)(glMultMatrixd);
+
+void (*glColor3)(GLscalar, GLscalar, GLscalar)(glColor3d);
+void (*glColor4)(GLscalar, GLscalar, GLscalar, GLscalar)(glColor4d);
+void (*glColor3v)(const GLscalar*)(glColor3dv);
+void (*glColor4v)(const GLscalar*)(glColor4dv);
+
+void (*glVertex2)(GLscalar, GLscalar)(glVertex2d);
+void (*glVertex3)(GLscalar, GLscalar, GLscalar)(glVertex3d);
+void (*glVertex4)(GLscalar, GLscalar, GLscalar, GLscalar)(glVertex4d);
+void (*glVertex2v)(const GLscalar*)(glVertex2dv);
+void (*glVertex3v)(const GLscalar*)(glVertex3dv);
+void (*glVertex4v)(const GLscalar*)(glVertex4dv);
+
+#else
+
+void (*glLoadMatrix)(const GLscalar*)(glLoadMatrixf);
+void (*glMultMatrix)(const GLscalar*)(glMultMatrixf);
+
+void (*glVertex2)(GLscalar, GLscalar)(glVertex2f);
+void (*glVertex3)(GLscalar, GLscalar, GLscalar)(glVertex3f);
+void (*glVertex4)(GLscalar, GLscalar, GLscalar, GLscalar)(glVertex4f);
+void (*glVertex2v)(const GLscalar*)(glVertex2fv);
+void (*glVertex3v)(const GLscalar*)(glVertex3fv);
+void (*glVertex4v)(const GLscalar*)(glVertex4fv);
+
+void (*glColor3)(GLscalar, GLscalar, GLscalar)(glColor3f);
+void (*glColor4)(GLscalar, GLscalar, GLscalar, GLscalar)(glColor4f);
+void (*glColor3v)(const GLscalar*)(glColor3fv);
+void (*glColor4v)(const GLscalar*)(glColor4fv);
+
+#endif
+
+
+/** vim: set ts=4 sw=4 tw=80: *************************************************/
+
diff --git a/src/Moof/OpenGL.hh b/src/Moof/OpenGL.hh

index 0e793f6ded9c6db37b4954db0f47856b4064567c..6db55ce98f6314f89ece1a0fc5056a2772824dcd 100644 (file)
--- a/src/Moof/OpenGL.hh
+++ b/src/Moof/OpenGL.hh
@@ -31,6 +31,40 @@
  
  #include <SDL/SDL_opengl.h>
  
  
  #include <SDL/SDL_opengl.h>
  
+
+/* Define to 1 if you want to use double precision floating-point numbers. */
+#define USE_DOUBLE_PRECISION 1 
+
+
+#if USE_DOUBLE_PRECISION
+
+typedef GLdouble       GLscalar;
+#define GL_SCALAR      GL_DOUBLE
+
+#else
+
+typedef GLfloat                GLscalar;
+#define GL_SCALAR      GL_FLOAT
+
+#endif
+
+
+extern void (*glLoadMatrix)(const GLscalar*);
+extern void (*glMultMatrix)(const GLscalar*);
+
+extern void (*glColor3)(GLscalar, GLscalar, GLscalar);
+extern void (*glColor4)(GLscalar, GLscalar, GLscalar, GLscalar);
+extern void (*glColor3v)(const GLscalar*);
+extern void (*glColor4v)(const GLscalar*);
+
+extern void (*glVertex2)(GLscalar, GLscalar);
+extern void (*glVertex3)(GLscalar, GLscalar, GLscalar);
+extern void (*glVertex4)(GLscalar, GLscalar, GLscalar, GLscalar);
+extern void (*glVertex2v)(const GLscalar*);
+extern void (*glVertex3v)(const GLscalar*);
+extern void (*glVertex4v)(const GLscalar*);
+
+
  #endif // _MOOF_OPENGL_HH_
  
  /** vim: set ts=4 sw=4 tw=80: *************************************************/
  #endif // _MOOF_OPENGL_HH_
  
  /** vim: set ts=4 sw=4 tw=80: *************************************************/
diff --git a/src/Moof/Scene.cc b/src/Moof/Scene.cc

index f4dd1c0e3f9597bdd7505ed236bd3d91591fc40c..5f4a440c4ce0d06655afe62ed06de1b9b1d456db 100644 (file)
--- a/src/Moof/Scene.cc
+++ b/src/Moof/Scene.cc
@@ -123,7 +123,7 @@ class Scene::SceneImpl : public Mippleton<SceneImpl>
                         glPushMatrix();
                         //std::cout << "transforming..." << std::endl;
                         //std::cout << transformation << std::endl;
                         glPushMatrix();
                         //std::cout << "transforming..." << std::endl;
                         //std::cout << transformation << std::endl;
-                       glMultMatrixf(transformation.data());
+                       glMultMatrix(transformation.data());
  
                         glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
                         image.bind();
  
                         glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
                         image.bind();
@@ -143,13 +143,13 @@ class Scene::SceneImpl : public Mippleton<SceneImpl>
                                         {
                                                 glBegin(GL_TRIANGLE_FAN);
                                                         glTexCoord2f(texCoords[0], texCoords[1]);
                                         {
                                                 glBegin(GL_TRIANGLE_FAN);
                                                         glTexCoord2f(texCoords[0], texCoords[1]);
-                                                       glVertex3f(xf, yf, 0.0f);
+                                                       glVertex2f(xf, yf);
                                                         glTexCoord2f(texCoords[2], texCoords[3]);
                                                         glTexCoord2f(texCoords[2], texCoords[3]);
-                                                       glVertex3f(xf+1.0, yf, 0.0f);
+                                                       glVertex2f(xf+1.0, yf);
                                                         glTexCoord2f(texCoords[4], texCoords[5]);
                                                         glTexCoord2f(texCoords[4], texCoords[5]);
-                                                       glVertex3f(xf+1.0, yf+1.0, 0.0f);
+                                                       glVertex2f(xf+1.0, yf+1.0);
                                                         glTexCoord2f(texCoords[6], texCoords[7]);
                                                         glTexCoord2f(texCoords[6], texCoords[7]);
-                                                       glVertex3f(xf, yf+1.0, 0.0f);
+                                                       glVertex2f(xf, yf+1.0);
                                                 glEnd();
                                         }
                                 }
                                                 glEnd();
                                         }
                                 }
@@ -174,7 +174,8 @@ class Scene::SceneImpl : public Mippleton<SceneImpl>
                 Billboard(const Matrix4& transform, const std::string& textureName,
                                 SerializablePtr root) :
                         Scenery(transform, textureName),
                 Billboard(const Matrix4& transform, const std::string& textureName,
                                 SerializablePtr root) :
                         Scenery(transform, textureName),
-                       index(0)
+                       index(0),
+                       uScale(1)
                 {
                         std::map<std::string,SerializablePtr> rootObj;
  
                 {
                         std::map<std::string,SerializablePtr> rootObj;
  
@@ -190,6 +191,10 @@ class Scene::SceneImpl : public Mippleton<SceneImpl>
                                                 index = Tilemap::Index(value);
                                         }
                                 }
                                                 index = Tilemap::Index(value);
                                         }
                                 }
+                               if ((it = rootObj.find("u_scale")) != rootObj.end())
+                               {
+                                       (*it).second->get(uScale);
+                               }
                         }
  
                         image.getTileCoords(index, texCoords);
                         }
  
                         image.getTileCoords(index, texCoords);
@@ -198,21 +203,28 @@ class Scene::SceneImpl : public Mippleton<SceneImpl>
                 void draw(Scalar alpha)
                 {
                         glPushMatrix();
                 void draw(Scalar alpha)
                 {
                         glPushMatrix();
-                       glMultMatrixf(transformation.data());
+                       glMultMatrix(transformation.data());
  
                         glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
                         image.bind();
  
  
                         glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
                         image.bind();
  
+                       float increment = 1.0f / float(uScale);
+                       int x;
+                       float xf;
+
+                       for (x = 0, xf = 0.0f; x < uScale; x++, xf += increment)
+                       {
                         glBegin(GL_TRIANGLE_FAN);
                                 glTexCoord2f(texCoords[0], texCoords[1]);
                         glBegin(GL_TRIANGLE_FAN);
                                 glTexCoord2f(texCoords[0], texCoords[1]);
-                               glVertex2f(0.0f, 0.0f);
+                               glVertex2f(xf, 0.0f);
                                 glTexCoord2f(texCoords[2], texCoords[3]);
                                 glTexCoord2f(texCoords[2], texCoords[3]);
-                               glVertex2f(1.0f, 0.0f);
+                               glVertex2f(xf+increment, 0.0f);
                                 glTexCoord2f(texCoords[4], texCoords[5]);
                                 glTexCoord2f(texCoords[4], texCoords[5]);
-                               glVertex2f(1.0f, 1.0f);
+                               glVertex2f(xf+increment, 1.0f);
                                 glTexCoord2f(texCoords[6], texCoords[7]);
                                 glTexCoord2f(texCoords[6], texCoords[7]);
-                               glVertex2f(0.0f, 1.0f);
+                               glVertex2f(xf, 1.0f);
                         glEnd();
                         glEnd();
+                       }
  
                         glPopMatrix();
                 }
  
                         glPopMatrix();
                 }
@@ -225,6 +237,7 @@ class Scene::SceneImpl : public Mippleton<SceneImpl>
         private:
                 Tilemap::Index  index;
                 Scalar                  texCoords[8];
         private:
                 Tilemap::Index  index;
                 Scalar                  texCoords[8];
+               long                    uScale;
         };
  
  
         };
  
  
diff --git a/src/Moof/Settings.cc b/src/Moof/Settings.cc

index d13302d729234f2f7c6aa5710646dae82cf8a53b..ccf690af65e395f93142a08eb891cde8e7a31c77 100644 (file)
--- a/src/Moof/Settings.cc
+++ b/src/Moof/Settings.cc
@@ -100,13 +100,13 @@ void Settings::loadFromFiles(const std::vector<std::string>& filePaths,
                         boost::replace_first(path, "$HOME", home);
                 }
  
                         boost::replace_first(path, "$HOME", home);
                 }
  
-               Deserializer deserializer(*it, true);
-
-               std::cout << "Looking for a config file at " << path << std::endl;
                 try
                 {
                 try
                 {
+                       Deserializer deserializer(*it, true);
+
                         SerializablePtr obj = deserializer.deserialize();
                         std::map<std::string,SerializablePtr> map;
                         SerializablePtr obj = deserializer.deserialize();
                         std::map<std::string,SerializablePtr> map;
+
                         if (obj && obj->get(map))
                         {
                                 if (!precedence)
                         if (obj && obj->get(map))
                         {
                                 if (!precedence)
diff --git a/src/Moof/Texture.cc b/src/Moof/Texture.cc

index 44a0b423719d6dfbb10c1be2ae98630a97c6e05c..8bd3c4a3ae00a16657d670fe55620f48b0c99af0 100644 (file)
--- a/src/Moof/Texture.cc
+++ b/src/Moof/Texture.cc
@@ -26,7 +26,7 @@
  
  *******************************************************************************/
  
  
  *******************************************************************************/
  
-#include <cstdlib>
+#include <cstring>             // memcpy
  
  #include <boost/bind.hpp>
  
  
  #include <boost/bind.hpp>
  
@@ -62,20 +62,25 @@ class Texture::TextureImpl : public Mippleton<TextureImpl>
         {
                 if (object_)
                 {
         {
                 if (object_)
                 {
+                       if (object_ == globalObject_)
+                       {
+                               globalObject_ = 0;
+                       }
+
                         glDeleteTextures(1, &object_);
                         object_ = 0;
                 }
         }
  
         /**
                         glDeleteTextures(1, &object_);
                         object_ = 0;
                 }
         }
  
         /**
-        * If the GL context was recreated, we probably need to reload the texture.
-        * This may involve reading it from disk again, but hopefully the OS was
-        * smart enough to cache it if the client has plenty of RAM.
+        * If the GL context was recreated, we need to reload the texture.  This may
+        * involve reading it from disk again, but hopefully the OS was smart enough
+        * to cache it if the client has plenty of RAM.
          */
  
         void contextRecreated(const Notification& note)
         {
          */
  
         void contextRecreated(const Notification& note)
         {
-               unloadFromGL();
+               object_ = globalObject_ = 0;
                 uploadToGL();
         }
  
                 uploadToGL();
         }
  
@@ -95,6 +100,29 @@ class Texture::TextureImpl : public Mippleton<TextureImpl>
                 return value;
         }
  
                 return value;
         }
  
+
+       static void flipSurface(SDL_Surface* image)
+       {
+               unsigned char*  pixels = (Uint8*)(image->pixels);
+
+               unsigned                pitch = image->pitch;
+               unsigned char   line[pitch];
+
+               int             yBegin = 0;
+               int             yEnd = image->h - 1;
+
+               if (SDL_MUSTLOCK(image)) SDL_LockSurface(image);
+               while (yBegin < yEnd)
+               {
+                       memcpy(line,                    pixels + pitch * yBegin, pitch);
+                       memcpy(pixels + pitch * yBegin, pixels + pitch * yEnd,   pitch);
+                       memcpy(pixels + pitch * yEnd,   line,                    pitch);
+                       yBegin++;
+                       yEnd--;
+               }
+               if (SDL_MUSTLOCK(image)) SDL_UnlockSurface(image);
+       }
+
  public:
  
         /**
  public:
  
         /**
@@ -103,16 +131,17 @@ public:
  
         explicit TextureImpl(const std::string& name) :
                 Mippleton<TextureImpl>(name),
  
         explicit TextureImpl(const std::string& name) :
                 Mippleton<TextureImpl>(name),
+               surface_(0),
                 width_(0),
                 height_(0),
                 mode_(0),
                 minFilter_(GL_NEAREST),
                 width_(0),
                 height_(0),
                 mode_(0),
                 minFilter_(GL_NEAREST),
-               maxFilter_(GL_NEAREST),
-               wrapU_(GL_CLAMP),
-               wrapV_(GL_CLAMP),
+               magFilter_(GL_NEAREST),
+               wrapS_(GL_CLAMP),
+               wrapT_(GL_CLAMP),
                 object_(0)
         {
                 object_(0)
         {
-               uploadToGL();
+               loadFromFile();
  
                 // we want to know when the GL context is recreated
                 Dispatcher::instance().addHandler("video.context_recreated",
  
                 // we want to know when the GL context is recreated
                 Dispatcher::instance().addHandler("video.context_recreated",
@@ -121,6 +150,11 @@ public:
  
         ~TextureImpl()
         {
  
         ~TextureImpl()
         {
+               if (surface_)
+               {
+                       SDL_FreeSurface(surface_);
+               }
+
                 unloadFromGL();
  
                 Dispatcher::instance().removeHandler(this);
                 unloadFromGL();
  
                 Dispatcher::instance().removeHandler(this);
@@ -139,10 +173,15 @@ public:
                 int w = powerOfTwo(surface->w);
                 int h = powerOfTwo(surface->h);
  
                 int w = powerOfTwo(surface->w);
                 int h = powerOfTwo(surface->h);
  
+               // 2. OpenGL textures make more sense within the coordinate system when
+               // they are "upside down," so let's flip it.
+
+               flipSurface(surface);
+
                 // 1. OpenGL images must (generally) have dimensions of a power-of-two.
                 // If this one doesn't, we can at least be more friendly by expanding
                 // the dimensions so that they are, though there will be some empty
                 // 1. OpenGL images must (generally) have dimensions of a power-of-two.
                 // If this one doesn't, we can at least be more friendly by expanding
                 // the dimensions so that they are, though there will be some empty
-               // space within the range of normal texture coordinates.  It's better of
+               // space within the range of normal texture coordinates.  It's better if
                 // textures are the right size to begin with.
  
                 SDL_Surface* image = SDL_CreateRGBSurface
                 // textures are the right size to begin with.
  
                 SDL_Surface* image = SDL_CreateRGBSurface
@@ -151,14 +190,14 @@ public:
                         w, h,
                         32,
  #if SDL_BYTEORDER == SDL_LIL_ENDIAN
                         w, h,
                         32,
  #if SDL_BYTEORDER == SDL_LIL_ENDIAN
-                       0x000000FF, 
-                       0x0000FF00, 
-                       0x00FF0000, 
+                       0x000000FF,
+                       0x0000FF00,
+                       0x00FF0000,
                         0xFF000000
  #else
                         0xFF000000,
                         0xFF000000
  #else
                         0xFF000000,
-                       0x00FF0000, 
-                       0x0000FF00, 
+                       0x00FF0000,
+                       0x0000FF00,
                         0x000000FF
  #endif
                 );
                         0x000000FF
  #endif
                 );
@@ -187,27 +226,6 @@ public:
                         SDL_SetAlpha(surface, savedFlags, savedAlpha);
                 }
  
                         SDL_SetAlpha(surface, savedFlags, savedAlpha);
                 }
  
-               // 2. OpenGL textures make more sense within the coordinate system when
-               // they are "upside down," so let's flip it.
-
-               Uint8 line[image->pitch];
-
-               Uint8 *pixels = static_cast<Uint8*>(image->pixels);
-               Uint16 pitch = image->pitch;
-               int ybegin = 0;
-               int yend = image->h - 1;
-
-               if (SDL_MUSTLOCK(image)) SDL_LockSurface(image);
-               while (ybegin < yend)
-               {
-                       memcpy(line, pixels + pitch * ybegin, pitch);
-                       memcpy(pixels + pitch * ybegin, pixels + pitch * yend, pitch);
-                       memcpy(pixels + pitch * yend, line, pitch);
-                       ybegin++;
-                       yend--;
-               }
-               if (SDL_MUSTLOCK(image)) SDL_UnlockSurface(image);
-
                 return image;
         }
  
                 return image;
         }
  
@@ -217,7 +235,7 @@ public:
          * @return Image data.
          */
  
          * @return Image data.
          */
  
-       SDL_Surface* loadImageData()
+       void loadFromFile()
         {
                 SDL_Surface* surface;
  
         {
                 SDL_Surface* surface;
  
@@ -225,7 +243,7 @@ public:
  
                 if (!surface)
                 {
  
                 if (!surface)
                 {
-                       throw Texture::Exception("loading failed");
+                       throw Texture::Exception("loading from file failed");
                 }
  
                 SDL_Surface* temp = prepareImageForGL(surface);
                 }
  
                 SDL_Surface* temp = prepareImageForGL(surface);
@@ -233,7 +251,7 @@ public:
  
                 if (!temp)
                 {
  
                 if (!temp)
                 {
-                       throw Texture::Exception("image couldn't be prepared for GL");
+                       throw Texture::Exception("uploading to opengl failed");
                 }
  
                 if (temp->format->BytesPerPixel == 3)
                 }
  
                 if (temp->format->BytesPerPixel == 3)
@@ -247,13 +265,13 @@ public:
                 else
                 {
                         SDL_FreeSurface(temp);
                 else
                 {
                         SDL_FreeSurface(temp);
-                       throw Texture::Exception("image is not the required 24 or 32 bpp");
+                       throw Texture::Exception("incompatible color mode");
                 }
  
                 width_ = temp->w;
                 height_ = temp->h;
  
                 }
  
                 width_ = temp->w;
                 height_ = temp->h;
  
-               return temp;
+               surface_ = temp;
         }
  
  
         }
  
  
@@ -266,11 +284,11 @@ public:
         {
                 if (object_)
                 {
         {
                 if (object_)
                 {
-                       // Already loaded.
+                       // already loaded
                         return;
                 }
  
                         return;
                 }
  
-               SDL_Surface* imageData = loadImageData();
+               if (!surface_) loadFromFile();
  
                 glGenTextures(1, &object_);
                 glBindTexture(GL_TEXTURE_2D, object_);
  
                 glGenTextures(1, &object_);
                 glBindTexture(GL_TEXTURE_2D, object_);
@@ -280,17 +298,18 @@ public:
                         GL_TEXTURE_2D,
                         0,
                         mode_,
                         GL_TEXTURE_2D,
                         0,
                         mode_,
-                       imageData->w,
-                       imageData->h,
+                       surface_->w,
+                       surface_->h,
                         0,
                         mode_,
                         GL_UNSIGNED_BYTE,
                         0,
                         mode_,
                         GL_UNSIGNED_BYTE,
-                       imageData->pixels
+                       surface_->pixels
                 );
  
                 setProperties();
  
                 );
  
                 setProperties();
  
-               SDL_FreeSurface(imageData);
+               SDL_FreeSurface(surface_);
+               surface_ = 0;
         }
  
  
         }
  
  
@@ -302,23 +321,70 @@ public:
         void setProperties()
         {
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, minFilter_);
         void setProperties()
         {
                 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, minFilter_);
-               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, maxFilter_);
-               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrapU_);
-               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrapV_);
+               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, magFilter_);
+               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrapS_);
+               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrapT_);
         }
  
         }
  
+       inline void setMinFilter(GLuint filter)
+       {
+               bind();
+               minFilter_ = filter;
+               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, minFilter_);
+       }
+
+       inline void setMagFilter(GLuint filter)
+       {
+               bind();
+               magFilter_ = filter;
+               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, magFilter_);
+       }
+
+       inline void setWrapS(GLuint wrap)
+       {
+               bind();
+               wrapS_ = wrap;
+               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, wrapS_);
+       }
  
  
-       unsigned        width_;                 ///< Horizontal dimension of the image.
-       unsigned        height_;                ///< Vertical dimension.
+       inline void setWrapT(GLuint wrap)
+       {
+               bind();
+               wrapT_ = wrap;
+               glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, wrapT_);
+       }
  
  
-       GLuint          mode_;                  ///< Depth of the image, GL_RGB or GL_RGBA.
-       GLuint          minFilter_;             ///< Filter.
-       GLuint          maxFilter_;             ///< Filter.
-       GLuint          wrapU_;                 ///< Wrapping behavior horizontally.
-       GLuint          wrapV_;                 ///< Wrapping behavior vertically.
-       GLuint          object_;                ///< GL texture handle.
+
+       inline void bind()
+       {
+               if (object_ == 0)
+               {
+                       uploadToGL();
+               }
+               if (object_ != globalObject_)
+               {
+                       glBindTexture(GL_TEXTURE_2D, object_);
+                       globalObject_ = object_;
+               }
+       }
+
+
+       SDL_Surface*    surface_;
+       unsigned                width_;                 ///< Horizontal dimension of the image.
+       unsigned                height_;                ///< Vertical dimension.
+
+       GLuint                  mode_;                  ///< Depth of the image, GL_RGB or GL_RGBA.
+       GLuint                  minFilter_;             ///< Minifcation filter.
+       GLuint                  magFilter_;             ///< Magnification filter.
+       GLuint                  wrapS_;                 ///< Wrapping behavior horizontally.
+       GLuint                  wrapT_;                 ///< Wrapping behavior vertically.
+
+       GLuint                  object_;                ///< GL texture handle.
+       static GLuint   globalObject_;  ///< Global GL texture handle.
  };
  
  };
  
+GLuint Texture::TextureImpl::globalObject_ = 0;
+
  
  Texture::Texture(const std::string& name) :
         // pass through
  
  Texture::Texture(const std::string& name) :
         // pass through
@@ -332,7 +398,8 @@ Texture::Texture(const std::string& name) :
  
  void Texture::bind()
  {
  
  void Texture::bind()
  {
-       glBindTexture(GL_TEXTURE_2D, getObject());
+       // pass through
+       impl_->bind();
  }
  
  
  }
  
  
@@ -362,36 +429,32 @@ unsigned Texture::getHeight()
  
  void Texture::setMinFilter(GLuint filter)
  {
  
  void Texture::setMinFilter(GLuint filter)
  {
-       impl_->minFilter_ = filter;
-}
-
-void Texture::setMaxFilter(GLuint filter)
-{
-       impl_->maxFilter_ = filter;
+       // pass through
+       impl_->setMinFilter(filter);
  }
  
  }
  
-void Texture::setWrapU(GLuint wrap)
+void Texture::setMagFilter(GLuint filter)
  {
  {
-       impl_->wrapU_ = wrap;
+       // pass through
+       impl_->setMagFilter(filter);
  }
  
  }
  
-void Texture::setWrapV(GLuint wrap)
+void Texture::setWrapS(GLuint wrap)
  {
  {
-       impl_->wrapV_ = wrap;
+       // pass through
+       impl_->setWrapS(wrap);
  }
  
  }
  
-
-void Texture::applyChanges()
+void Texture::setWrapT(GLuint wrap)
  {
  {
-       bind();
-       impl_->setProperties();
+       // pass through
+       impl_->setWrapT(wrap);
  }
  
  
  std::string Texture::getPathToResource(const std::string& name)
  {
  }
  
  
  std::string Texture::getPathToResource(const std::string& name)
  {
-       // TODO since this is a generic library class, more than PNG should be
-       // supported
+       // TODO named resources must be png for now
         return Resource::getPathToResource("textures/" + name + ".png");
  }
  
         return Resource::getPathToResource("textures/" + name + ".png");
  }
  
diff --git a/src/Moof/Texture.hh b/src/Moof/Texture.hh

index e858093e1a44afa06b44d50dcc5eac80503855e7..2ab4710cf55202dfd986808b820812be5b5fe5cf 100644 (file)
--- a/src/Moof/Texture.hh
+++ b/src/Moof/Texture.hh
@@ -38,8 +38,8 @@
  
  #include <boost/shared_ptr.hpp>
  
  
  #include <boost/shared_ptr.hpp>
  
-#include <Moof/Resource.hh>
  #include <Moof/OpenGL.hh>
  #include <Moof/OpenGL.hh>
+#include <Moof/Resource.hh>
  
  
  namespace Mf {
  
  
  namespace Mf {
@@ -57,11 +57,9 @@ public:
         unsigned getHeight();
  
         void setMinFilter(GLuint filter);
         unsigned getHeight();
  
         void setMinFilter(GLuint filter);
-       void setMaxFilter(GLuint filter);
-       void setWrapU(GLuint wrap);
-       void setWrapV(GLuint wrap);
-
-       void applyChanges();
+       void setMagFilter(GLuint filter);
+       void setWrapS(GLuint wrap);
+       void setWrapT(GLuint wrap);
  
         static std::string getPathToResource(const std::string& name);
  
  
         static std::string getPathToResource(const std::string& name);
  
diff --git a/src/Moof/Tilemap.cc b/src/Moof/Tilemap.cc

index 6accbd167d3b3fc638cf0443ee1facd59fb84fdd..1bfbfbcb9796e9b257970070b6243f2299a3b5eb 100644 (file)
--- a/src/Moof/Tilemap.cc
+++ b/src/Moof/Tilemap.cc
@@ -38,15 +38,51 @@ namespace Mf {
  
  class Tilemap::TilemapImpl : public Mippleton<TilemapImpl>
  {
  
  class Tilemap::TilemapImpl : public Mippleton<TilemapImpl>
  {
+       static GLint filterFromString(const std::string& filter)
+       {
+               if (filter == "linear")
+               {
+                       return GL_LINEAR;
+               }
+               else if (filter == "nearest_mipmap_nearest")
+               {
+                       return GL_NEAREST_MIPMAP_NEAREST;
+               }
+               else if (filter == "nearest_mipmap_linear")
+               {
+                       return GL_NEAREST_MIPMAP_LINEAR;
+               }
+               else if (filter == "linear_mipmap_nearest")
+               {
+                       return GL_LINEAR_MIPMAP_NEAREST;
+               }
+               else if (filter == "linear_mipmap_linear")
+               {
+                       return GL_LINEAR_MIPMAP_LINEAR;
+               }
+
+               return GL_NEAREST;
+       }
+
+       static GLint wrapFromString(const std::string& wrap)
+       {
+               if (wrap == "repeat")
+               {
+                       return GL_REPEAT;
+               }
+
+               return GL_CLAMP;
+       }
+
  public:
         TilemapImpl(const std::string& name) :
                 Mippleton<TilemapImpl>(name),
  public:
         TilemapImpl(const std::string& name) :
                 Mippleton<TilemapImpl>(name),
-               tilesU_(1),
-               tilesV_(1),
+               magFilter_(GL_NEAREST),
                 minFilter_(GL_NEAREST),
                 minFilter_(GL_NEAREST),
-               maxFilter_(GL_NEAREST),
-               wrapU_(GL_CLAMP),
-               wrapV_(GL_CLAMP)
+               nTilesS_(1),
+               nTilesT_(1),
+               wrapS_(GL_CLAMP),
+               wrapT_(GL_CLAMP)
         {
                 loadFromFile();
         }
         {
                 loadFromFile();
         }
@@ -65,76 +101,64 @@ public:
                         {
                                 std::map<std::string,SerializablePtr>::iterator it;
  
                         {
                                 std::map<std::string,SerializablePtr>::iterator it;
  
-                               if ((it = rootObj.find("TilesU")) != rootObj.end())
+                               if ((it = rootObj.find("tiles_s")) != rootObj.end())
                                 {
                                         long value;
                                         if ((*it).second->get(value))
                                         {
                                 {
                                         long value;
                                         if ((*it).second->get(value))
                                         {
-                                               tilesU_ = unsigned(value);
+                                               nTilesS_ = unsigned(value);
                                         }
                                 }
                                         }
                                 }
-                               if ((it = rootObj.find("TilesV")) != rootObj.end())
+                               if ((it = rootObj.find("tiles_t")) != rootObj.end())
                                 {
                                         long value;
                                         if ((*it).second->get(value))
                                         {
                                 {
                                         long value;
                                         if ((*it).second->get(value))
                                         {
-                                               tilesV_ = unsigned(value);
+                                               nTilesT_ = unsigned(value);
                                         }
                                 }
                                         }
                                 }
-                               if ((it = rootObj.find("MinFilter")) != rootObj.end())
+                               if ((it = rootObj.find("min_filter")) != rootObj.end())
                                 {
                                         std::string value;
                                         if ((*it).second->get(value))
                                         {
                                 {
                                         std::string value;
                                         if ((*it).second->get(value))
                                         {
-                                               if (value == "Linear")
-                                               {
-                                                       minFilter_ = GL_LINEAR;
-                                               }
+                                               minFilter_ = filterFromString(value);
                                         }
                                 }
                                         }
                                 }
-                               if ((it = rootObj.find("MaxFilter")) != rootObj.end())
+                               if ((it = rootObj.find("mag_filter")) != rootObj.end())
                                 {
                                         std::string value;
                                         if ((*it).second->get(value))
                                         {
                                 {
                                         std::string value;
                                         if ((*it).second->get(value))
                                         {
-                                               if (value == "Linear")
-                                               {
-                                                       maxFilter_ = GL_LINEAR;
-                                               }
+                                               magFilter_ = filterFromString(value);
                                         }
                                 }
                                         }
                                 }
-                               if ((it = rootObj.find("WrapU")) != rootObj.end())
+                               if ((it = rootObj.find("wrap_s")) != rootObj.end())
                                 {
                                         std::string value;
                                         if ((*it).second->get(value))
                                         {
                                 {
                                         std::string value;
                                         if ((*it).second->get(value))
                                         {
-                                               if (value == "Repeat")
-                                               {
-                                                       wrapU_ = GL_REPEAT;
-                                               }
+                                               wrapS_ = wrapFromString(value);
                                         }
                                 }
                                         }
                                 }
-                               if ((it = rootObj.find("WrapV")) != rootObj.end())
+                               if ((it = rootObj.find("wrap_t")) != rootObj.end())
                                 {
                                         std::string value;
                                         if ((*it).second->get(value))
                                         {
                                 {
                                         std::string value;
                                         if ((*it).second->get(value))
                                         {
-                                               if (value == "Repeat")
-                                               {
-                                                       wrapV_ = GL_REPEAT;
-                                               }
+                                               wrapT_ = wrapFromString(value);
                                         }
                                 }
                         }
                 }
         }
  
                                         }
                                 }
                         }
                 }
         }
  
-       unsigned        tilesU_;
-       unsigned        tilesV_;
+       GLuint          magFilter_;
         GLuint          minFilter_;
         GLuint          minFilter_;
-       GLuint          maxFilter_;
-       GLuint          wrapU_;
-       GLuint          wrapV_;
+       unsigned        nTilesS_;
+       unsigned        nTilesT_;
+       GLuint          wrapS_;
+       GLuint          wrapT_;
  };
  
  
  };
  
  
@@ -142,25 +166,26 @@ Tilemap::Tilemap(const std::string& name) :
         Texture(name),
         impl_(Tilemap::TilemapImpl::retain(name), &Tilemap::TilemapImpl::release)
  {
         Texture(name),
         impl_(Tilemap::TilemapImpl::retain(name), &Tilemap::TilemapImpl::release)
  {
+       bind();
+
         setMinFilter(impl_->minFilter_);
         setMinFilter(impl_->minFilter_);
-       setMaxFilter(impl_->maxFilter_);
-       setWrapU(impl_->wrapU_);
-       setWrapV(impl_->wrapV_);
-       applyChanges();
+       setMagFilter(impl_->magFilter_);
+       setWrapS(impl_->wrapS_);
+       setWrapT(impl_->wrapT_);
  }
  
  
  bool Tilemap::getTileCoords(unsigned index, Scalar coords[8])
  {
         // make sure the index represents a real tile
  }
  
  
  bool Tilemap::getTileCoords(unsigned index, Scalar coords[8])
  {
         // make sure the index represents a real tile
-       if (index >= impl_->tilesU_ * impl_->tilesV_) return false;
+       if (index >= impl_->nTilesS_ * impl_->nTilesT_) return false;
  
  
-       Scalar w = 1.0 / Scalar(impl_->tilesU_);
-       Scalar h = 1.0 / Scalar(impl_->tilesV_);
+       Scalar w = 1.0 / Scalar(impl_->nTilesS_);
+       Scalar h = 1.0 / Scalar(impl_->nTilesT_);
  
  
-       coords[0] = Scalar(index % impl_->tilesU_) * w;
-       coords[1] = (Scalar(impl_->tilesV_ - 1) -
-                       Scalar(index / impl_->tilesU_)) * h;
+       coords[0] = Scalar(index % impl_->nTilesS_) * w;
+       coords[1] = (Scalar(impl_->nTilesT_ - 1) -
+                       Scalar(index / impl_->nTilesS_)) * h;
         coords[2] = coords[0] + w;
         coords[3] = coords[1];
         coords[4] = coords[2];
         coords[2] = coords[0] + w;
         coords[3] = coords[1];
         coords[4] = coords[2];
diff --git a/src/Moof/Video.cc b/src/Moof/Video.cc

index c41517e51c87601ff96bd25f1c63ba3e83dcfcb1..0130d695f0900ce912069c1446fb824c545f0f8e 100644 (file)
--- a/src/Moof/Video.cc
+++ b/src/Moof/Video.cc
@@ -28,6 +28,8 @@
  
  #include <stdexcept>
  
  
  #include <stdexcept>
  
+#include <SDL/SDL_image.h>
+
  #include "Dispatcher.hh"
  #include "Serializable.hh"
  #include "Settings.hh"
  #include "Dispatcher.hh"
  #include "Serializable.hh"
  #include "Settings.hh"
@@ -39,41 +41,29 @@ namespace Mf {
  
  Video::Video()
  {
  
  Video::Video()
  {
-       std::string caption;
-       if (Settings::instance().get("video.caption", caption))
-       {
-               init(attribs_, caption);
-       }
-       else
-       {
-               init(attribs_, "Untitled");
-       }
+       init(attribs_);
  }
  
  }
  
-Video::Video(const Attributes& attribs, const std::string& caption)
+Video::Video(const Attributes& attribs)
  {
  {
-       init(attribs, caption);
+       init(attribs);
  }
  
  }
  
-Video::Video(const Attributes& attribs)
+Video::Video(const std::string& caption, const std::string& icon)
  {
  {
-       std::string caption;
-       if (Settings::instance().get("video.caption", caption))
+       if (attribs_.caption == "Untitled")
         {
         {
-               init(attribs, caption);
+               attribs_.caption = caption;
         }
         }
-       else
+       if (attribs_.icon == "")
         {
         {
-               init(attribs, "Untitled");
+               attribs_.icon = icon;
         }
         }
-}
  
  
-Video::Video(const std::string& caption)
-{
-       init(attribs_, caption);
+       init(attribs_);
  }
  
  }
  
-void Video::init(const Attributes& attribs, const std::string& caption)
+void Video::init(const Attributes& attribs)
  {
         context_ = 0;
         flags_ = 0;
  {
         context_ = 0;
         flags_ = 0;
@@ -82,7 +72,8 @@ void Video::init(const Attributes& attribs, const std::string& caption)
         setFull(attribs.fullscreen);
         setResizable(attribs.resizable);
         setOpenGLAttributes();
         setFull(attribs.fullscreen);
         setResizable(attribs.resizable);
         setOpenGLAttributes();
-       setCaption(caption);
+       setCaption(attribs.caption);
+       setIcon();
         setCursorVisible(attribs.cursorVisible);
         setCursorGrab(attribs.cursorGrab);
         setVideoMode(attribs.mode);
         setCursorVisible(attribs.cursorVisible);
         setCursorGrab(attribs.cursorGrab);
         setVideoMode(attribs.mode);
@@ -163,14 +154,26 @@ bool Video::iconify()
  
  void Video::setCaption(const std::string& caption)
  {
  
  void Video::setCaption(const std::string& caption)
  {
+       attribs_.caption = caption;
         SDL_WM_SetCaption(caption.c_str(), 0);
  }
  
         SDL_WM_SetCaption(caption.c_str(), 0);
  }
  
+void Video::setIcon()
+{
+       if (attribs_.icon != "")
+       {
+               SDL_Surface* icon = IMG_Load(attribs_.icon.c_str());
+               if (icon)
+               {
+                       SDL_WM_SetIcon(icon, 0);
+                       SDL_FreeSurface(icon);
+               }
+       }
+}
+
  std::string Video::getCaption() const
  {
  std::string Video::getCaption() const
  {
-       char* str;
-       SDL_WM_GetCaption(&str, 0);
-       return std::string(str);
+       return attribs_.caption;
  }
  
  
  }
  
  
@@ -331,6 +334,12 @@ Video::Attributes::Attributes()
         Settings::instance().get("video.swapcontrol", swapControl);
         Settings::instance().get("video.hardwareonly", hardwareonly);
  
         Settings::instance().get("video.swapcontrol", swapControl);
         Settings::instance().get("video.hardwareonly", hardwareonly);
  
+       if (!Settings::instance().get("video.caption", caption))
+       {
+               caption = "Untitled";
+       }
+       Settings::instance().get("video.icon", icon);
+
         std::vector<SerializablePtr> dimensions;
         Settings::instance().get("video.mode", dimensions);
         if (dimensions.size() > 0) dimensions[0]->get(mode[0]);
         std::vector<SerializablePtr> dimensions;
         Settings::instance().get("video.mode", dimensions);
         if (dimensions.size() > 0) dimensions[0]->get(mode[0]);
diff --git a/src/Moof/Video.hh b/src/Moof/Video.hh

index a76dca268ef052f136124bc425769d6f65a32f72..bb1fdd48db9b168a086be687c6cc2f51fe55a284 100644 (file)
--- a/src/Moof/Video.hh
+++ b/src/Moof/Video.hh
@@ -45,32 +45,33 @@ public:
         struct Attributes
         {
                 // OpenGL attributes
         struct Attributes
         {
                 // OpenGL attributes
-               long    colorBuffer[4]; // rgba
-               long    frameBuffer;
-               bool    doubleBuffer;
-               long    depthBuffer;
-               long    stencilBuffer;
-               long    accumBuffer[4]; // rgba
-               bool    stereo;
-               long    multisampleBuffers;
-               long    multisampleSamples;
-               bool    swapControl;
-               bool    hardwareonly;
+               long            colorBuffer[4]; // rgba
+               long            frameBuffer;
+               bool            doubleBuffer;
+               long            depthBuffer;
+               long            stencilBuffer;
+               long            accumBuffer[4]; // rgba
+               bool            stereo;
+               long            multisampleBuffers;
+               long            multisampleSamples;
+               bool            swapControl;
+               bool            hardwareonly;
  
                 // Window attributes
  
                 // Window attributes
-               long    mode[3];                // width, height, bpp
-               bool    fullscreen;
-               bool    resizable;
-               bool    cursorVisible;
-               bool    cursorGrab;
+               std::string     caption;
+               std::string     icon;
+               long            mode[3];                // width, height, bpp
+               bool            fullscreen;
+               bool            resizable;
+               bool            cursorVisible;
+               bool            cursorGrab;
  
                 Attributes();
         };
  
         Video();
  
                 Attributes();
         };
  
         Video();
-       Video(const Attributes& attribs);
-       Video(const Attributes& attribs, const std::string& caption);
-       Video(const std::string& caption);
+       explicit Video(const Attributes& attribs);
+       explicit Video(const std::string& caption, const std::string& icon);
         ~Video();
  
         void setVideoMode(const long mode[3]);
         ~Video();
  
         void setVideoMode(const long mode[3]);
@@ -109,10 +110,13 @@ public:
         };
  
  private:
         };
  
  private:
-       void init(const Attributes& attribs, const std::string& caption);
+       void init(const Attributes& attribs);
+
         void recreateContext();
         void setOpenGLAttributes();
  
         void recreateContext();
         void setOpenGLAttributes();
  
+       void setIcon();
+
         SDL_Surface* context_;
         unsigned flags_;
         Attributes attribs_;
         SDL_Surface* context_;
         unsigned flags_;
         Attributes attribs_;
diff --git a/src/TilemapFont.hh b/src/TilemapFont.hh

index 56a2d4bcfcc1e62348198a320a88c7f56517c8ec..04d9e1e46837fb56694316a840ed430f87820137 100644 (file)
--- a/src/TilemapFont.hh
+++ b/src/TilemapFont.hh
@@ -40,12 +40,6 @@
  class TilemapFont : public Mf::Tilemap
  {
  public:
  class TilemapFont : public Mf::Tilemap
  {
  public:
-       struct Exception : public std::runtime_error
-       {
-               explicit Exception(const std::string& what_arg) :
-                       std::runtime_error(what_arg) {}
-       };
-
         TilemapFont();
  
         void getTileCoords(char symbol, Mf::Scalar coords[8],
         TilemapFont();
  
         void getTileCoords(char symbol, Mf::Scalar coords[8],
diff --git a/src/YoinkApp.cc b/src/YoinkApp.cc

index 5b034d74646167996343b696b3e5a59c67c3773f..232c097425b4f3a70803951644e3bdf634d1e203 100644 (file)
--- a/src/YoinkApp.cc
+++ b/src/YoinkApp.cc
@@ -64,24 +64,24 @@ static std::string configFiles()
         return files;
  }
  
         return files;
  }
  
-
-YoinkApp::YoinkApp(int argc, char* argv[]) :
-       Mf::Engine(PACKAGE_STRING, argc, argv, configFiles())
+static std::string iconFile()
  {
  {
-       std::cout << PACKAGE_STRING << std::endl
-                         << "Compiled " << __TIME__ " " __DATE__ << std::endl
-                         << "Send requests, patches, and bug reports to <"
-                         PACKAGE_BUGREPORT << ">." << std::endl << std::endl;
-
         char* dataDir = getenv("YOINK_DATADIR");
  
         char* dataDir = getenv("YOINK_DATADIR");
  
+       // first set up the search paths so we can find the icon and other resources
         if (dataDir)
         {
                 Mf::Resource::addSearchPath(dataDir);
         }
         if (dataDir)
         {
                 Mf::Resource::addSearchPath(dataDir);
         }
-
         Mf::Resource::addSearchPath(YOINK_DATADIR);
  
         Mf::Resource::addSearchPath(YOINK_DATADIR);
  
+       return Mf::Resource::getPathToResource("yoink.png");
+}
+
+
+YoinkApp::YoinkApp(int argc, char* argv[]) :
+       Mf::Engine(argc, argv, configFiles(), PACKAGE_STRING, iconFile())
+{
         Mf::Dispatcher::instance().addHandler("video.context_recreated",
                         boost::bind(&YoinkApp::contextRecreated, this, _1), this);
         setupGL();
         Mf::Dispatcher::instance().addHandler("video.context_recreated",
                         boost::bind(&YoinkApp::contextRecreated, this, _1), this);
         setupGL();
@@ -104,6 +104,8 @@ YoinkApp::YoinkApp(int argc, char* argv[]) :
         fadeIn.init(coeff, 0.5f);
  
         testScene = new Mf::Scene("Test");
         fadeIn.init(coeff, 0.5f);
  
         testScene = new Mf::Scene("Test");
+
+       x = y = z = 0.0;
  }
  
  YoinkApp::~YoinkApp()
  }
  
  YoinkApp::~YoinkApp()
@@ -112,25 +114,29 @@ YoinkApp::~YoinkApp()
         delete font;
  
         Mf::Dispatcher::instance().removeHandler(this);
         delete font;
  
         Mf::Dispatcher::instance().removeHandler(this);
-
-       std::cout << "Goodbye..." << std::endl;
  }
  
  
  void YoinkApp::setupGL()
  {
         glEnable(GL_TEXTURE_2D);
  }
  
  
  void YoinkApp::setupGL()
  {
         glEnable(GL_TEXTURE_2D);
+
         //glEnable(GL_CULL_FACE);
         glEnable(GL_DEPTH_TEST);
  
         glShadeModel(GL_SMOOTH);
         //glEnable(GL_CULL_FACE);
         glEnable(GL_DEPTH_TEST);
  
         glShadeModel(GL_SMOOTH);
+       glEnable(GL_POLYGON_SMOOTH);
+
+       //int texSize;
+       //glGetIntegerv(GL_MAX_TEXTURE_SIZE, &texSize);
+       //std::cout << "texture size: " << texSize << std::endl;
         
         //glEnable(GL_BLEND);
         //glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
         glEnable(GL_ALPHA_TEST);
         glAlphaFunc(GL_GREATER, 0.0);
  
         
         //glEnable(GL_BLEND);
         //glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
         glEnable(GL_ALPHA_TEST);
         glAlphaFunc(GL_GREATER, 0.0);
  
-       glClearColor(0.0, 0.0, 1.0, 1.0);
+       glClearColor(1.0, 0.0, 0.0, 1.0);
  
         //glLineWidth(10.0f);
  }
  
         //glLineWidth(10.0f);
  }
@@ -159,9 +165,9 @@ void YoinkApp::update(Mf::Scalar t, Mf::Scalar dt)
  
  void YoinkApp::draw(Mf::Scalar alpha)
  {
  
  void YoinkApp::draw(Mf::Scalar alpha)
  {
-       //Mf::vector4 meh;
+       //Mf::Vector4 meh;
         //meh.random(0.0, 1.0);
         //meh.random(0.0, 1.0);
-       //static Mf::vector4 c1(meh);
+       //static Mf::Vector4 c1(meh);
  
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
  
  
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
  
@@ -170,6 +176,7 @@ void YoinkApp::draw(Mf::Scalar alpha)
         //Mf::Scalar cosstate = std::cos(drawstate);
         
  
         //Mf::Scalar cosstate = std::cos(drawstate);
         
  
+
         glMatrixMode(GL_PROJECTION);
         glLoadIdentity();
         gluPerspective(60.0, 1.33333, 1.0, 2000.0);
         glMatrixMode(GL_PROJECTION);
         glLoadIdentity();
         gluPerspective(60.0, 1.33333, 1.0, 2000.0);
@@ -186,12 +193,14 @@ void YoinkApp::draw(Mf::Scalar alpha)
  
  
         /*
  
  
         /*
+       glLoadIdentity();
+       
         someChar->getTilemap().bind();
         glColor3f(1.0, 1.0, 1.0);
  
         someChar->getTilemap().bind();
         glColor3f(1.0, 1.0, 1.0);
  
-       unsigned heroFrame = someChar->getAnimation().getFrame();
+       Mf::Tilemap::Index heroFrame = someChar->getAnimation().getFrame();
  
  
-       float coords[8];
+       Mf::Scalar coords[8];
         someChar->getTilemap().getTileCoords(heroFrame, coords);
  
         glBegin(GL_QUADS);
         someChar->getTilemap().getTileCoords(heroFrame, coords);
  
         glBegin(GL_QUADS);
@@ -207,7 +216,7 @@ void YoinkApp::draw(Mf::Scalar alpha)
  
  
         someChar->getTilemap().getTileCoords(heroFrame, coords,
  
  
         someChar->getTilemap().getTileCoords(heroFrame, coords,
-                       Mf::tilemap::reverse);
+                       Mf::Tilemap::REVERSE);
  
         glBegin(GL_QUADS);
                 glTexCoord2f(coords[0], coords[1]);
  
         glBegin(GL_QUADS);
                 glTexCoord2f(coords[0], coords[1]);
@@ -223,7 +232,7 @@ void YoinkApp::draw(Mf::Scalar alpha)
         glColor4f(1.0,0.0,0.0,0.5);
  
         glBindTexture(GL_TEXTURE_2D, 0);
         glColor4f(1.0,0.0,0.0,0.5);
  
         glBindTexture(GL_TEXTURE_2D, 0);
-       glColor4fv(c1.data());
+       glColor4v(c1.data());
  
         glRectd(-cosstate, -sinstate, sinstate, cosstate);
         glRectf(0.0f, 0.0f, sinstate, cosstate);
  
         glRectd(-cosstate, -sinstate, sinstate, cosstate);
         glRectf(0.0f, 0.0f, sinstate, cosstate);
@@ -273,13 +282,13 @@ void YoinkApp::draw(Mf::Scalar alpha)
  
         glBegin(GL_QUADS);
                 glTexCoord2f(coords[0], coords[1]);
  
         glBegin(GL_QUADS);
                 glTexCoord2f(coords[0], coords[1]);
-               glVertex3f(0.0, -1.0, 0.0);
+               glVertex3(0.0, -1.0, 0.0);
                 glTexCoord2f(coords[2], coords[3]);
                 glTexCoord2f(coords[2], coords[3]);
-               glVertex3f(1.0, -1.0, 0.0);
+               glVertex3(1.0, -1.0, 0.0);
                 glTexCoord2f(coords[4], coords[5]);
                 glTexCoord2f(coords[4], coords[5]);
-               glVertex3f(1.0, 0.0, 0.0);
+               glVertex3(1.0, 0.0, 0.0);
                 glTexCoord2f(coords[6], coords[7]);
                 glTexCoord2f(coords[6], coords[7]);
-               glVertex3f(0.0, 0.0, 0.0);
+               glVertex3(0.0, 0.0, 0.0);
         glEnd();
  
         glEnable(GL_BLEND);
         glEnd();
  
         glEnable(GL_BLEND);
@@ -291,7 +300,7 @@ void YoinkApp::draw(Mf::Scalar alpha)
  
         glBegin(GL_LINES);
                 glVertex2f(0.0f, 0.0f);
  
         glBegin(GL_LINES);
                 glVertex2f(0.0f, 0.0f);
-               glVertex2fv(interp.getState(alpha).data());
+               glVertex2v(interp.getState(alpha).data());
         glEnd();
  
         glColor4f(0.0f, 0.0f, 0.0f, fadeIn.getState(alpha));
         glEnd();
  
         glColor4f(0.0f, 0.0f, 0.0f, fadeIn.getState(alpha));
@@ -358,8 +367,26 @@ void YoinkApp::handleEvent(const Mf::Event& event)
  
  int main(int argc, char* argv[])
  {
  
  int main(int argc, char* argv[])
  {
-       YoinkApp app(argc, argv);
-       return app.run();
+       std::cout << PACKAGE_STRING << std::endl
+                         << "Compiled " << __TIME__ " " __DATE__ << std::endl
+                         << "Send requests, patches, and bug reports to <"
+                         PACKAGE_BUGREPORT << ">." << std::endl << std::endl;
+
+       int status = 0;
+
+       try
+       {
+               YoinkApp app(argc, argv);
+               status = app.run();
+       }
+       catch (Mf::Engine::Exception e)
+       {
+               std::cerr << "Unhandled exception: " << e.what() << std::endl;
+               status = 1;
+       }
+
+       std::cout << "Goodbye..." << std::endl;
+       return status;
  }
  
  /** vim: set ts=4 sw=4 tw=80: *************************************************/
  }
  
  /** vim: set ts=4 sw=4 tw=80: *************************************************/
author	Charles McGarvey <chazmcgarvey@brokenzipper.com>
	Sat, 1 Aug 2009 01:12:25 +0000 (19:12 -0600)
committer	Charles McGarvey <chazmcgarvey@brokenzipper.com>
	Sat, 1 Aug 2009 01:12:25 +0000 (19:12 -0600)
Makefile.am		patch \| blob \| history
configure.ac		patch \| blob \| history
data/Makefile.am		patch \| blob \| history
data/animations/AlienWarrior.json		patch \| blob \| history
data/animations/BigExplosion.json		patch \| blob \| history
data/animations/Bonuses.json		patch \| blob \| history
data/animations/Bullets.json		patch \| blob \| history
data/animations/Effects.json		patch \| blob \| history
data/animations/Heroine.json		patch \| blob \| history
data/animations/Jetbot.json		patch \| blob \| history
data/animations/RobotTrooper.json		patch \| blob \| history
data/tilemaps/AlienWarrior.json		patch \| blob \| history
data/tilemaps/BackgroundFar.json		patch \| blob \| history
data/tilemaps/BackgroundNear.json		patch \| blob \| history
data/tilemaps/BigExplosion.json		patch \| blob \| history
data/tilemaps/Bonuses.json		patch \| blob \| history
data/tilemaps/Building.json		patch \| blob \| history
data/tilemaps/Font.json		patch \| blob \| history
data/tilemaps/Heroine.json		patch \| blob \| history
data/tilemaps/Jetbot.json		patch \| blob \| history
data/tilemaps/Particles.json		patch \| blob \| history
data/tilemaps/RobotTrooper.json		patch \| blob \| history
data/tilemaps/Scenery.json		patch \| blob \| history
data/tilemaps/StatusBars.json		patch \| blob \| history
data/tilemaps/TowerBlock1.json		patch \| blob \| history
data/tilemaps/Trees.json		patch \| blob \| history
data/yoinkrc		patch \| blob \| history
doc/yoink.6.in		patch \| blob \| history
extra/yoink.ebuild		patch \| blob \| history
src/Character.hh		patch \| blob \| history
src/Makefile.am		patch \| blob \| history
src/Moof/Engine.cc		patch \| blob \| history
src/Moof/Engine.hh		patch \| blob \| history
src/Moof/Math.hh		patch \| blob \| history
src/Moof/OpenGL.cc	[new file with mode: 0644]	patch \| blob
src/Moof/OpenGL.hh		patch \| blob \| history
src/Moof/Scene.cc		patch \| blob \| history
src/Moof/Settings.cc		patch \| blob \| history
src/Moof/Texture.cc		patch \| blob \| history
src/Moof/Texture.hh		patch \| blob \| history
src/Moof/Tilemap.cc		patch \| blob \| history
src/Moof/Video.cc		patch \| blob \| history
src/Moof/Video.hh		patch \| blob \| history
src/TilemapFont.hh		patch \| blob \| history
src/YoinkApp.cc		patch \| blob \| history