updated logo

objects/oWheel/Create_0.gml → objects/oLogo/Create_0.gml

@@ -4,5 +4,5 @@
 event_inherited();
 
 with o3Dtest {
-	load_sprite(other.sprite_index, 80);	
+	load_sprite(other.sprite_index, 64);	
 }

objects/oLogo/Step_0.gml

@@ -0,0 +1,7 @@
+/// @description
+
+image_angle = -oCamera.camera_angle;
+
+z = 16 * (4 + sin(current_time * 0.005));
+x_tilt = 10 * cos(current_time * 0.001);
+y_tilt = 4 * sin(current_time * 0.002);

objects/oWheel/oWheel.yy → objects/oLogo/oLogo.yy

@@ -24,7 +24,8 @@
   "physicsKinematic": false,
   "physicsShapePoints": [],
   "eventList": [
-    {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oWheel","path":"objects/oWheel/oWheel.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
+    {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"parent":{"name":"oLogo","path":"objects/oLogo/oLogo.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
+    {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"parent":{"name":"oLogo","path":"objects/oLogo/oLogo.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",},
   ],
   "properties": [],
   "overriddenProperties": [],
@@ -33,7 +34,7 @@
     "path": "folders/Objects/example objects.yy",
   },
   "resourceVersion": "1.0",
-  "name": "oWheel",
+  "name": "oLogo",
   "tags": [],
   "resourceType": "GMObject",
 }

rooms/Room1/Room1.yy

@@ -18,7 +18,7 @@
         {"properties":[],"isDnd":false,"objectId":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":96.0,"y":64.0,"resourceVersion":"1.0","name":"inst_7A72DD9C","tags":[],"resourceType":"GMRInstance",},
         {"properties":[],"isDnd":false,"objectId":{"name":"oCamera","path":"objects/oCamera/oCamera.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":96.0,"y":64.0,"resourceVersion":"1.0","name":"inst_54D390C9","tags":[],"resourceType":"GMRInstance",},
         {"properties":[],"isDnd":false,"objectId":{"name":"oBillboard","path":"objects/oBillboard/oBillboard.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":288.0,"y":96.0,"resourceVersion":"1.0","name":"inst_1C559D44","tags":[],"resourceType":"GMRInstance",},
-        {"properties":[],"isDnd":false,"objectId":{"name":"oWheel","path":"objects/oWheel/oWheel.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":192.0,"y":32.0,"resourceVersion":"1.0","name":"inst_3FCDB135","tags":[],"resourceType":"GMRInstance",},
+        {"properties":[],"isDnd":false,"objectId":{"name":"oLogo","path":"objects/oLogo/oLogo.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":192.0,"y":32.0,"resourceVersion":"1.0","name":"inst_3FCDB135","tags":[],"resourceType":"GMRInstance",},
         {"properties":[],"isDnd":false,"objectId":{"name":"oCoin","path":"objects/oCoin/oCoin.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":145.0,"y":36.0,"resourceVersion":"1.0","name":"inst_19546964","tags":[],"resourceType":"GMRInstance",},
         {"properties":[],"isDnd":false,"objectId":{"name":"oCoin","path":"objects/oCoin/oCoin.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":146.0,"y":47.0,"resourceVersion":"1.0","name":"inst_5CC46171","tags":[],"resourceType":"GMRInstance",},
         {"properties":[],"isDnd":false,"objectId":{"name":"oCoin","path":"objects/oCoin/oCoin.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":153.0,"y":45.0,"resourceVersion":"1.0","name":"inst_746F8FA1","tags":[],"resourceType":"GMRInstance",},

sprites/sWheel1/sWheel1.yy

@@ -8,14 +8,14 @@
   "collisionTolerance": 0,
   "swfPrecision": 2.525,
   "bbox_left": 0,
-  "bbox_right": 71,
-  "bbox_top": 971,
-  "bbox_bottom": 5727,
+  "bbox_right": 98,
+  "bbox_top": 144,
+  "bbox_bottom": 975,
   "HTile": false,
   "VTile": false,
   "For3D": true,
-  "width": 72,
-  "height": 5760,
+  "width": 100,
+  "height": 1024,
   "textureGroupId": {
     "name": "Default",
     "path": "texturegroups/Default",
@@ -24,9 +24,9 @@
   "gridX": 0,
   "gridY": 0,
   "frames": [
-    {"compositeImage":{"FrameId":{"name":"e661321e-3670-41ce-b680-d8e01e6f48d8","path":"sprites/sWheel1/sWheel1.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
-        {"FrameId":{"name":"e661321e-3670-41ce-b680-d8e01e6f48d8","path":"sprites/sWheel1/sWheel1.yy",},"LayerId":{"name":"19c89002-2fc1-45a1-b1e4-5f71d19cd73c","path":"sprites/sWheel1/sWheel1.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
-      ],"parent":{"name":"sWheel1","path":"sprites/sWheel1/sWheel1.yy",},"resourceVersion":"1.0","name":"e661321e-3670-41ce-b680-d8e01e6f48d8","tags":[],"resourceType":"GMSpriteFrame",},
+    {"compositeImage":{"FrameId":{"name":"1118f155-decc-4d41-a1d9-91eb094f5905","path":"sprites/sWheel1/sWheel1.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[
+        {"FrameId":{"name":"1118f155-decc-4d41-a1d9-91eb094f5905","path":"sprites/sWheel1/sWheel1.yy",},"LayerId":{"name":"51aafed8-d59b-4987-9870-4096d2d24dd4","path":"sprites/sWheel1/sWheel1.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},
+      ],"parent":{"name":"sWheel1","path":"sprites/sWheel1/sWheel1.yy",},"resourceVersion":"1.0","name":"1118f155-decc-4d41-a1d9-91eb094f5905","tags":[],"resourceType":"GMSpriteFrame",},
   ],
   "sequence": {
     "spriteId": {"name":"sWheel1","path":"sprites/sWheel1/sWheel1.yy",},
@@ -41,7 +41,7 @@
     "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore<MomentsEventKeyframe>",},
     "tracks": [
       {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[
-            {"id":"ddb0992a-5ad4-4f09-b1ce-bf58ab59db1c","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"e661321e-3670-41ce-b680-d8e01e6f48d8","path":"sprites/sWheel1/sWheel1.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
+            {"id":"6757e6a7-e1c2-4e9b-a0a4-e108ee4da9f8","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"1118f155-decc-4d41-a1d9-91eb094f5905","path":"sprites/sWheel1/sWheel1.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe<SpriteFrameKeyframe>",},
           ],"resourceVersion":"1.0","resourceType":"KeyframeStore<SpriteFrameKeyframe>",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",},
     ],
     "visibleRange": null,
@@ -65,7 +65,7 @@
     "resourceType": "GMSequence",
   },
   "layers": [
-    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"19c89002-2fc1-45a1-b1e4-5f71d19cd73c","tags":[],"resourceType":"GMImageLayer",},
+    {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"51aafed8-d59b-4987-9870-4096d2d24dd4","tags":[],"resourceType":"GMImageLayer",},
   ],
   "parent": {
     "name": "Sprites",

vertex_buffer_test.yyp

@@ -27,7 +27,7 @@
     {"id":{"name":"sCup1","path":"sprites/sCup1/sCup1.yy",},"order":0,},
     {"id":{"name":"oCube","path":"objects/oCube/oCube.yy",},"order":2,},
     {"id":{"name":"Sprite5","path":"sprites/Sprite5/Sprite5.yy",},"order":4,},
-    {"id":{"name":"oWheel","path":"objects/oWheel/oWheel.yy",},"order":6,},
+    {"id":{"name":"oLogo","path":"objects/oLogo/oLogo.yy",},"order":6,},
     {"id":{"name":"oPlayer","path":"objects/oPlayer/oPlayer.yy",},"order":4,},
     {"id":{"name":"sWheel2","path":"sprites/sWheel2/sWheel2.yy",},"order":3,},
     {"id":{"name":"Sprite10","path":"sprites/Sprite10/Sprite10.yy",},"order":8,},