diff --git a/BBMOD_GML/BBMOD.resource_order b/BBMOD_GML/BBMOD.resource_order index d1a8461f..d5abd743 100644 --- a/BBMOD_GML/BBMOD.resource_order +++ b/BBMOD_GML/BBMOD.resource_order @@ -1,6 +1,6 @@ { "FolderOrderSettings":[ - {"name":"BBMOD","order":53,"path":"folders/BBMOD.yy",}, + {"name":"BBMOD","order":1,"path":"folders/BBMOD.yy",}, {"name":"ColMesh","order":7,"path":"folders/BBMOD/ColMesh.yy",}, {"name":"Base","order":25,"path":"folders/BBMOD/Core/Base.yy",}, {"name":"Animation","order":2,"path":"folders/BBMOD/Core/Base/Animation.yy",}, @@ -78,41 +78,9 @@ {"name":"StateMachine","order":2,"path":"folders/BBMOD/StateMachine.yy",}, {"name":"Terrain","order":4,"path":"folders/BBMOD/Terrain.yy",}, {"name":"Shaders","order":8,"path":"folders/BBMOD/Terrain/Shaders.yy",}, - {"name":"Fonts","order":7,"path":"folders/Demo/Fonts.yy",}, - {"name":"Materials","order":5,"path":"folders/Demo/Materials.yy",}, - {"name":"Objects","order":1,"path":"folders/Demo/Objects.yy",}, - {"name":"Characters","order":4,"path":"folders/Demo/Objects/Characters.yy",}, - {"name":"Effects","order":6,"path":"folders/Demo/Objects/Effects.yy",}, - {"name":"Items","order":5,"path":"folders/Demo/Objects/Items.yy",}, - {"name":"Particles","order":10,"path":"folders/Demo/Objects/Particles.yy",}, - {"name":"ParticleSystems","order":8,"path":"folders/Demo/ParticleSystems.yy",}, - {"name":"Scripts","order":2,"path":"folders/Demo/Scripts.yy",}, - {"name":"Shaders","order":6,"path":"folders/Demo/Shaders.yy",}, - {"name":"Sounds","order":3,"path":"folders/Demo/Sounds.yy",}, - {"name":"Gunshot","order":1,"path":"folders/Demo/Sounds/Gunshot.yy",}, - {"name":"Shell","order":2,"path":"folders/Demo/Sounds/Shell.yy",}, - {"name":"Zombie","order":7,"path":"folders/Demo/Sounds/Zombie.yy",}, - {"name":"Sprites","order":4,"path":"folders/Demo/Sprites.yy",}, - {"name":"Terrain","order":7,"path":"folders/Demo/Sprites/Terrain.yy",}, ], "ResourceOrderSettings":[ {"name":"BBMOD_CameraHTML5","order":1,"path":"extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy",}, - {"name":"Fnt24","order":1,"path":"fonts/Fnt24/Fnt24.yy",}, - {"name":"Fnt48","order":2,"path":"fonts/Fnt48/Fnt48.yy",}, - {"name":"ODirtEmitter","order":4,"path":"objects/ODirtEmitter/ODirtEmitter.yy",}, - {"name":"ODissolveEmitter","order":1,"path":"objects/ODissolveEmitter/ODissolveEmitter.yy",}, - {"name":"OFloatingText","order":1,"path":"objects/OFloatingText/OFloatingText.yy",}, - {"name":"OGameOver","order":7,"path":"objects/OGameOver/OGameOver.yy",}, - {"name":"OGunfireEmitter","order":6,"path":"objects/OGunfireEmitter/OGunfireEmitter.yy",}, - {"name":"OInit","order":8,"path":"objects/OInit/OInit.yy",}, - {"name":"OItem","order":1,"path":"objects/OItem/OItem.yy",}, - {"name":"OMain","order":1,"path":"objects/OMain/OMain.yy",}, - {"name":"OPlayer","order":1,"path":"objects/OPlayer/OPlayer.yy",}, - {"name":"OSky","order":2,"path":"objects/OSky/OSky.yy",}, - {"name":"OTree","order":11,"path":"objects/OTree/OTree.yy",}, - {"name":"OZombie","order":2,"path":"objects/OZombie/OZombie.yy",}, - {"name":"RmGameOver","order":1,"path":"rooms/RmGameOver/RmGameOver.yy",}, - {"name":"RmInit","order":2,"path":"rooms/RmInit/RmInit.yy",}, {"name":"__bbmod_array","order":5,"path":"scripts/__bbmod_array/__bbmod_array.yy",}, {"name":"__bbmod_async","order":3,"path":"scripts/__bbmod_async/__bbmod_async.yy",}, {"name":"__bbmod_blendmode","order":14,"path":"scripts/__bbmod_blendmode/__bbmod_blendmode.yy",}, @@ -268,10 +236,6 @@ {"name":"BBMOD_Vertex","order":1,"path":"scripts/BBMOD_Vertex/BBMOD_Vertex.yy",}, {"name":"BBMOD_VertexFormat","order":3,"path":"scripts/BBMOD_VertexFormat/BBMOD_VertexFormat.yy",}, {"name":"bbmod_vtf_is_supported","order":8,"path":"scripts/bbmod_vtf_is_supported/bbmod_vtf_is_supported.yy",}, - {"name":"DissolveParticleSystem","order":1,"path":"scripts/DissolveParticleSystem/DissolveParticleSystem.yy",}, - {"name":"DrawTextShadow","order":2,"path":"scripts/DrawTextShadow/DrawTextShadow.yy",}, - {"name":"GunfireParticleSystem","order":2,"path":"scripts/GunfireParticleSystem/GunfireParticleSystem.yy",}, - {"name":"MatZombie","order":1,"path":"scripts/MatZombie/MatZombie.yy",}, {"name":"BBMOD_ShCheckMRT","order":11,"path":"shaders/BBMOD_ShCheckMRT/BBMOD_ShCheckMRT.yy",}, {"name":"BBMOD_ShCheckVTF","order":7,"path":"shaders/BBMOD_ShCheckVTF/BBMOD_ShCheckVTF.yy",}, {"name":"BBMOD_ShChromaticAberration","order":1,"path":"shaders/BBMOD_ShChromaticAberration/BBMOD_ShChromaticAberration.yy",}, @@ -340,32 +304,6 @@ {"name":"BBMOD_ShTerrainUnlit","order":2,"path":"shaders/BBMOD_ShTerrainUnlit/BBMOD_ShTerrainUnlit.yy",}, {"name":"BBMOD_ShThreshold","order":23,"path":"shaders/BBMOD_ShThreshold/BBMOD_ShThreshold.yy",}, {"name":"BBMOD_ShVignette","order":1,"path":"shaders/BBMOD_ShVignette/BBMOD_ShVignette.yy",}, - {"name":"ShZombieDepth","order":1,"path":"shaders/ShZombieDepth/ShZombieDepth.yy",}, - {"name":"ShZombieGBuffer","order":2,"path":"shaders/ShZombieGBuffer/ShZombieGBuffer.yy",}, - {"name":"SndFootstep1","order":1,"path":"sounds/SndFootstep1/SndFootstep1.yy",}, - {"name":"SndFootstep2","order":2,"path":"sounds/SndFootstep2/SndFootstep2.yy",}, - {"name":"SndFootstep3","order":3,"path":"sounds/SndFootstep3/SndFootstep3.yy",}, - {"name":"SndFootstep4","order":4,"path":"sounds/SndFootstep4/SndFootstep4.yy",}, - {"name":"SndFootstep5","order":5,"path":"sounds/SndFootstep5/SndFootstep5.yy",}, - {"name":"SndFootstep6","order":6,"path":"sounds/SndFootstep6/SndFootstep6.yy",}, - {"name":"SndFootstep7","order":7,"path":"sounds/SndFootstep7/SndFootstep7.yy",}, - {"name":"SndFootstep8","order":8,"path":"sounds/SndFootstep8/SndFootstep8.yy",}, - {"name":"SndFootstep9","order":9,"path":"sounds/SndFootstep9/SndFootstep9.yy",}, - {"name":"SndGunshot1","order":1,"path":"sounds/SndGunshot1/SndGunshot1.yy",}, - {"name":"SndGunshot2","order":2,"path":"sounds/SndGunshot2/SndGunshot2.yy",}, - {"name":"SndGunshot3","order":3,"path":"sounds/SndGunshot3/SndGunshot3.yy",}, - {"name":"SndGunshot4","order":4,"path":"sounds/SndGunshot4/SndGunshot4.yy",}, - {"name":"SndPunch","order":4,"path":"sounds/SndPunch/SndPunch.yy",}, - {"name":"SndShell1","order":1,"path":"sounds/SndShell1/SndShell1.yy",}, - {"name":"SndShell2","order":2,"path":"sounds/SndShell2/SndShell2.yy",}, - {"name":"SndShell3","order":3,"path":"sounds/SndShell3/SndShell3.yy",}, - {"name":"SndShell4","order":4,"path":"sounds/SndShell4/SndShell4.yy",}, - {"name":"SndShell5","order":5,"path":"sounds/SndShell5/SndShell5.yy",}, - {"name":"SndShell6","order":6,"path":"sounds/SndShell6/SndShell6.yy",}, - {"name":"SndShell7","order":7,"path":"sounds/SndShell7/SndShell7.yy",}, - {"name":"SndWhoosh","order":5,"path":"sounds/SndWhoosh/SndWhoosh.yy",}, - {"name":"SndZombie0","order":1,"path":"sounds/SndZombie0/SndZombie0.yy",}, - {"name":"SndZombie1","order":1,"path":"sounds/SndZombie1/SndZombie1.yy",}, {"name":"BBMOD_SprCheckerboard","order":1,"path":"sprites/BBMOD_SprCheckerboard/BBMOD_SprCheckerboard.yy",}, {"name":"BBMOD_SprColorGradingLUT","order":2,"path":"sprites/BBMOD_SprColorGradingLUT/BBMOD_SprColorGradingLUT.yy",}, {"name":"BBMOD_SprDefaultNormalW","order":1,"path":"sprites/BBMOD_SprDefaultNormalW/BBMOD_SprDefaultNormalW.yy",}, @@ -375,15 +313,6 @@ {"name":"BBMOD_SprLensFlareHoop","order":3,"path":"sprites/BBMOD_SprLensFlareHoop/BBMOD_SprLensFlareHoop.yy",}, {"name":"BBMOD_SprLensFlareStreak","order":5,"path":"sprites/BBMOD_SprLensFlareStreak/BBMOD_SprLensFlareStreak.yy",}, {"name":"BBMOD_SprWhite","order":2,"path":"sprites/BBMOD_SprWhite/BBMOD_SprWhite.yy",}, - {"name":"SprCharacterCollisionMask","order":3,"path":"sprites/SprCharacterCollisionMask/SprCharacterCollisionMask.yy",}, - {"name":"SprColorGrading","order":4,"path":"sprites/SprColorGrading/SprColorGrading.yy",}, - {"name":"SprCrosshair","order":2,"path":"sprites/SprCrosshair/SprCrosshair.yy",}, - {"name":"SprDirt","order":1,"path":"sprites/SprDirt/SprDirt.yy",}, - {"name":"SprDirtParticle","order":8,"path":"sprites/SprDirtParticle/SprDirtParticle.yy",}, - {"name":"SprGunfire","order":9,"path":"sprites/SprGunfire/SprGunfire.yy",}, - {"name":"SprHeightmap","order":2,"path":"sprites/SprHeightmap/SprHeightmap.yy",}, {"name":"BBMOD_SprLensFlareStarburst","order":6,"path":"sprites/BBMOD_SprLensFlareStarburst/BBMOD_SprLensFlareStarburst.yy",}, - {"name":"SprSplatmap","order":3,"path":"sprites/SprSplatmap/SprSplatmap.yy",}, - {"name":"SprZombie","order":1,"path":"sprites/SprZombie/SprZombie.yy",}, ], } \ No newline at end of file diff --git a/BBMOD_GML/BBMOD.yyp b/BBMOD_GML/BBMOD.yyp index 74993163..76a78af5 100644 --- a/BBMOD_GML/BBMOD.yyp +++ b/BBMOD_GML/BBMOD.yyp @@ -90,25 +90,6 @@ {"$GMFolder":"","%Name":"StateMachine","folderPath":"folders/BBMOD/StateMachine.yy","name":"StateMachine","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Terrain","folderPath":"folders/BBMOD/Terrain.yy","name":"Terrain","resourceType":"GMFolder","resourceVersion":"2.0",}, {"$GMFolder":"","%Name":"Shaders","folderPath":"folders/BBMOD/Terrain/Shaders.yy","name":"Shaders","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"Demo","folderPath":"folders/Demo.yy","name":"Demo","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"Fonts","folderPath":"folders/Demo/Fonts.yy","name":"Fonts","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"Materials","folderPath":"folders/Demo/Materials.yy","name":"Materials","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"Objects","folderPath":"folders/Demo/Objects.yy","name":"Objects","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"Characters","folderPath":"folders/Demo/Objects/Characters.yy","name":"Characters","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"Effects","folderPath":"folders/Demo/Objects/Effects.yy","name":"Effects","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"Items","folderPath":"folders/Demo/Objects/Items.yy","name":"Items","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"Particles","folderPath":"folders/Demo/Objects/Particles.yy","name":"Particles","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"ParticleSystems","folderPath":"folders/Demo/ParticleSystems.yy","name":"ParticleSystems","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"Rooms","folderPath":"folders/Demo/Rooms.yy","name":"Rooms","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"Scripts","folderPath":"folders/Demo/Scripts.yy","name":"Scripts","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"Shaders","folderPath":"folders/Demo/Shaders.yy","name":"Shaders","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"Sounds","folderPath":"folders/Demo/Sounds.yy","name":"Sounds","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"Footstep","folderPath":"folders/Demo/Sounds/Footstep.yy","name":"Footstep","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"Gunshot","folderPath":"folders/Demo/Sounds/Gunshot.yy","name":"Gunshot","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"Shell","folderPath":"folders/Demo/Sounds/Shell.yy","name":"Shell","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"Zombie","folderPath":"folders/Demo/Sounds/Zombie.yy","name":"Zombie","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"Sprites","folderPath":"folders/Demo/Sprites.yy","name":"Sprites","resourceType":"GMFolder","resourceVersion":"2.0",}, - {"$GMFolder":"","%Name":"Terrain","folderPath":"folders/Demo/Sprites/Terrain.yy","name":"Terrain","resourceType":"GMFolder","resourceVersion":"2.0",}, ], "IncludedFiles":[ {"$GMIncludedFile":"","%Name":"Character_Aim.bbanim","CopyToMask":-1,"filePath":"datafiles/Data/Assets/Character","name":"Character_Aim.bbanim","resourceType":"GMIncludedFile","resourceVersion":"2.0",}, @@ -178,29 +159,6 @@ "name":"BBMOD", "resources":[ {"id":{"name":"BBMOD_CameraHTML5","path":"extensions/BBMOD_CameraHTML5/BBMOD_CameraHTML5.yy",},}, - {"id":{"name":"Fnt16","path":"fonts/Fnt16/Fnt16.yy",},}, - {"id":{"name":"Fnt24","path":"fonts/Fnt24/Fnt24.yy",},}, - {"id":{"name":"Fnt48","path":"fonts/Fnt48/Fnt48.yy",},}, - {"id":{"name":"OCharacter","path":"objects/OCharacter/OCharacter.yy",},}, - {"id":{"name":"ODirtEmitter","path":"objects/ODirtEmitter/ODirtEmitter.yy",},}, - {"id":{"name":"ODissolveEmitter","path":"objects/ODissolveEmitter/ODissolveEmitter.yy",},}, - {"id":{"name":"OFloatingText","path":"objects/OFloatingText/OFloatingText.yy",},}, - {"id":{"name":"OGameOver","path":"objects/OGameOver/OGameOver.yy",},}, - {"id":{"name":"OGun","path":"objects/OGun/OGun.yy",},}, - {"id":{"name":"OGunfireEmitter","path":"objects/OGunfireEmitter/OGunfireEmitter.yy",},}, - {"id":{"name":"OInit","path":"objects/OInit/OInit.yy",},}, - {"id":{"name":"OItem","path":"objects/OItem/OItem.yy",},}, - {"id":{"name":"OMain","path":"objects/OMain/OMain.yy",},}, - {"id":{"name":"OObject3D","path":"objects/OObject3D/OObject3D.yy",},}, - {"id":{"name":"OParticleEmitter","path":"objects/OParticleEmitter/OParticleEmitter.yy",},}, - {"id":{"name":"OPlayer","path":"objects/OPlayer/OPlayer.yy",},}, - {"id":{"name":"OShell","path":"objects/OShell/OShell.yy",},}, - {"id":{"name":"OSky","path":"objects/OSky/OSky.yy",},}, - {"id":{"name":"OTree","path":"objects/OTree/OTree.yy",},}, - {"id":{"name":"OZombie","path":"objects/OZombie/OZombie.yy",},}, - {"id":{"name":"RmDemo","path":"rooms/RmDemo/RmDemo.yy",},}, - {"id":{"name":"RmGameOver","path":"rooms/RmGameOver/RmGameOver.yy",},}, - {"id":{"name":"RmInit","path":"rooms/RmInit/RmInit.yy",},}, {"id":{"name":"__bbmod_array","path":"scripts/__bbmod_array/__bbmod_array.yy",},}, {"id":{"name":"__bbmod_async","path":"scripts/__bbmod_async/__bbmod_async.yy",},}, {"id":{"name":"__bbmod_blendmode","path":"scripts/__bbmod_blendmode/__bbmod_blendmode.yy",},}, @@ -403,11 +361,6 @@ {"id":{"name":"BBMOD_VertexFormat","path":"scripts/BBMOD_VertexFormat/BBMOD_VertexFormat.yy",},}, {"id":{"name":"BBMOD_VignetteEffect","path":"scripts/BBMOD_VignetteEffect/BBMOD_VignetteEffect.yy",},}, {"id":{"name":"bbmod_vtf_is_supported","path":"scripts/bbmod_vtf_is_supported/bbmod_vtf_is_supported.yy",},}, - {"id":{"name":"DirtParticleSystem","path":"scripts/DirtParticleSystem/DirtParticleSystem.yy",},}, - {"id":{"name":"DissolveParticleSystem","path":"scripts/DissolveParticleSystem/DissolveParticleSystem.yy",},}, - {"id":{"name":"DrawTextShadow","path":"scripts/DrawTextShadow/DrawTextShadow.yy",},}, - {"id":{"name":"GunfireParticleSystem","path":"scripts/GunfireParticleSystem/GunfireParticleSystem.yy",},}, - {"id":{"name":"MatZombie","path":"scripts/MatZombie/MatZombie.yy",},}, {"id":{"name":"BBMOD_ShCheckMRT","path":"shaders/BBMOD_ShCheckMRT/BBMOD_ShCheckMRT.yy",},}, {"id":{"name":"BBMOD_ShCheckVTF","path":"shaders/BBMOD_ShCheckVTF/BBMOD_ShCheckVTF.yy",},}, {"id":{"name":"BBMOD_ShChromaticAberration","path":"shaders/BBMOD_ShChromaticAberration/BBMOD_ShChromaticAberration.yy",},}, @@ -489,36 +442,6 @@ {"id":{"name":"BBMOD_ShTerrainUnlit","path":"shaders/BBMOD_ShTerrainUnlit/BBMOD_ShTerrainUnlit.yy",},}, {"id":{"name":"BBMOD_ShThreshold","path":"shaders/BBMOD_ShThreshold/BBMOD_ShThreshold.yy",},}, {"id":{"name":"BBMOD_ShVignette","path":"shaders/BBMOD_ShVignette/BBMOD_ShVignette.yy",},}, - {"id":{"name":"ShZombie","path":"shaders/ShZombie/ShZombie.yy",},}, - {"id":{"name":"ShZombieDepth","path":"shaders/ShZombieDepth/ShZombieDepth.yy",},}, - {"id":{"name":"ShZombieGBuffer","path":"shaders/ShZombieGBuffer/ShZombieGBuffer.yy",},}, - {"id":{"name":"SndFootstep0","path":"sounds/SndFootstep0/SndFootstep0.yy",},}, - {"id":{"name":"SndFootstep1","path":"sounds/SndFootstep1/SndFootstep1.yy",},}, - {"id":{"name":"SndFootstep2","path":"sounds/SndFootstep2/SndFootstep2.yy",},}, - {"id":{"name":"SndFootstep3","path":"sounds/SndFootstep3/SndFootstep3.yy",},}, - {"id":{"name":"SndFootstep4","path":"sounds/SndFootstep4/SndFootstep4.yy",},}, - {"id":{"name":"SndFootstep5","path":"sounds/SndFootstep5/SndFootstep5.yy",},}, - {"id":{"name":"SndFootstep6","path":"sounds/SndFootstep6/SndFootstep6.yy",},}, - {"id":{"name":"SndFootstep7","path":"sounds/SndFootstep7/SndFootstep7.yy",},}, - {"id":{"name":"SndFootstep8","path":"sounds/SndFootstep8/SndFootstep8.yy",},}, - {"id":{"name":"SndFootstep9","path":"sounds/SndFootstep9/SndFootstep9.yy",},}, - {"id":{"name":"SndGunshot0","path":"sounds/SndGunshot0/SndGunshot0.yy",},}, - {"id":{"name":"SndGunshot1","path":"sounds/SndGunshot1/SndGunshot1.yy",},}, - {"id":{"name":"SndGunshot2","path":"sounds/SndGunshot2/SndGunshot2.yy",},}, - {"id":{"name":"SndGunshot3","path":"sounds/SndGunshot3/SndGunshot3.yy",},}, - {"id":{"name":"SndGunshot4","path":"sounds/SndGunshot4/SndGunshot4.yy",},}, - {"id":{"name":"SndPunch","path":"sounds/SndPunch/SndPunch.yy",},}, - {"id":{"name":"SndShell0","path":"sounds/SndShell0/SndShell0.yy",},}, - {"id":{"name":"SndShell1","path":"sounds/SndShell1/SndShell1.yy",},}, - {"id":{"name":"SndShell2","path":"sounds/SndShell2/SndShell2.yy",},}, - {"id":{"name":"SndShell3","path":"sounds/SndShell3/SndShell3.yy",},}, - {"id":{"name":"SndShell4","path":"sounds/SndShell4/SndShell4.yy",},}, - {"id":{"name":"SndShell5","path":"sounds/SndShell5/SndShell5.yy",},}, - {"id":{"name":"SndShell6","path":"sounds/SndShell6/SndShell6.yy",},}, - {"id":{"name":"SndShell7","path":"sounds/SndShell7/SndShell7.yy",},}, - {"id":{"name":"SndWhoosh","path":"sounds/SndWhoosh/SndWhoosh.yy",},}, - {"id":{"name":"SndZombie0","path":"sounds/SndZombie0/SndZombie0.yy",},}, - {"id":{"name":"SndZombie1","path":"sounds/SndZombie1/SndZombie1.yy",},}, {"id":{"name":"BBMOD_SprBestFitNormalLUT","path":"sprites/BBMOD_SprBestFitNormalLUT/BBMOD_SprBestFitNormalLUT.yy",},}, {"id":{"name":"BBMOD_SprBlack","path":"sprites/BBMOD_SprBlack/BBMOD_SprBlack.yy",},}, {"id":{"name":"BBMOD_SprCheckerboard","path":"sprites/BBMOD_SprCheckerboard/BBMOD_SprCheckerboard.yy",},}, @@ -532,26 +455,11 @@ {"id":{"name":"BBMOD_SprLensFlareStreak","path":"sprites/BBMOD_SprLensFlareStreak/BBMOD_SprLensFlareStreak.yy",},}, {"id":{"name":"BBMOD_SprParticle","path":"sprites/BBMOD_SprParticle/BBMOD_SprParticle.yy",},}, {"id":{"name":"BBMOD_SprWhite","path":"sprites/BBMOD_SprWhite/BBMOD_SprWhite.yy",},}, - {"id":{"name":"SprCharacterCollisionMask","path":"sprites/SprCharacterCollisionMask/SprCharacterCollisionMask.yy",},}, - {"id":{"name":"SprColorGrading","path":"sprites/SprColorGrading/SprColorGrading.yy",},}, - {"id":{"name":"SprCrosshair","path":"sprites/SprCrosshair/SprCrosshair.yy",},}, - {"id":{"name":"SprDirt","path":"sprites/SprDirt/SprDirt.yy",},}, - {"id":{"name":"SprDirtParticle","path":"sprites/SprDirtParticle/SprDirtParticle.yy",},}, - {"id":{"name":"SprGunfire","path":"sprites/SprGunfire/SprGunfire.yy",},}, - {"id":{"name":"SprHeightmap","path":"sprites/SprHeightmap/SprHeightmap.yy",},}, {"id":{"name":"BBMOD_SprLensFlareStarburst","path":"sprites/BBMOD_SprLensFlareStarburst/BBMOD_SprLensFlareStarburst.yy",},}, - {"id":{"name":"SprPlayer","path":"sprites/SprPlayer/SprPlayer.yy",},}, - {"id":{"name":"SprSand","path":"sprites/SprSand/SprSand.yy",},}, - {"id":{"name":"SprSplatmap","path":"sprites/SprSplatmap/SprSplatmap.yy",},}, - {"id":{"name":"SprZombie","path":"sprites/SprZombie/SprZombie.yy",},}, ], "resourceType":"GMProject", "resourceVersion":"2.0", - "RoomOrderNodes":[ - {"roomId":{"name":"RmInit","path":"rooms/RmInit/RmInit.yy",},}, - {"roomId":{"name":"RmDemo","path":"rooms/RmDemo/RmDemo.yy",},}, - {"roomId":{"name":"RmGameOver","path":"rooms/RmGameOver/RmGameOver.yy",},}, - ], + "RoomOrderNodes":[], "templateType":null, "TextureGroups":[ {"$GMTextureGroup":"","%Name":"Default","autocrop":true,"border":8,"compressFormat":"bz2","customOptions":"","directory":"","groupParent":null,"isScaled":true,"loadType":"default","mipsToGenerate":-1,"name":"Default","resourceType":"GMTextureGroup","resourceVersion":"2.0","targets":-1,}, diff --git a/BBMOD_GML/datafiles/Data/Assets/Character/Character.bbmod b/BBMOD_GML/datafiles/Data/Assets/Character/Character.bbmod deleted file mode 100644 index ffb36a05..00000000 Binary files a/BBMOD_GML/datafiles/Data/Assets/Character/Character.bbmod and /dev/null differ diff --git a/BBMOD_GML/datafiles/Data/Assets/Character/Character_Aim.bbanim b/BBMOD_GML/datafiles/Data/Assets/Character/Character_Aim.bbanim deleted file mode 100644 index 5727e5a5..00000000 Binary files a/BBMOD_GML/datafiles/Data/Assets/Character/Character_Aim.bbanim and /dev/null differ diff --git a/BBMOD_GML/datafiles/Data/Assets/Character/Character_Idle.bbanim b/BBMOD_GML/datafiles/Data/Assets/Character/Character_Idle.bbanim deleted file mode 100644 index 3979cb87..00000000 Binary files a/BBMOD_GML/datafiles/Data/Assets/Character/Character_Idle.bbanim and /dev/null differ diff --git a/BBMOD_GML/datafiles/Data/Assets/Character/Character_Interact_ground.bbanim b/BBMOD_GML/datafiles/Data/Assets/Character/Character_Interact_ground.bbanim deleted file mode 100644 index d16a85ad..00000000 Binary files a/BBMOD_GML/datafiles/Data/Assets/Character/Character_Interact_ground.bbanim and /dev/null differ diff --git a/BBMOD_GML/datafiles/Data/Assets/Character/Character_Jump.bbanim b/BBMOD_GML/datafiles/Data/Assets/Character/Character_Jump.bbanim deleted file mode 100644 index f9671909..00000000 Binary files a/BBMOD_GML/datafiles/Data/Assets/Character/Character_Jump.bbanim and /dev/null differ diff --git a/BBMOD_GML/datafiles/Data/Assets/Character/Character_PunchLeft.bbanim b/BBMOD_GML/datafiles/Data/Assets/Character/Character_PunchLeft.bbanim deleted file mode 100644 index 763e10c5..00000000 Binary files a/BBMOD_GML/datafiles/Data/Assets/Character/Character_PunchLeft.bbanim and /dev/null differ diff --git a/BBMOD_GML/datafiles/Data/Assets/Character/Character_PunchRight.bbanim b/BBMOD_GML/datafiles/Data/Assets/Character/Character_PunchRight.bbanim deleted file mode 100644 index de8e799b..00000000 Binary files a/BBMOD_GML/datafiles/Data/Assets/Character/Character_PunchRight.bbanim and /dev/null differ diff --git a/BBMOD_GML/datafiles/Data/Assets/Character/Character_Run.bbanim b/BBMOD_GML/datafiles/Data/Assets/Character/Character_Run.bbanim deleted file mode 100644 index 03ec01cb..00000000 Binary files a/BBMOD_GML/datafiles/Data/Assets/Character/Character_Run.bbanim and /dev/null differ diff --git a/BBMOD_GML/datafiles/Data/Assets/Character/Character_Shoot.bbanim b/BBMOD_GML/datafiles/Data/Assets/Character/Character_Shoot.bbanim deleted file mode 100644 index f46328e3..00000000 Binary files a/BBMOD_GML/datafiles/Data/Assets/Character/Character_Shoot.bbanim and /dev/null differ diff --git a/BBMOD_GML/datafiles/Data/Assets/Character/Character_Walk.bbanim b/BBMOD_GML/datafiles/Data/Assets/Character/Character_Walk.bbanim deleted file mode 100644 index f73c9f1e..00000000 Binary files a/BBMOD_GML/datafiles/Data/Assets/Character/Character_Walk.bbanim and /dev/null differ diff --git a/BBMOD_GML/datafiles/Data/Assets/Character/Character_log.txt b/BBMOD_GML/datafiles/Data/Assets/Character/Character_log.txt deleted file mode 100644 index 07c34cb2..00000000 --- a/BBMOD_GML/datafiles/Data/Assets/Character/Character_log.txt +++ /dev/null @@ -1,64 +0,0 @@ -Vertex format: -============== -Position 3D -Normal -Texture coords -Tangent & bitangent sign -Bone indices and weights - -Nodes: -====== -32: RootNode - 33: Character [1 mesh(es)] - 34: RootNode - 35: Root - 36: LeftFootCtrl - 37: LeftHeelRoll - 38: LeftToeRoll - 39: LeftFootIK - 40: LeftFootRollCtrl - 41: LeftKneeCtrl - 42: RightFootCtrl - 43: RightHeelRoll - 44: RightToeRoll - 45: RightFootIK - 46: RightFootRollCtrl - 47: RightKneeCtrl - 48: HipsCtrl - 0: Hips [bone] - 1: Spine [bone] - 2: Chest [bone] - 3: UpperChest [bone] - 4: Neck [bone] - 5: Head [bone] - 6: LeftShoulder [bone] - 7: LeftArm [bone] - 8: LeftForeArm [bone] - 9: LeftHand [bone] - 10: LeftHandIndex1 [bone] - 11: LeftHandIndex2 [bone] - 12: LeftHandIndex3 [bone] - 13: LeftHandThumb1 [bone] - 14: LeftHandThumb2 [bone] - 15: RightShoulder [bone] - 16: RightArm [bone] - 17: RightForeArm [bone] - 18: RightHand [bone] - 19: RightHandIndex1 [bone] - 20: RightHandIndex2 [bone] - 21: RightHandIndex3 [bone] - 22: RightHandThumb1 [bone] - 23: RightHandThumb2 [bone] - 24: LeftUpLeg [bone] - 25: LeftLeg [bone] - 26: LeftFoot [bone] - 27: LeftToes [bone] - 28: RightUpLeg [bone] - 29: RightLeg [bone] - 30: RightFoot [bone] - 31: RightToes [bone] - -Materials: -========== -0: skin - diff --git a/BBMOD_GML/datafiles/Data/Assets/Character/Zombie_Attack.bbanim b/BBMOD_GML/datafiles/Data/Assets/Character/Zombie_Attack.bbanim deleted file mode 100644 index 52cb0700..00000000 Binary files a/BBMOD_GML/datafiles/Data/Assets/Character/Zombie_Attack.bbanim and /dev/null differ diff --git a/BBMOD_GML/datafiles/Data/Assets/Character/Zombie_Death.bbanim b/BBMOD_GML/datafiles/Data/Assets/Character/Zombie_Death.bbanim deleted file mode 100644 index b35af83f..00000000 Binary files a/BBMOD_GML/datafiles/Data/Assets/Character/Zombie_Death.bbanim and /dev/null differ diff --git a/BBMOD_GML/datafiles/Data/Assets/Character/Zombie_Idle.bbanim b/BBMOD_GML/datafiles/Data/Assets/Character/Zombie_Idle.bbanim deleted file mode 100644 index bad5c1df..00000000 Binary files a/BBMOD_GML/datafiles/Data/Assets/Character/Zombie_Idle.bbanim and /dev/null differ diff --git a/BBMOD_GML/datafiles/Data/Assets/Character/Zombie_Walk.bbanim b/BBMOD_GML/datafiles/Data/Assets/Character/Zombie_Walk.bbanim deleted file mode 100644 index eb8b431b..00000000 Binary files a/BBMOD_GML/datafiles/Data/Assets/Character/Zombie_Walk.bbanim and /dev/null differ diff --git a/BBMOD_GML/datafiles/Data/Assets/Pistol.obj b/BBMOD_GML/datafiles/Data/Assets/Pistol.obj deleted file mode 100644 index da3d9c55..00000000 --- a/BBMOD_GML/datafiles/Data/Assets/Pistol.obj +++ /dev/null @@ -1,1075 +0,0 @@ -# Blender v2.83.1 OBJ File: '' -# www.blender.org -mtllib Pistol.mtl -o pistol -v -0.361714 -0.045000 0.228741 -v -0.361714 -0.045000 0.150741 -v 0.052286 -0.045000 0.150741 -v 0.052286 -0.045000 0.228741 -v -0.361714 0.045000 0.228741 -v -0.361714 0.045000 0.150741 -v -0.361714 0.039000 0.150741 -v -0.361714 0.039000 0.222741 -v -0.361714 -0.039000 0.222741 -v -0.361714 -0.039000 0.150741 -v -0.061714 0.045000 0.228741 -v 0.052286 0.045000 0.228741 -v 0.052286 0.045000 0.150741 -v -0.139714 0.045000 0.228741 -v -0.139714 0.045000 0.198741 -v -0.061714 0.045000 0.198741 -v -0.061714 -0.015000 0.228741 -v -0.139714 -0.015000 0.228741 -v -0.061714 -0.015000 0.222741 -v -0.061714 0.039000 0.198741 -v -0.061714 0.039000 0.222741 -v -0.139714 -0.015000 0.222741 -v 0.052286 -0.039000 0.222741 -v -0.355714 -0.039000 0.222741 -v -0.355714 0.039000 0.222741 -v -0.139714 0.039000 0.222741 -v 0.052286 0.039000 0.222741 -v 0.052286 -0.039000 0.150741 -v -0.355714 -0.039000 0.150741 -v 0.052286 0.039000 0.150741 -v -0.355714 0.039000 0.150741 -v -0.139714 0.039000 0.198741 -v 0.088286 0.039000 -0.107259 -v 0.088286 -0.039000 -0.107259 -v -0.031714 -0.039000 -0.107259 -v -0.031714 0.039000 -0.107259 -v 0.094286 -0.045000 -0.107259 -v 0.094286 0.045000 -0.107259 -v -0.037714 0.045000 -0.107259 -v 0.094287 0.045000 -0.131259 -v -0.037714 0.045000 -0.131259 -v 0.094287 -0.045000 -0.131259 -v -0.037714 -0.045000 -0.107259 -v -0.037714 -0.045000 -0.131259 -v -0.355714 0.039000 0.120741 -v -0.355714 0.039000 0.222741 -v 0.058286 0.039000 0.222741 -v 0.058286 0.039000 0.120741 -v 0.028286 0.039000 0.120741 -v -0.091714 0.039000 0.120741 -v -0.355714 0.028978 0.178976 -v -0.355714 0.025981 0.171741 -v -0.355714 0.021213 0.165528 -v -0.355714 0.015000 0.160760 -v -0.355714 0.007765 0.157763 -v -0.355714 0.000000 0.156741 -v -0.355714 -0.007765 0.157763 -v -0.355714 -0.015000 0.160760 -v -0.355714 -0.039000 0.120741 -v -0.355714 -0.021213 0.165528 -v -0.355714 -0.025981 0.171741 -v -0.355714 -0.028978 0.178976 -v -0.355714 -0.039000 0.222741 -v 0.058286 -0.039000 0.222741 -v -0.091714 -0.039000 0.120741 -v 0.028286 -0.039000 0.120741 -v 0.058286 -0.039000 0.120741 -v -0.355714 0.000000 0.216741 -v -0.355714 0.007765 0.215719 -v -0.355714 0.015000 0.212722 -v -0.355714 0.021213 0.207954 -v -0.355714 0.025981 0.201741 -v -0.355714 0.028978 0.194506 -v -0.355714 0.030000 0.186741 -v -0.367714 0.030000 0.186741 -v -0.367714 0.028978 0.178976 -v -0.367714 0.028978 0.194506 -v -0.367714 0.025981 0.201741 -v -0.367714 0.021213 0.207954 -v -0.367714 0.015000 0.212722 -v -0.367714 0.007765 0.215719 -v -0.367714 0.000000 0.216741 -v -0.367714 -0.007765 0.215719 -v -0.355714 -0.007765 0.215719 -v -0.367714 -0.015000 0.212722 -v -0.355714 -0.015000 0.212722 -v -0.367714 -0.021213 0.207954 -v -0.355714 -0.021213 0.207954 -v -0.367714 -0.025981 0.201741 -v -0.355714 -0.025981 0.201741 -v -0.367714 -0.028978 0.194506 -v -0.355714 -0.028978 0.194506 -v -0.367714 -0.030000 0.186741 -v -0.355714 -0.030000 0.186741 -v -0.367714 -0.028978 0.178976 -v -0.367714 -0.025981 0.171741 -v -0.367714 -0.021213 0.165528 -v -0.367714 -0.015000 0.160760 -v -0.367714 -0.007765 0.157763 -v -0.367714 0.000000 0.156741 -v -0.367714 0.007765 0.157763 -v -0.367714 0.015000 0.160760 -v -0.367714 0.021213 0.165528 -v -0.367714 0.025981 0.171741 -v -0.367714 0.020674 0.174805 -v -0.367714 0.016880 0.169861 -v -0.367714 0.011936 0.166067 -v -0.367714 0.006179 0.163682 -v -0.367714 0.000000 0.162869 -v -0.367714 -0.006179 0.163682 -v -0.367714 -0.011936 0.166067 -v -0.367714 -0.016880 0.169861 -v -0.367714 -0.020674 0.174805 -v -0.367714 -0.023059 0.180562 -v -0.367714 -0.023872 0.186741 -v -0.367714 -0.023059 0.192920 -v -0.367714 -0.020674 0.198677 -v -0.367714 -0.016880 0.203621 -v -0.367714 -0.011936 0.207415 -v -0.367714 -0.006179 0.209800 -v -0.367714 0.000000 0.210613 -v -0.367714 0.006179 0.209800 -v -0.367714 0.011936 0.207415 -v -0.367714 0.016880 0.203621 -v -0.367714 0.020674 0.198677 -v -0.367714 0.023059 0.192920 -v -0.367714 0.023872 0.186741 -v -0.367714 0.023059 0.180562 -v -0.355714 0.020674 0.174805 -v -0.355714 0.023059 0.180562 -v -0.355714 0.020674 0.198677 -v -0.355714 0.023059 0.192920 -v -0.355714 0.023872 0.186741 -v -0.355714 0.016880 0.169861 -v -0.355714 0.011936 0.166067 -v -0.355714 0.006179 0.163682 -v -0.355714 0.000000 0.162869 -v -0.355714 -0.006179 0.163682 -v -0.355714 -0.011936 0.166067 -v -0.355714 -0.016880 0.169861 -v -0.355714 -0.020674 0.174805 -v -0.355714 -0.023059 0.180562 -v -0.355714 -0.023872 0.186741 -v -0.355714 -0.023059 0.192920 -v -0.355714 -0.020674 0.198677 -v -0.355714 -0.016880 0.203621 -v -0.355714 -0.011936 0.207415 -v -0.355714 -0.006179 0.209800 -v -0.355714 0.000000 0.210613 -v -0.355714 0.006179 0.209800 -v -0.355714 0.011936 0.207415 -v -0.355714 0.016880 0.203621 -v 0.058286 -0.015000 0.210741 -v 0.058286 -0.015000 0.168741 -v 0.058286 0.015000 0.168741 -v 0.058286 0.015000 0.210741 -v 0.076286 0.015000 0.210741 -v 0.076286 -0.015000 0.210741 -v 0.076286 0.015000 0.186741 -v 0.076286 -0.015000 0.186741 -v -0.170293 -0.024000 0.120741 -v -0.170293 0.024000 0.120741 -v -0.152293 0.024000 0.120741 -v -0.152293 -0.024000 0.120741 -v -0.170293 -0.024000 0.048741 -v -0.072766 -0.024000 0.048741 -v -0.077503 -0.024000 0.066741 -v -0.152293 -0.024000 0.066741 -v -0.170293 0.024000 0.048741 -v -0.152293 0.024000 0.066741 -v -0.077503 0.024000 0.066741 -v -0.072766 0.024000 0.048741 -vt 0.000000 16.929100 -vt 27.165400 22.047199 -vt 0.000000 22.047199 -vt 0.000000 22.047199 -vt 5.511810 21.653500 -vt 5.905510 22.047199 -vt -27.165400 16.929100 -vt -14.566900 20.078699 -vt -19.684999 20.078699 -vt 3.937010 14.566900 -vt 5.905510 0.000000 -vt 5.905510 27.165400 -vt 0.393701 21.653500 -vt 3.937010 22.047199 -vt 0.000000 22.047199 -vt -14.566900 22.047199 -vt -19.684999 21.653500 -vt -14.566900 21.653500 -vt -3.937010 14.566900 -vt -3.937010 19.684999 -vt -5.511810 27.165400 -vt -27.165400 21.653500 -vt -0.393701 16.929100 -vt -0.393701 21.653500 -vt -0.393701 21.653500 -vt 0.000000 22.047199 -vt -5.905510 22.047199 -vt -5.905510 0.000000 -vt -5.511810 0.393701 -vt -5.905510 27.165400 -vt 0.000000 16.929100 -vt -0.393701 0.000000 -vt -5.511810 0.393701 -vt -5.511810 0.000000 -vt 0.000000 16.929100 -vt 0.393701 21.653500 -vt 0.000000 21.653500 -vt -0.393701 0.393701 -vt 0.000000 0.000000 -vt 0.000000 27.165400 -vt 27.165400 16.929100 -vt 19.684999 20.078699 -vt 14.566900 20.078699 -vt 0.000000 14.566900 -vt 0.393701 19.684999 -vt 0.000000 19.684999 -vt -0.393701 21.653500 -vt 0.000000 20.078699 -vt 0.000000 22.047199 -vt -0.393701 18.997801 -vt 0.393701 18.483900 -vt 0.393701 18.997801 -vt -0.393701 19.768700 -vt 0.393701 19.254801 -vt 0.393701 19.768700 -vt -0.393701 19.209801 -vt 0.393701 18.695900 -vt 0.393701 19.209801 -vt -0.393701 17.359301 -vt 0.393701 16.845400 -vt 0.393701 17.359301 -vt -0.393701 14.343300 -vt 0.393701 13.829500 -vt 0.393701 14.343300 -vt -0.393701 10.367400 -vt 0.393701 9.853530 -vt 0.393701 10.367400 -vt -0.393701 5.702460 -vt 0.393701 5.188580 -vt 0.393701 5.702460 -vt 0.393701 -0.666411 -vt -0.393701 -0.152528 -vt -0.393701 -0.666411 -vt 0.393701 4.397540 -vt -0.393701 4.911430 -vt -0.393701 4.397540 -vt 0.393701 9.144300 -vt -0.393701 9.658190 -vt -0.393701 9.144300 -vt 0.393701 13.250400 -vt -0.393701 13.764300 -vt -0.393701 13.250400 -vt 0.393701 16.436001 -vt -0.393701 16.949800 -vt -0.393701 16.436001 -vt 0.393701 18.483900 -vt -0.393701 18.997801 -vt -0.393701 18.483900 -vt 0.393701 19.254801 -vt -0.393701 19.768700 -vt -0.393701 19.254801 -vt 0.393701 18.695900 -vt -0.393701 19.209801 -vt -0.393701 18.695900 -vt 0.393701 16.845400 -vt -0.393701 17.359301 -vt -0.393701 16.845400 -vt 0.393701 13.829500 -vt -0.393701 14.343300 -vt -0.393701 13.829500 -vt 0.393701 9.853530 -vt -0.393701 10.367400 -vt -0.393701 9.853530 -vt 0.393701 5.188580 -vt -0.393701 5.702460 -vt -0.393701 5.188580 -vt -0.393701 -0.152528 -vt 0.393701 -0.666411 -vt 0.393701 -0.152528 -vt -0.393701 4.911430 -vt 0.393701 4.397540 -vt 0.393701 4.911430 -vt -0.393701 9.658190 -vt 0.393701 9.144300 -vt 0.393701 9.658190 -vt -0.393701 13.764300 -vt 0.393701 13.250400 -vt 0.393701 13.764300 -vt -0.393701 16.949800 -vt 0.393701 16.436001 -vt 0.393701 16.949800 -vt 1.247980 18.307100 -vt 1.596190 18.508101 -vt 1.051330 18.781900 -vt 1.845120 18.183701 -vt 2.169540 17.934799 -vt 1.560810 17.899401 -vt 2.547330 17.778299 -vt 2.952760 17.724899 -vt 3.937010 17.586599 -vt 1.968500 17.586599 -vt 2.443270 17.389900 -vt 3.462240 17.389900 -vt 2.952760 17.322800 -vt 4.344700 17.899401 -vt 3.358180 17.778299 -vt 3.735970 17.934799 -vt 4.657530 18.307100 -vt 4.060390 18.183701 -vt 4.309320 18.508101 -vt 4.854180 18.781900 -vt 4.465810 18.885900 -vt 4.921260 19.291300 -vt 4.519180 19.291300 -vt 4.854180 19.800800 -vt 4.465810 19.696800 -vt 4.309320 20.074600 -vt 4.657530 20.275600 -vt 4.060390 20.399000 -vt 4.344700 20.683300 -vt 3.735970 20.647900 -vt 3.358180 20.804399 -vt 3.937010 20.996099 -vt 2.952760 20.857800 -vt 1.968500 20.996099 -vt 2.443270 21.192801 -vt 3.462240 21.192801 -vt 2.952760 21.259800 -vt 2.547330 20.804399 -vt 1.560810 20.683300 -vt 2.169540 20.647900 -vt 1.845120 20.399000 -vt 1.247980 20.275600 -vt 1.596190 20.074600 -vt 1.051330 19.800800 -vt 1.439700 19.696800 -vt 0.984252 19.291300 -vt 1.386330 19.291300 -vt 1.439700 18.885900 -vt 0.393701 16.897400 -vt -0.393701 16.488400 -vt 0.393701 16.488400 -vt 0.393701 19.157301 -vt -0.393701 18.748400 -vt 0.393701 18.748400 -vt 0.393701 17.306801 -vt -0.393701 16.897900 -vt 0.393701 16.897900 -vt 0.393701 14.290900 -vt -0.393701 13.881900 -vt 0.393701 13.881900 -vt 0.393701 10.314900 -vt -0.393701 9.906010 -vt 0.393701 9.906010 -vt 0.393701 5.649980 -vt -0.393701 5.241060 -vt 0.393701 5.241060 -vt -0.393701 -0.613929 -vt 0.393701 -0.205010 -vt -0.393701 -0.205010 -vt -0.393701 4.450030 -vt 0.393701 4.858940 -vt -0.393701 4.858940 -vt -0.393701 9.196780 -vt 0.393701 9.605700 -vt -0.393701 9.605700 -vt -0.393701 13.302900 -vt 0.393701 13.711800 -vt -0.393701 13.711800 -vt -0.393701 16.488400 -vt 0.393701 16.897400 -vt -0.393701 16.897400 -vt -0.393701 18.536400 -vt 0.393701 18.945299 -vt -0.393701 18.945299 -vt -0.393701 19.307301 -vt 0.393701 19.716200 -vt -0.393701 19.716200 -vt -0.393701 18.748400 -vt 0.393701 19.157301 -vt -0.393701 19.157301 -vt -0.393701 16.897900 -vt 0.393701 17.306801 -vt -0.393701 17.306801 -vt -0.393701 13.881900 -vt 0.393701 14.290900 -vt -0.393701 14.290900 -vt -0.393701 9.906010 -vt 0.393701 10.314900 -vt -0.393701 10.314900 -vt -0.393701 5.241060 -vt 0.393701 5.649980 -vt -0.393701 5.649980 -vt 0.393701 -0.205010 -vt -0.393701 -0.613929 -vt 0.393701 -0.613929 -vt 0.393701 4.858940 -vt -0.393701 4.450030 -vt 0.393701 4.450030 -vt 0.393701 9.605700 -vt -0.393701 9.196780 -vt 0.393701 9.196780 -vt 0.393701 13.711800 -vt -0.393701 13.302900 -vt 0.393701 13.302900 -vt 0.393701 19.716200 -vt -0.393701 19.307301 -vt 0.393701 19.307301 -vt 0.393701 18.945299 -vt -0.393701 18.536400 -vt 0.393701 18.536400 -vt 1.968500 27.559099 -vt 3.937010 28.740200 -vt 1.968500 28.740200 -vt -27.559099 20.866100 -vt -28.740200 19.291300 -vt -27.559099 18.110201 -vt -1.968500 20.866100 -vt -3.937010 19.291300 -vt -1.968500 19.291300 -vt 28.740200 19.291300 -vt 27.559099 20.866100 -vt 27.559099 18.110201 -vt -1.968500 33.963402 -vt -3.937010 32.293098 -vt -1.968500 32.293098 -vt -0.393701 25.590599 -vt -5.511810 27.559099 -vt -5.511810 25.590599 -vt 13.741500 11.417300 -vt 12.560400 14.960600 -vt 12.560400 10.236200 -vt 1.377950 14.960600 -vt 4.527560 10.236200 -vt 4.527560 14.960600 -vt -13.741500 11.417300 -vt -18.959801 10.236200 -vt -12.560400 10.236200 -vt -4.527560 11.417300 -vt -1.377950 14.960600 -vt -4.527560 14.960600 -vt 4.527560 13.741500 -vt 1.377950 18.649000 -vt 1.377950 13.741500 -vt -1.377950 18.959801 -vt -4.527560 12.560400 -vt -1.377950 12.560400 -vt 27.165400 16.929100 -vt 0.000000 16.929100 -vt 0.393701 21.653500 -vt 0.393701 16.929100 -vt 5.511810 16.929100 -vt 5.905510 16.929100 -vt -19.684999 22.047199 -vt -27.165400 22.047199 -vt -14.566900 22.047199 -vt 0.000000 27.165400 -vt 3.937010 19.684999 -vt 0.000000 19.684999 -vt 0.000000 14.566900 -vt 0.000000 0.000000 -vt 3.937010 21.653500 -vt 0.000000 20.078699 -vt 0.393701 20.078699 -vt -19.684999 22.047199 -vt -0.393701 0.393701 -vt -0.393701 14.566900 -vt -0.393701 19.684999 -vt -0.393701 27.165400 -vt -27.165400 16.929100 -vt -5.905510 16.929100 -vt -5.511810 21.653500 -vt -5.511810 16.929100 -vt -0.393701 16.929100 -vt 0.000000 16.929100 -vt -5.511810 0.000000 -vt -5.511810 27.165400 -vt 0.000000 21.653500 -vt 0.393701 16.929100 -vt -0.393701 27.165400 -vt -0.393701 0.000000 -vt 14.566900 21.653500 -vt 27.165400 21.653500 -vt 19.684999 21.653500 -vt 0.393701 14.566900 -vt -3.937010 22.047199 -vt -3.937010 21.653500 -vt -0.393701 20.078699 -vt -0.393701 18.483900 -vt -0.393701 19.254801 -vt -0.393701 18.695900 -vt -0.393701 16.845400 -vt -0.393701 13.829500 -vt -0.393701 9.853530 -vt -0.393701 5.188580 -vt 0.393701 -0.152528 -vt 0.393701 4.911430 -vt 0.393701 9.658190 -vt 0.393701 13.764300 -vt 0.393701 16.949800 -vt 0.393701 18.997801 -vt 0.393701 19.768700 -vt 0.393701 19.209801 -vt 0.393701 17.359301 -vt 0.393701 14.343300 -vt 0.393701 10.367400 -vt 0.393701 5.702460 -vt -0.393701 -0.666411 -vt -0.393701 4.397540 -vt -0.393701 9.144300 -vt -0.393701 13.250400 -vt -0.393701 16.436001 -vt -0.393701 16.897400 -vt -0.393701 19.157301 -vt -0.393701 17.306801 -vt -0.393701 14.290900 -vt -0.393701 10.314900 -vt -0.393701 5.649980 -vt 0.393701 -0.613929 -vt 0.393701 4.450030 -vt 0.393701 9.196780 -vt 0.393701 13.302900 -vt 0.393701 16.488400 -vt 0.393701 18.536400 -vt 0.393701 19.307301 -vt 0.393701 18.748400 -vt 0.393701 16.897900 -vt 0.393701 13.881900 -vt 0.393701 9.906010 -vt 0.393701 5.241060 -vt -0.393701 -0.205010 -vt -0.393701 4.858940 -vt -0.393701 9.605700 -vt -0.393701 13.711800 -vt -0.393701 19.716200 -vt -0.393701 18.945299 -vt 3.937010 27.559099 -vt -28.740200 20.866100 -vt -3.937010 20.866100 -vt 28.740200 20.866100 -vt -3.937010 33.963402 -vt -0.393701 27.559099 -vt 13.741500 14.960600 -vt 18.959801 10.236200 -vt 18.649000 11.417300 -vt 1.377950 10.236200 -vt -12.560400 14.960600 -vt -13.741500 14.960600 -vt -18.649000 11.417300 -vt -1.377950 11.417300 -vt 4.527560 18.649000 -vt -4.527560 18.959801 -vt -5.511810 29.527599 -vt -0.393701 21.653500 -vt -0.393701 29.527599 -vt 5.905510 29.921301 -vt 0.393701 29.527599 -vt 5.511810 29.527599 -vt 0.000000 29.921301 -vt 0.000000 21.259800 -vt -29.921301 -0.000000 -vt -21.259800 -1.574800 -vt -21.259800 -0.000000 -vt -5.905510 0.000000 -vt 0.000000 -1.574800 -vt 0.000000 0.000000 -vt 21.259800 0.000000 -vt 29.921301 -1.574800 -vt 29.921301 0.000000 -vt 5.511810 21.653500 -vt 5.905510 21.259800 -vt 0.393701 21.653500 -vt -25.590599 14.960600 -vt -21.653500 -0.000000 -vt -17.716499 14.960600 -vt 0.393701 14.960600 -vt 1.051330 18.781900 -vt 0.393701 21.653500 -vt 1.247980 18.307100 -vt 1.560810 17.899401 -vt 1.968500 17.586599 -vt 2.443270 17.389900 -vt 2.952760 17.322800 -vt 3.462240 17.389900 -vt 3.937010 17.586599 -vt 5.511810 14.960600 -vt 4.344700 17.899401 -vt 4.657530 18.307100 -vt 4.854180 18.781900 -vt 5.511810 21.653500 -vt 21.653500 0.000000 -vt 29.527599 0.000000 -vt 25.590599 14.960600 -vt 0.393701 0.393701 -vt 5.511810 27.559099 -vt 0.393701 27.559099 -vt 2.952760 21.259800 -vt 2.443270 21.192801 -vt 1.968500 20.996099 -vt 1.560810 20.683300 -vt 1.247980 20.275600 -vt 1.051330 19.800800 -vt 0.984252 19.291300 -vt 4.921260 19.291300 -vt 4.854180 19.800800 -vt 4.657530 20.275600 -vt 4.344700 20.683300 -vt 3.937010 20.996099 -vt 3.462240 21.192801 -vt -5.511810 21.653500 -vt -3.937010 20.866100 -vt -0.393701 21.653500 -vt -3.937010 18.110201 -vt -5.511810 14.960600 -vt -1.968500 18.110201 -vt -0.393701 14.960600 -vt -1.968500 20.866100 -vt -0.393701 -7.514570 -vt -5.511810 7.955420 -vt -5.511810 -7.514570 -vt -5.511810 0.393701 -vt -4.527560 12.560400 -vt -5.511810 17.716499 -vt -1.377950 12.560400 -vt -0.393701 0.393701 -vt -0.393701 17.716499 -vt -1.377950 13.741500 -vt -4.527560 13.741500 -vt 1.377950 5.074050 -vt 4.527560 6.295360 -vt 1.377950 6.295360 -vt 0.393701 9.959300 -vt 0.393701 -5.510680 -vt 4.527560 5.074050 -vt 5.511810 -5.510680 -vt 5.511810 9.959300 -vt 0.000000 0.000000 -vt 5.905510 -1.574800 -vt 5.905510 0.000000 -vt -0.000000 21.259800 -vt -5.905510 29.921301 -vt -5.905510 21.259800 -vt -5.511810 21.653500 -vt -29.921301 -1.574800 -vt -5.905510 -1.574800 -vt 21.259800 -1.574800 -vt -0.393701 14.960600 -vt -0.393701 21.653500 -vt -27.559099 21.653500 -vt -27.559099 14.960600 -vt -29.527599 -0.000000 -vt 27.559099 14.960600 -vt 27.559099 21.653500 -vt 0.393701 21.653500 -vt 17.716499 14.960600 -vt 0.393701 14.960600 -vt 5.511810 0.393701 -vt -0.393701 7.955420 -vt 0.000000 -1.574800 -vt 0.000000 29.921301 -vt 4.060390 18.183701 -vt 4.465810 19.696800 -vt 1.845120 20.399000 -vt 1.596190 20.074600 -vt 1.439700 19.696800 -vt 1.386330 19.291300 -vt 1.439700 18.885900 -vt 1.596190 18.508101 -vt 1.845120 18.183701 -vt 2.169540 17.934799 -vt 2.547330 17.778299 -vt 2.952760 17.724899 -vt 3.358180 17.778299 -vt 3.735970 17.934799 -vt 4.309320 18.508101 -vt 4.465810 18.885900 -vt 4.519180 19.291300 -vt 4.309320 20.074600 -vt 4.060390 20.399000 -vt 3.735970 20.647900 -vt 3.358180 20.804399 -vt 2.952760 20.857800 -vt 2.547330 20.804399 -vt 2.169540 20.647900 -vn 0.0000 -1.0000 -0.0000 -vn -1.0000 0.0000 -0.0000 -vn 0.0000 1.0000 0.0000 -vn -0.0000 0.0000 1.0000 -vn 0.0000 0.0000 -1.0000 -vn 1.0000 0.0000 0.0000 -vn 0.0000 0.9659 -0.2588 -vn 0.0000 0.9659 0.2588 -vn 0.0000 0.8660 0.5000 -vn 0.0000 0.7071 0.7071 -vn 0.0000 0.5000 0.8660 -vn 0.0000 0.2588 0.9659 -vn 0.0000 -0.2588 0.9659 -vn 0.0000 -0.5000 0.8660 -vn 0.0000 -0.7071 0.7071 -vn 0.0000 -0.8660 0.5000 -vn 0.0000 -0.9659 0.2588 -vn 0.0000 -0.9659 -0.2588 -vn 0.0000 -0.8660 -0.5000 -vn 0.0000 -0.7071 -0.7071 -vn 0.0000 -0.5000 -0.8660 -vn 0.0000 -0.2588 -0.9659 -vn 0.0000 0.2588 -0.9659 -vn 0.0000 0.5000 -0.8660 -vn 0.0000 0.7071 -0.7071 -vn 0.0000 0.8660 -0.5000 -vn -1.0000 -0.0001 0.0000 -vn 0.7071 0.0000 -0.7071 -vn -1.0000 0.0001 0.0000 -vn 0.9671 0.0000 0.2545 -vn -0.9671 0.0000 -0.2545 -usemtl Gray4 -s 1 -f 2/1/1 4/2/1 1/3/1 -f 5/4/2 9/5/2 1/6/2 -f 13/7/3 15/8/3 16/9/3 -f 18/10/4 1/11/4 4/12/4 -f 21/13/2 17/14/2 11/15/2 -f 18/16/3 19/17/3 22/18/3 -f 22/19/5 19/20/5 23/21/5 -f 23/22/3 29/23/3 24/24/3 -f 27/25/6 12/26/6 4/27/6 -f 2/28/5 29/29/5 3/30/5 -f 10/31/3 24/24/3 29/23/3 -f 8/32/5 24/33/5 9/34/5 -f 7/35/1 25/36/1 8/37/1 -f 31/38/5 6/39/5 13/40/5 -f 30/41/1 20/42/1 32/43/1 -f 15/44/4 20/45/4 16/46/4 -f 26/47/6 15/48/6 14/49/6 -f 74/50/3 76/51/7 75/52/3 -f 73/53/8 75/54/3 77/55/8 -f 72/56/9 77/57/8 78/58/9 -f 71/59/10 78/60/9 79/61/10 -f 70/62/11 79/63/10 80/64/11 -f 69/65/12 80/66/11 81/67/12 -f 68/68/4 81/69/12 82/70/4 -f 84/71/13 82/72/4 83/73/13 -f 86/74/14 83/75/13 85/76/14 -f 88/77/15 85/78/14 87/79/15 -f 90/80/16 87/81/15 89/82/16 -f 92/83/17 89/84/16 91/85/17 -f 94/86/1 91/87/17 93/88/1 -f 62/89/18 93/90/1 95/91/18 -f 61/92/19 95/93/18 96/94/19 -f 60/95/20 96/96/19 97/97/20 -f 58/98/21 97/99/20 98/100/21 -f 57/101/22 98/102/21 99/103/22 -f 56/104/5 99/105/22 100/106/5 -f 55/107/23 100/108/5 101/109/23 -f 54/110/24 101/111/23 102/112/24 -f 53/113/25 102/114/24 103/115/25 -f 52/116/26 103/117/25 104/118/26 -f 51/119/7 104/120/26 76/121/7 -f 104/122/2 105/123/2 76/124/2 -f 104/122/2 106/125/2 105/123/2 -f 104/122/2 107/126/2 106/125/2 -f 103/127/2 107/126/2 104/122/2 -f 103/127/2 108/128/27 107/126/2 -f 103/127/2 109/129/2 108/128/27 -f 103/127/2 98/130/2 109/129/2 -f 102/131/2 98/130/2 103/127/2 -f 101/132/2 98/130/2 102/131/2 -f 101/132/2 99/133/2 98/130/2 -f 99/133/2 101/132/2 100/134/2 -f 97/135/2 109/129/2 98/130/2 -f 109/129/2 97/135/2 110/136/2 -f 110/136/2 97/135/2 111/137/2 -f 111/137/2 97/135/2 96/138/2 -f 111/137/2 96/138/2 112/139/2 -f 112/139/2 96/138/2 113/140/2 -f 113/140/2 96/138/2 95/141/2 -f 113/140/2 95/141/2 114/142/2 -f 114/142/2 95/141/2 93/143/2 -f 114/142/2 93/143/2 115/144/2 -f 115/144/2 93/143/2 91/145/2 -f 115/144/2 91/145/2 116/146/2 -f 116/146/2 91/145/2 117/147/2 -f 117/147/2 91/145/2 89/148/2 -f 117/147/2 89/148/2 118/149/2 -f 118/149/2 89/148/2 87/150/2 -f 118/149/2 87/150/2 119/151/2 -f 119/151/2 87/150/2 120/152/2 -f 120/152/2 87/150/2 85/153/2 -f 120/152/2 85/153/2 121/154/2 -f 121/154/2 85/153/2 80/155/2 -f 80/155/2 85/153/2 81/156/2 -f 81/156/2 85/153/2 83/157/2 -f 81/156/2 83/157/2 82/158/2 -f 80/155/2 122/159/2 121/154/2 -f 79/160/2 122/159/2 80/155/2 -f 79/160/2 123/161/2 122/159/2 -f 79/160/2 124/162/2 123/161/2 -f 78/163/2 124/162/2 79/160/2 -f 78/163/2 125/164/2 124/162/2 -f 77/165/2 125/164/2 78/163/2 -f 77/165/2 126/166/2 125/164/2 -f 75/167/2 126/166/2 77/165/2 -f 75/167/2 127/168/2 126/166/2 -f 75/167/2 128/169/2 127/168/2 -f 76/124/2 128/169/2 75/167/2 -f 76/124/2 105/123/2 128/169/2 -f 130/170/17 105/171/16 129/172/16 -f 131/173/19 126/174/18 132/175/18 -f 152/176/20 125/177/19 131/178/19 -f 151/179/21 124/180/20 152/181/20 -f 150/182/22 123/183/21 151/184/21 -f 149/185/5 122/186/22 150/187/22 -f 148/188/23 121/189/5 149/190/5 -f 147/191/24 120/192/23 148/193/23 -f 146/194/25 119/195/24 147/196/24 -f 145/197/26 118/198/25 146/199/25 -f 144/200/7 117/201/26 145/202/26 -f 143/203/3 116/204/7 144/205/7 -f 142/206/8 115/207/3 143/208/3 -f 141/209/9 114/210/8 142/211/8 -f 140/212/10 113/213/9 141/214/9 -f 139/215/11 112/216/10 140/217/10 -f 138/218/12 111/219/11 139/220/11 -f 137/221/4 110/222/12 138/223/12 -f 136/224/13 109/225/4 137/226/4 -f 135/227/14 108/228/13 136/229/13 -f 134/230/15 107/231/14 135/232/14 -f 129/233/16 106/234/15 134/235/15 -f 132/236/18 127/237/1 133/238/1 -f 133/239/1 128/240/17 130/241/17 -f 156/242/4 158/243/4 157/244/4 -f 156/245/3 159/246/3 155/247/3 -f 157/248/6 160/249/6 159/250/6 -f 160/251/1 153/252/1 154/253/1 -f 159/254/28 154/255/28 155/256/28 -f 49/257/5 67/258/5 66/259/5 -f 168/260/1 161/261/1 165/262/1 -f 162/263/2 165/264/2 161/265/2 -f 170/266/3 172/267/3 169/268/3 -f 168/269/6 163/270/6 164/271/6 -f 168/272/4 171/273/4 170/274/4 -f 172/275/5 165/276/5 169/277/5 -f 2/1/1 3/278/1 4/2/1 -f 5/4/2 6/279/2 8/280/2 -f 6/279/2 7/281/2 8/280/2 -f 10/282/2 2/283/2 9/5/2 -f 2/283/2 1/6/2 9/5/2 -f 5/4/2 8/280/2 9/5/2 -f 16/9/3 11/284/3 12/285/3 -f 13/7/3 6/279/3 15/8/3 -f 6/279/3 5/4/3 15/8/3 -f 5/4/3 14/286/3 15/8/3 -f 16/9/3 12/285/3 13/7/3 -f 4/12/4 12/287/4 17/288/4 -f 12/287/4 11/289/4 17/288/4 -f 14/290/4 5/291/4 18/10/4 -f 5/291/4 1/11/4 18/10/4 -f 4/12/4 17/288/4 18/10/4 -f 21/13/2 19/292/2 17/14/2 -f 11/15/2 16/293/2 21/13/2 -f 16/293/2 20/294/2 21/13/2 -f 18/16/3 17/295/3 19/17/3 -f 24/33/5 25/296/5 22/19/5 -f 25/296/5 26/297/5 22/19/5 -f 21/298/5 27/299/5 19/20/5 -f 27/299/5 23/21/5 19/20/5 -f 24/33/5 22/19/5 23/21/5 -f 23/22/3 28/300/3 29/23/3 -f 4/27/6 3/301/6 23/302/6 -f 3/301/6 28/303/6 23/302/6 -f 30/304/6 13/305/6 27/25/6 -f 13/305/6 12/26/6 27/25/6 -f 4/27/6 23/302/6 27/25/6 -f 10/306/5 29/29/5 2/28/5 -f 29/29/5 28/307/5 3/30/5 -f 10/31/3 9/308/3 24/24/3 -f 8/32/5 25/296/5 24/33/5 -f 7/35/1 31/309/1 25/36/1 -f 13/40/5 30/310/5 31/38/5 -f 31/38/5 7/311/5 6/39/5 -f 32/43/1 26/312/1 25/36/1 -f 25/36/1 31/309/1 32/43/1 -f 31/309/1 30/41/1 32/43/1 -f 30/41/1 27/313/1 20/42/1 -f 27/313/1 21/314/1 20/42/1 -f 15/44/4 32/315/4 20/45/4 -f 18/316/6 22/317/6 26/47/6 -f 26/47/6 32/318/6 15/48/6 -f 14/49/6 18/316/6 26/47/6 -f 74/50/3 51/319/7 76/51/7 -f 73/53/8 74/320/3 75/54/3 -f 72/56/9 73/321/8 77/57/8 -f 71/59/10 72/322/9 78/60/9 -f 70/62/11 71/323/10 79/63/10 -f 69/65/12 70/324/11 80/66/11 -f 68/68/4 69/325/12 81/69/12 -f 84/71/13 68/326/4 82/72/4 -f 86/74/14 84/327/13 83/75/13 -f 88/77/15 86/328/14 85/78/14 -f 90/80/16 88/329/15 87/81/15 -f 92/83/17 90/330/16 89/84/16 -f 94/86/1 92/331/17 91/87/17 -f 62/89/18 94/332/1 93/90/1 -f 61/92/19 62/333/18 95/93/18 -f 60/95/20 61/334/19 96/96/19 -f 58/98/21 60/335/20 97/99/20 -f 57/101/22 58/336/21 98/102/21 -f 56/104/5 57/337/22 99/105/22 -f 55/107/23 56/338/5 100/108/5 -f 54/110/24 55/339/23 101/111/23 -f 53/113/25 54/340/24 102/114/24 -f 52/116/26 53/341/25 103/117/25 -f 51/119/7 52/342/26 104/120/26 -f 130/170/17 128/343/17 105/171/16 -f 131/173/19 125/344/19 126/174/18 -f 152/176/20 124/345/20 125/177/19 -f 151/179/21 123/346/21 124/180/20 -f 150/182/22 122/347/22 123/183/21 -f 149/185/5 121/348/5 122/186/22 -f 148/188/23 120/349/23 121/189/5 -f 147/191/24 119/350/24 120/192/23 -f 146/194/25 118/351/25 119/195/24 -f 145/197/26 117/352/26 118/198/25 -f 144/200/7 116/353/7 117/201/26 -f 143/203/3 115/354/3 116/204/7 -f 142/206/8 114/355/8 115/207/3 -f 141/209/9 113/356/9 114/210/8 -f 140/212/10 112/357/10 113/213/9 -f 139/215/11 111/358/11 112/216/10 -f 138/218/12 110/359/12 111/219/11 -f 137/221/4 109/360/4 110/222/12 -f 136/224/13 108/361/13 109/225/4 -f 135/227/14 107/362/14 108/228/13 -f 134/230/15 106/363/15 107/231/14 -f 129/233/16 105/364/16 106/234/15 -f 132/236/18 126/365/18 127/237/1 -f 133/239/1 127/366/1 128/240/17 -f 156/242/4 153/367/4 158/243/4 -f 156/245/3 157/368/3 159/246/3 -f 157/248/6 158/369/6 160/249/6 -f 160/251/1 158/370/1 153/252/1 -f 159/254/28 160/371/28 154/255/28 -f 49/257/5 48/372/5 67/258/5 -f 168/260/1 164/373/1 161/261/1 -f 165/262/1 166/374/1 168/260/1 -f 166/374/1 167/375/1 168/260/1 -f 162/263/2 169/376/2 165/264/2 -f 169/268/3 162/377/3 170/266/3 -f 162/377/3 163/378/3 170/266/3 -f 170/266/3 171/379/3 172/267/3 -f 168/269/6 170/380/6 163/270/6 -f 168/272/4 167/381/4 171/273/4 -f 172/275/5 166/382/5 165/276/5 -usemtl Gray6 -f 34/383/5 36/384/5 33/385/5 -f 37/386/4 33/387/4 34/388/4 -f 38/389/4 33/387/4 37/386/4 -f 33/387/4 38/389/4 39/390/4 -f 38/391/3 41/392/3 39/393/3 -f 37/394/6 40/395/6 38/396/6 -f 43/397/1 42/398/1 37/399/1 -f 35/400/4 43/401/4 37/386/4 -f 36/402/4 43/401/4 35/400/4 -f 36/402/4 39/390/4 43/401/4 -f 39/390/4 36/402/4 33/387/4 -f 49/403/3 36/404/3 50/405/3 -f 45/406/2 51/407/2 46/408/2 -f 51/407/2 45/406/2 52/409/2 -f 52/409/2 45/406/2 53/410/2 -f 53/410/2 45/406/2 54/411/2 -f 54/411/2 45/406/2 55/412/2 -f 55/412/2 45/406/2 56/413/2 -f 45/406/2 57/414/2 56/413/2 -f 45/406/2 58/415/2 57/414/2 -f 59/416/2 58/415/2 45/406/2 -f 58/415/2 59/416/2 60/417/2 -f 60/417/2 59/416/2 61/418/2 -f 61/418/2 59/416/2 62/419/2 -f 62/419/2 59/416/2 63/420/2 -f 35/421/1 34/422/1 66/423/1 -f 46/424/4 64/425/4 47/426/4 -f 46/408/2 68/427/2 63/420/2 -f 46/408/2 69/428/2 68/427/2 -f 46/408/2 70/429/2 69/428/2 -f 46/408/2 71/430/2 70/429/2 -f 46/408/2 72/431/2 71/430/2 -f 46/408/2 73/432/2 72/431/2 -f 46/408/2 74/433/2 73/432/2 -f 46/408/2 51/407/2 74/433/2 -f 62/419/2 63/420/2 94/434/29 -f 94/434/29 63/420/2 92/435/2 -f 92/435/2 63/420/2 90/436/2 -f 90/436/2 63/420/2 88/437/2 -f 88/437/2 63/420/2 86/438/2 -f 86/438/2 63/420/2 84/439/2 -f 84/439/2 63/420/2 68/427/2 -f 64/440/6 153/441/6 47/442/6 -f 64/440/6 154/443/6 153/441/6 -f 67/444/6 154/443/6 64/440/6 -f 154/443/6 67/444/6 155/445/6 -f 48/446/6 155/445/6 67/444/6 -f 155/445/6 48/446/6 47/442/6 -f 155/445/6 47/442/6 156/447/6 -f 156/447/6 47/442/6 153/441/6 -f 156/447/6 154/443/6 155/445/6 -f 33/448/30 66/449/30 34/450/30 -f 59/451/5 161/452/5 65/453/5 -f 59/451/5 162/454/5 161/452/5 -f 45/455/5 162/454/5 59/451/5 -f 162/454/5 45/455/5 50/456/5 -f 162/454/5 50/456/5 163/457/5 -f 65/453/5 163/457/5 50/456/5 -f 163/457/5 65/453/5 164/458/5 -f 164/458/5 65/453/5 161/452/5 -f 172/459/31 167/460/31 171/461/31 -f 50/462/31 172/459/31 171/461/31 -f 36/463/31 172/459/31 50/462/31 -f 172/459/31 36/463/31 166/464/31 -f 35/465/31 166/464/31 36/463/31 -f 166/464/31 35/465/31 65/466/31 -f 166/464/31 65/466/31 167/460/31 -f 167/460/31 65/466/31 171/461/31 -f 50/462/31 171/461/31 65/466/31 -f 37/386/4 34/388/4 35/400/4 -f 39/467/2 44/468/2 43/469/2 -f 41/470/5 42/471/5 44/472/5 -f 34/383/5 35/473/5 36/384/5 -f 38/391/3 40/474/3 41/392/3 -f 37/394/6 42/475/6 40/395/6 -f 43/397/1 44/476/1 42/398/1 -f 50/405/3 45/477/3 46/478/3 -f 46/478/3 47/479/3 50/405/3 -f 47/479/3 48/480/3 49/403/3 -f 49/403/3 33/481/3 36/404/3 -f 47/479/3 49/403/3 50/405/3 -f 67/482/1 64/483/1 66/423/1 -f 64/483/1 63/484/1 65/485/1 -f 66/423/1 64/483/1 65/485/1 -f 63/484/1 59/486/1 65/485/1 -f 65/485/1 35/421/1 66/423/1 -f 46/424/4 63/487/4 64/425/4 -f 156/447/6 153/441/6 154/443/6 -f 33/448/30 49/488/30 66/449/30 -f 172/459/31 166/464/31 167/460/31 -f 39/467/2 41/489/2 44/468/2 -f 41/470/5 40/490/5 42/471/5 -usemtl Gray8 -f 140/491/2 144/492/2 152/493/2 -f 152/493/2 131/494/2 132/495/2 -f 132/495/2 133/496/2 152/493/2 -f 133/496/2 130/497/2 152/493/2 -f 130/497/2 129/498/2 134/499/2 -f 134/499/2 135/500/2 136/501/2 -f 136/501/2 137/502/2 140/491/2 -f 137/502/2 138/503/2 140/491/2 -f 138/503/2 139/504/2 140/491/2 -f 140/491/2 141/505/2 142/506/2 -f 142/506/2 143/507/2 140/491/2 -f 143/507/2 144/492/2 140/491/2 -f 144/492/2 145/508/2 146/509/2 -f 146/509/2 147/510/2 148/511/2 -f 148/511/2 149/512/2 152/493/2 -f 149/512/2 150/513/2 152/493/2 -f 150/513/2 151/514/2 152/493/2 -f 130/497/2 134/499/2 152/493/2 -f 134/499/2 136/501/2 152/493/2 -f 144/492/2 146/509/2 152/493/2 -f 146/509/2 148/511/2 152/493/2 -f 136/501/2 140/491/2 152/493/2 diff --git a/BBMOD_GML/datafiles/Data/Assets/Shell.obj b/BBMOD_GML/datafiles/Data/Assets/Shell.obj deleted file mode 100644 index b7f71540..00000000 --- a/BBMOD_GML/datafiles/Data/Assets/Shell.obj +++ /dev/null @@ -1,79 +0,0 @@ -# Blender v2.83.1 OBJ File: '' -# www.blender.org -mtllib Shell.mtl -o ammo_pistol -v -0.362289 0.000000 0.250000 -v 0.362289 0.000000 0.250000 -v -0.362289 0.176777 0.176777 -v 0.362289 0.176777 0.176777 -v -0.362289 0.250000 -0.000000 -v 0.362289 0.250000 0.000000 -v -0.362289 0.176777 -0.176777 -v 0.362289 0.176777 -0.176777 -v -0.362289 -0.000000 -0.250000 -v 0.362289 -0.000000 -0.250000 -v -0.362289 -0.176777 -0.176777 -v 0.362289 -0.176777 -0.176777 -v -0.362289 -0.250000 -0.000000 -v 0.362289 -0.250000 0.000000 -v -0.362289 -0.176777 0.176777 -v 0.362289 -0.176777 0.176777 -vt 1.000000 1.000000 -vt 0.875000 0.500000 -vt 1.000000 0.500000 -vt 0.875000 1.000000 -vt 0.750000 0.500000 -vt 0.750000 1.000000 -vt 0.625000 0.500000 -vt 0.625000 1.000000 -vt 0.500000 0.500000 -vt 0.500000 1.000000 -vt 0.375000 0.500000 -vt 0.375000 1.000000 -vt 0.250000 0.500000 -vt 0.250000 1.000000 -vt 0.125000 0.500000 -vt 0.125000 1.000000 -vt 0.000000 0.500000 -vt 0.919706 0.080294 -vt 0.580294 0.080294 -vt 0.580294 0.419706 -vt 0.000000 1.000000 -vt 0.750000 0.490000 -vt 0.919706 0.419706 -vt 0.990000 0.250000 -vt 0.750000 0.010000 -vt 0.510000 0.250000 -vn -0.0000 0.0000 1.0000 -vn -0.0000 0.7071 0.7071 -vn 0.0000 1.0000 0.0000 -vn 0.0000 0.7071 -0.7071 -vn 0.0000 -0.0000 -1.0000 -vn 0.0000 -0.7071 -0.7071 -vn 0.0000 -1.0000 0.0000 -vn -0.0000 -0.7071 0.7071 -vn -1.0000 0.0000 0.0000 -usemtl Gold -s 1 -f 2/1/1 3/2/2 1/3/1 -f 4/4/2 5/5/3 3/2/2 -f 6/6/3 7/7/4 5/5/3 -f 8/8/4 9/9/5 7/7/4 -f 10/10/5 11/11/6 9/9/5 -f 12/12/6 13/13/7 11/11/6 -f 14/14/7 15/15/8 13/13/7 -f 16/16/8 1/17/1 15/15/8 -f 7/18/9 11/19/9 15/20/9 -f 2/1/1 4/4/2 3/2/2 -f 4/4/2 6/6/3 5/5/3 -f 6/6/3 8/8/4 7/7/4 -f 8/8/4 10/10/5 9/9/5 -f 10/10/5 12/12/6 11/11/6 -f 12/12/6 14/14/7 13/13/7 -f 14/14/7 16/16/8 15/15/8 -f 16/16/8 2/21/1 1/17/1 -f 15/20/9 1/22/9 3/23/9 -f 3/23/9 5/24/9 15/20/9 -f 5/24/9 7/18/9 15/20/9 -f 7/18/9 9/25/9 11/19/9 -f 11/19/9 13/26/9 15/20/9 diff --git a/BBMOD_GML/fonts/Fnt16/Fnt16.png b/BBMOD_GML/fonts/Fnt16/Fnt16.png deleted file mode 100644 index cdb8e7fb..00000000 Binary files a/BBMOD_GML/fonts/Fnt16/Fnt16.png and /dev/null differ diff --git a/BBMOD_GML/fonts/Fnt16/Fnt16.yy b/BBMOD_GML/fonts/Fnt16/Fnt16.yy deleted file mode 100644 index 35584b06..00000000 --- a/BBMOD_GML/fonts/Fnt16/Fnt16.yy +++ /dev/null @@ -1,143 +0,0 @@ -{ - "$GMFont":"", - "%Name":"Fnt16", - "AntiAlias":1, - "applyKerning":0, - "ascender":0, - "ascenderOffset":0, - "bold":false, - "canGenerateBitmap":true, - "charset":0, - "first":0, - "fontName":"Consolas", - "glyphOperations":0, - "glyphs":{ - "32":{"character":32,"h":25,"offset":0,"shift":12,"w":12,"x":2,"y":2,}, - "33":{"character":33,"h":25,"offset":4,"shift":12,"w":4,"x":51,"y":83,}, - "34":{"character":34,"h":25,"offset":2,"shift":12,"w":7,"x":42,"y":83,}, - "35":{"character":35,"h":25,"offset":0,"shift":12,"w":12,"x":28,"y":83,}, - "36":{"character":36,"h":25,"offset":1,"shift":12,"w":10,"x":16,"y":83,}, - "37":{"character":37,"h":25,"offset":0,"shift":12,"w":12,"x":2,"y":83,}, - "38":{"character":38,"h":25,"offset":0,"shift":12,"w":12,"x":240,"y":56,}, - "39":{"character":39,"h":25,"offset":4,"shift":12,"w":3,"x":235,"y":56,}, - "40":{"character":40,"h":25,"offset":3,"shift":12,"w":6,"x":227,"y":56,}, - "41":{"character":41,"h":25,"offset":2,"shift":12,"w":7,"x":218,"y":56,}, - "42":{"character":42,"h":25,"offset":1,"shift":12,"w":9,"x":57,"y":83,}, - "43":{"character":43,"h":25,"offset":0,"shift":12,"w":11,"x":205,"y":56,}, - "44":{"character":44,"h":25,"offset":2,"shift":12,"w":6,"x":186,"y":56,}, - "45":{"character":45,"h":25,"offset":2,"shift":12,"w":7,"x":177,"y":56,}, - "46":{"character":46,"h":25,"offset":3,"shift":12,"w":5,"x":170,"y":56,}, - "47":{"character":47,"h":25,"offset":1,"shift":12,"w":9,"x":159,"y":56,}, - "48":{"character":48,"h":25,"offset":0,"shift":12,"w":11,"x":146,"y":56,}, - "49":{"character":49,"h":25,"offset":1,"shift":12,"w":10,"x":134,"y":56,}, - "50":{"character":50,"h":25,"offset":1,"shift":12,"w":10,"x":122,"y":56,}, - "51":{"character":51,"h":25,"offset":1,"shift":12,"w":10,"x":110,"y":56,}, - "52":{"character":52,"h":25,"offset":0,"shift":12,"w":11,"x":97,"y":56,}, - "53":{"character":53,"h":25,"offset":1,"shift":12,"w":9,"x":194,"y":56,}, - "54":{"character":54,"h":25,"offset":1,"shift":12,"w":10,"x":68,"y":83,}, - "55":{"character":55,"h":25,"offset":1,"shift":12,"w":10,"x":80,"y":83,}, - "56":{"character":56,"h":25,"offset":1,"shift":12,"w":10,"x":92,"y":83,}, - "57":{"character":57,"h":25,"offset":1,"shift":12,"w":10,"x":87,"y":110,}, - "58":{"character":58,"h":25,"offset":4,"shift":12,"w":4,"x":81,"y":110,}, - "59":{"character":59,"h":25,"offset":2,"shift":12,"w":6,"x":73,"y":110,}, - "60":{"character":60,"h":25,"offset":1,"shift":12,"w":9,"x":62,"y":110,}, - "61":{"character":61,"h":25,"offset":1,"shift":12,"w":10,"x":50,"y":110,}, - "62":{"character":62,"h":25,"offset":2,"shift":12,"w":9,"x":39,"y":110,}, - "63":{"character":63,"h":25,"offset":3,"shift":12,"w":7,"x":30,"y":110,}, - "64":{"character":64,"h":25,"offset":0,"shift":12,"w":12,"x":16,"y":110,}, - "65":{"character":65,"h":25,"offset":0,"shift":12,"w":12,"x":2,"y":110,}, - "66":{"character":66,"h":25,"offset":1,"shift":12,"w":10,"x":232,"y":83,}, - "67":{"character":67,"h":25,"offset":0,"shift":12,"w":11,"x":219,"y":83,}, - "68":{"character":68,"h":25,"offset":1,"shift":12,"w":10,"x":207,"y":83,}, - "69":{"character":69,"h":25,"offset":2,"shift":12,"w":8,"x":197,"y":83,}, - "70":{"character":70,"h":25,"offset":2,"shift":12,"w":8,"x":187,"y":83,}, - "71":{"character":71,"h":25,"offset":0,"shift":12,"w":11,"x":174,"y":83,}, - "72":{"character":72,"h":25,"offset":1,"shift":12,"w":10,"x":162,"y":83,}, - "73":{"character":73,"h":25,"offset":1,"shift":12,"w":9,"x":151,"y":83,}, - "74":{"character":74,"h":25,"offset":1,"shift":12,"w":8,"x":141,"y":83,}, - "75":{"character":75,"h":25,"offset":1,"shift":12,"w":10,"x":129,"y":83,}, - "76":{"character":76,"h":25,"offset":2,"shift":12,"w":9,"x":118,"y":83,}, - "77":{"character":77,"h":25,"offset":0,"shift":12,"w":12,"x":104,"y":83,}, - "78":{"character":78,"h":25,"offset":1,"shift":12,"w":10,"x":85,"y":56,}, - "79":{"character":79,"h":25,"offset":0,"shift":12,"w":11,"x":72,"y":56,}, - "80":{"character":80,"h":25,"offset":1,"shift":12,"w":10,"x":60,"y":56,}, - "81":{"character":81,"h":25,"offset":0,"shift":12,"w":12,"x":22,"y":29,}, - "82":{"character":82,"h":25,"offset":1,"shift":12,"w":10,"x":2,"y":29,}, - "83":{"character":83,"h":25,"offset":1,"shift":12,"w":10,"x":235,"y":2,}, - "84":{"character":84,"h":25,"offset":0,"shift":12,"w":11,"x":222,"y":2,}, - "85":{"character":85,"h":25,"offset":1,"shift":12,"w":10,"x":210,"y":2,}, - "86":{"character":86,"h":25,"offset":0,"shift":12,"w":12,"x":196,"y":2,}, - "87":{"character":87,"h":25,"offset":0,"shift":12,"w":12,"x":182,"y":2,}, - "88":{"character":88,"h":25,"offset":0,"shift":12,"w":12,"x":168,"y":2,}, - "89":{"character":89,"h":25,"offset":0,"shift":12,"w":12,"x":154,"y":2,}, - "90":{"character":90,"h":25,"offset":1,"shift":12,"w":10,"x":142,"y":2,}, - "91":{"character":91,"h":25,"offset":3,"shift":12,"w":6,"x":14,"y":29,}, - "92":{"character":92,"h":25,"offset":1,"shift":12,"w":10,"x":130,"y":2,}, - "93":{"character":93,"h":25,"offset":2,"shift":12,"w":7,"x":108,"y":2,}, - "94":{"character":94,"h":25,"offset":1,"shift":12,"w":10,"x":96,"y":2,}, - "95":{"character":95,"h":25,"offset":0,"shift":12,"w":12,"x":82,"y":2,}, - "96":{"character":96,"h":25,"offset":0,"shift":12,"w":7,"x":73,"y":2,}, - "97":{"character":97,"h":25,"offset":1,"shift":12,"w":9,"x":62,"y":2,}, - "98":{"character":98,"h":25,"offset":1,"shift":12,"w":10,"x":50,"y":2,}, - "99":{"character":99,"h":25,"offset":1,"shift":12,"w":9,"x":39,"y":2,}, - "100":{"character":100,"h":25,"offset":1,"shift":12,"w":9,"x":28,"y":2,}, - "101":{"character":101,"h":25,"offset":1,"shift":12,"w":10,"x":16,"y":2,}, - "102":{"character":102,"h":25,"offset":0,"shift":12,"w":11,"x":117,"y":2,}, - "103":{"character":103,"h":25,"offset":0,"shift":12,"w":11,"x":36,"y":29,}, - "104":{"character":104,"h":25,"offset":1,"shift":12,"w":9,"x":162,"y":29,}, - "105":{"character":105,"h":25,"offset":1,"shift":12,"w":10,"x":49,"y":29,}, - "106":{"character":106,"h":25,"offset":1,"shift":12,"w":8,"x":39,"y":56,}, - "107":{"character":107,"h":25,"offset":1,"shift":12,"w":10,"x":27,"y":56,}, - "108":{"character":108,"h":25,"offset":1,"shift":12,"w":10,"x":15,"y":56,}, - "109":{"character":109,"h":25,"offset":0,"shift":12,"w":11,"x":2,"y":56,}, - "110":{"character":110,"h":25,"offset":1,"shift":12,"w":9,"x":232,"y":29,}, - "111":{"character":111,"h":25,"offset":0,"shift":12,"w":11,"x":219,"y":29,}, - "112":{"character":112,"h":25,"offset":1,"shift":12,"w":10,"x":207,"y":29,}, - "113":{"character":113,"h":25,"offset":1,"shift":12,"w":9,"x":196,"y":29,}, - "114":{"character":114,"h":25,"offset":2,"shift":12,"w":9,"x":185,"y":29,}, - "115":{"character":115,"h":25,"offset":1,"shift":12,"w":9,"x":49,"y":56,}, - "116":{"character":116,"h":25,"offset":0,"shift":12,"w":10,"x":173,"y":29,}, - "117":{"character":117,"h":25,"offset":1,"shift":12,"w":9,"x":151,"y":29,}, - "118":{"character":118,"h":25,"offset":0,"shift":12,"w":11,"x":138,"y":29,}, - "119":{"character":119,"h":25,"offset":0,"shift":12,"w":12,"x":124,"y":29,}, - "120":{"character":120,"h":25,"offset":0,"shift":12,"w":11,"x":111,"y":29,}, - "121":{"character":121,"h":25,"offset":0,"shift":12,"w":11,"x":98,"y":29,}, - "122":{"character":122,"h":25,"offset":1,"shift":12,"w":9,"x":87,"y":29,}, - "123":{"character":123,"h":25,"offset":1,"shift":12,"w":9,"x":76,"y":29,}, - "124":{"character":124,"h":25,"offset":4,"shift":12,"w":3,"x":71,"y":29,}, - "125":{"character":125,"h":25,"offset":2,"shift":12,"w":8,"x":61,"y":29,}, - "126":{"character":126,"h":25,"offset":0,"shift":12,"w":11,"x":99,"y":110,}, - "9647":{"character":9647,"h":25,"offset":4,"shift":20,"w":13,"x":112,"y":110,}, - }, - "hinting":0, - "includeTTF":false, - "interpreter":0, - "italic":false, - "kerningPairs":[], - "last":0, - "lineHeight":0, - "maintainGms1Font":false, - "name":"Fnt16", - "parent":{ - "name":"Fonts", - "path":"folders/Demo/Fonts.yy", - }, - "pointRounding":0, - "ranges":[ - {"lower":32,"upper":127,}, - {"lower":9647,"upper":9647,}, - ], - "regenerateBitmap":false, - "resourceType":"GMFont", - "resourceVersion":"2.0", - "sampleText":"abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: â–¯ (9647)", - "sdfSpread":8, - "size":16.0, - "styleName":"Regular", - "textureGroupId":{ - "name":"Default", - "path":"texturegroups/Default", - }, - "TTFName":"", - "usesSDF":false, -} \ No newline at end of file diff --git a/BBMOD_GML/fonts/Fnt24/Fnt16.png b/BBMOD_GML/fonts/Fnt24/Fnt16.png deleted file mode 100644 index 89114b9e..00000000 Binary files a/BBMOD_GML/fonts/Fnt24/Fnt16.png and /dev/null differ diff --git a/BBMOD_GML/fonts/Fnt24/Fnt24.png b/BBMOD_GML/fonts/Fnt24/Fnt24.png deleted file mode 100644 index 3db2236f..00000000 Binary files a/BBMOD_GML/fonts/Fnt24/Fnt24.png and /dev/null differ diff --git a/BBMOD_GML/fonts/Fnt24/Fnt24.yy b/BBMOD_GML/fonts/Fnt24/Fnt24.yy deleted file mode 100644 index 049798e7..00000000 --- a/BBMOD_GML/fonts/Fnt24/Fnt24.yy +++ /dev/null @@ -1,143 +0,0 @@ -{ - "$GMFont":"", - "%Name":"Fnt24", - "AntiAlias":1, - "applyKerning":0, - "ascender":0, - "ascenderOffset":0, - "bold":false, - "canGenerateBitmap":true, - "charset":0, - "first":0, - "fontName":"Consolas", - "glyphOperations":0, - "glyphs":{ - "32":{"character":32,"h":37,"offset":0,"shift":18,"w":18,"x":2,"y":2,}, - "33":{"character":33,"h":37,"offset":6,"shift":18,"w":5,"x":108,"y":80,}, - "34":{"character":34,"h":37,"offset":4,"shift":18,"w":10,"x":96,"y":80,}, - "35":{"character":35,"h":37,"offset":0,"shift":18,"w":17,"x":77,"y":80,}, - "36":{"character":36,"h":37,"offset":1,"shift":18,"w":15,"x":60,"y":80,}, - "37":{"character":37,"h":37,"offset":0,"shift":18,"w":18,"x":40,"y":80,}, - "38":{"character":38,"h":37,"offset":0,"shift":18,"w":18,"x":20,"y":80,}, - "39":{"character":39,"h":37,"offset":7,"shift":18,"w":4,"x":14,"y":80,}, - "40":{"character":40,"h":37,"offset":4,"shift":18,"w":10,"x":2,"y":80,}, - "41":{"character":41,"h":37,"offset":4,"shift":18,"w":9,"x":490,"y":41,}, - "42":{"character":42,"h":37,"offset":2,"shift":18,"w":14,"x":115,"y":80,}, - "43":{"character":43,"h":37,"offset":1,"shift":18,"w":16,"x":472,"y":41,}, - "44":{"character":44,"h":37,"offset":3,"shift":18,"w":9,"x":445,"y":41,}, - "45":{"character":45,"h":37,"offset":4,"shift":18,"w":10,"x":433,"y":41,}, - "46":{"character":46,"h":37,"offset":6,"shift":18,"w":6,"x":425,"y":41,}, - "47":{"character":47,"h":37,"offset":1,"shift":18,"w":15,"x":408,"y":41,}, - "48":{"character":48,"h":37,"offset":1,"shift":18,"w":16,"x":390,"y":41,}, - "49":{"character":49,"h":37,"offset":2,"shift":18,"w":14,"x":374,"y":41,}, - "50":{"character":50,"h":37,"offset":2,"shift":18,"w":14,"x":358,"y":41,}, - "51":{"character":51,"h":37,"offset":2,"shift":18,"w":14,"x":342,"y":41,}, - "52":{"character":52,"h":37,"offset":0,"shift":18,"w":17,"x":323,"y":41,}, - "53":{"character":53,"h":37,"offset":2,"shift":18,"w":14,"x":456,"y":41,}, - "54":{"character":54,"h":37,"offset":1,"shift":18,"w":15,"x":131,"y":80,}, - "55":{"character":55,"h":37,"offset":1,"shift":18,"w":15,"x":148,"y":80,}, - "56":{"character":56,"h":37,"offset":1,"shift":18,"w":15,"x":165,"y":80,}, - "57":{"character":57,"h":37,"offset":1,"shift":18,"w":15,"x":493,"y":80,}, - "58":{"character":58,"h":37,"offset":6,"shift":18,"w":6,"x":485,"y":80,}, - "59":{"character":59,"h":37,"offset":3,"shift":18,"w":9,"x":474,"y":80,}, - "60":{"character":60,"h":37,"offset":2,"shift":18,"w":13,"x":459,"y":80,}, - "61":{"character":61,"h":37,"offset":2,"shift":18,"w":14,"x":443,"y":80,}, - "62":{"character":62,"h":37,"offset":3,"shift":18,"w":13,"x":428,"y":80,}, - "63":{"character":63,"h":37,"offset":4,"shift":18,"w":11,"x":415,"y":80,}, - "64":{"character":64,"h":37,"offset":0,"shift":18,"w":18,"x":395,"y":80,}, - "65":{"character":65,"h":37,"offset":0,"shift":18,"w":18,"x":375,"y":80,}, - "66":{"character":66,"h":37,"offset":2,"shift":18,"w":14,"x":359,"y":80,}, - "67":{"character":67,"h":37,"offset":1,"shift":18,"w":15,"x":342,"y":80,}, - "68":{"character":68,"h":37,"offset":1,"shift":18,"w":16,"x":324,"y":80,}, - "69":{"character":69,"h":37,"offset":3,"shift":18,"w":12,"x":310,"y":80,}, - "70":{"character":70,"h":37,"offset":3,"shift":18,"w":12,"x":296,"y":80,}, - "71":{"character":71,"h":37,"offset":1,"shift":18,"w":15,"x":279,"y":80,}, - "72":{"character":72,"h":37,"offset":1,"shift":18,"w":15,"x":262,"y":80,}, - "73":{"character":73,"h":37,"offset":2,"shift":18,"w":13,"x":247,"y":80,}, - "74":{"character":74,"h":37,"offset":2,"shift":18,"w":12,"x":233,"y":80,}, - "75":{"character":75,"h":37,"offset":2,"shift":18,"w":15,"x":216,"y":80,}, - "76":{"character":76,"h":37,"offset":3,"shift":18,"w":13,"x":201,"y":80,}, - "77":{"character":77,"h":37,"offset":0,"shift":18,"w":17,"x":182,"y":80,}, - "78":{"character":78,"h":37,"offset":1,"shift":18,"w":15,"x":306,"y":41,}, - "79":{"character":79,"h":37,"offset":0,"shift":18,"w":17,"x":287,"y":41,}, - "80":{"character":80,"h":37,"offset":2,"shift":18,"w":14,"x":271,"y":41,}, - "81":{"character":81,"h":37,"offset":0,"shift":18,"w":18,"x":375,"y":2,}, - "82":{"character":82,"h":37,"offset":2,"shift":18,"w":15,"x":347,"y":2,}, - "83":{"character":83,"h":37,"offset":1,"shift":18,"w":15,"x":330,"y":2,}, - "84":{"character":84,"h":37,"offset":1,"shift":18,"w":16,"x":312,"y":2,}, - "85":{"character":85,"h":37,"offset":1,"shift":18,"w":15,"x":295,"y":2,}, - "86":{"character":86,"h":37,"offset":0,"shift":18,"w":18,"x":275,"y":2,}, - "87":{"character":87,"h":37,"offset":0,"shift":18,"w":17,"x":256,"y":2,}, - "88":{"character":88,"h":37,"offset":0,"shift":18,"w":18,"x":236,"y":2,}, - "89":{"character":89,"h":37,"offset":0,"shift":18,"w":18,"x":216,"y":2,}, - "90":{"character":90,"h":37,"offset":1,"shift":18,"w":15,"x":199,"y":2,}, - "91":{"character":91,"h":37,"offset":5,"shift":18,"w":9,"x":364,"y":2,}, - "92":{"character":92,"h":37,"offset":2,"shift":18,"w":14,"x":183,"y":2,}, - "93":{"character":93,"h":37,"offset":4,"shift":18,"w":9,"x":153,"y":2,}, - "94":{"character":94,"h":37,"offset":1,"shift":18,"w":15,"x":136,"y":2,}, - "95":{"character":95,"h":37,"offset":0,"shift":18,"w":18,"x":116,"y":2,}, - "96":{"character":96,"h":37,"offset":0,"shift":18,"w":11,"x":103,"y":2,}, - "97":{"character":97,"h":37,"offset":2,"shift":18,"w":14,"x":87,"y":2,}, - "98":{"character":98,"h":37,"offset":2,"shift":18,"w":14,"x":71,"y":2,}, - "99":{"character":99,"h":37,"offset":2,"shift":18,"w":13,"x":56,"y":2,}, - "100":{"character":100,"h":37,"offset":1,"shift":18,"w":15,"x":39,"y":2,}, - "101":{"character":101,"h":37,"offset":1,"shift":18,"w":15,"x":22,"y":2,}, - "102":{"character":102,"h":37,"offset":0,"shift":18,"w":17,"x":164,"y":2,}, - "103":{"character":103,"h":37,"offset":1,"shift":18,"w":16,"x":395,"y":2,}, - "104":{"character":104,"h":37,"offset":2,"shift":18,"w":14,"x":74,"y":41,}, - "105":{"character":105,"h":37,"offset":2,"shift":18,"w":14,"x":413,"y":2,}, - "106":{"character":106,"h":37,"offset":2,"shift":18,"w":12,"x":242,"y":41,}, - "107":{"character":107,"h":37,"offset":2,"shift":18,"w":15,"x":225,"y":41,}, - "108":{"character":108,"h":37,"offset":2,"shift":18,"w":14,"x":209,"y":41,}, - "109":{"character":109,"h":37,"offset":1,"shift":18,"w":16,"x":191,"y":41,}, - "110":{"character":110,"h":37,"offset":2,"shift":18,"w":14,"x":175,"y":41,}, - "111":{"character":111,"h":37,"offset":1,"shift":18,"w":16,"x":157,"y":41,}, - "112":{"character":112,"h":37,"offset":2,"shift":18,"w":14,"x":141,"y":41,}, - "113":{"character":113,"h":37,"offset":1,"shift":18,"w":15,"x":124,"y":41,}, - "114":{"character":114,"h":37,"offset":3,"shift":18,"w":14,"x":108,"y":41,}, - "115":{"character":115,"h":37,"offset":2,"shift":18,"w":13,"x":256,"y":41,}, - "116":{"character":116,"h":37,"offset":0,"shift":18,"w":16,"x":90,"y":41,}, - "117":{"character":117,"h":37,"offset":2,"shift":18,"w":14,"x":58,"y":41,}, - "118":{"character":118,"h":37,"offset":1,"shift":18,"w":16,"x":40,"y":41,}, - "119":{"character":119,"h":37,"offset":0,"shift":18,"w":18,"x":20,"y":41,}, - "120":{"character":120,"h":37,"offset":1,"shift":18,"w":16,"x":2,"y":41,}, - "121":{"character":121,"h":37,"offset":0,"shift":18,"w":17,"x":481,"y":2,}, - "122":{"character":122,"h":37,"offset":2,"shift":18,"w":14,"x":465,"y":2,}, - "123":{"character":123,"h":37,"offset":2,"shift":18,"w":13,"x":450,"y":2,}, - "124":{"character":124,"h":37,"offset":7,"shift":18,"w":4,"x":444,"y":2,}, - "125":{"character":125,"h":37,"offset":3,"shift":18,"w":13,"x":429,"y":2,}, - "126":{"character":126,"h":37,"offset":1,"shift":18,"w":16,"x":2,"y":119,}, - "9647":{"character":9647,"h":37,"offset":6,"shift":31,"w":19,"x":20,"y":119,}, - }, - "hinting":0, - "includeTTF":false, - "interpreter":0, - "italic":false, - "kerningPairs":[], - "last":0, - "lineHeight":0, - "maintainGms1Font":false, - "name":"Fnt24", - "parent":{ - "name":"Fonts", - "path":"folders/Demo/Fonts.yy", - }, - "pointRounding":0, - "ranges":[ - {"lower":32,"upper":127,}, - {"lower":9647,"upper":9647,}, - ], - "regenerateBitmap":false, - "resourceType":"GMFont", - "resourceVersion":"2.0", - "sampleText":"abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: â–¯ (9647)", - "sdfSpread":8, - "size":24.0, - "styleName":"Regular", - "textureGroupId":{ - "name":"Default", - "path":"texturegroups/Default", - }, - "TTFName":"", - "usesSDF":false, -} \ No newline at end of file diff --git a/BBMOD_GML/fonts/Fnt48/Fnt16.png b/BBMOD_GML/fonts/Fnt48/Fnt16.png deleted file mode 100644 index 89114b9e..00000000 Binary files a/BBMOD_GML/fonts/Fnt48/Fnt16.png and /dev/null differ diff --git a/BBMOD_GML/fonts/Fnt48/Fnt24.png b/BBMOD_GML/fonts/Fnt48/Fnt24.png deleted file mode 100644 index 7dbc1e70..00000000 Binary files a/BBMOD_GML/fonts/Fnt48/Fnt24.png and /dev/null differ diff --git a/BBMOD_GML/fonts/Fnt48/Fnt48.png b/BBMOD_GML/fonts/Fnt48/Fnt48.png deleted file mode 100644 index 4cd8333d..00000000 Binary files a/BBMOD_GML/fonts/Fnt48/Fnt48.png and /dev/null differ diff --git a/BBMOD_GML/fonts/Fnt48/Fnt48.yy b/BBMOD_GML/fonts/Fnt48/Fnt48.yy deleted file mode 100644 index 63f7f4a4..00000000 --- a/BBMOD_GML/fonts/Fnt48/Fnt48.yy +++ /dev/null @@ -1,143 +0,0 @@ -{ - "$GMFont":"", - "%Name":"Fnt48", - "AntiAlias":1, - "applyKerning":0, - "ascender":0, - "ascenderOffset":0, - "bold":false, - "canGenerateBitmap":true, - "charset":0, - "first":0, - "fontName":"Consolas", - "glyphOperations":0, - "glyphs":{ - "32":{"character":32,"h":75,"offset":0,"shift":35,"w":35,"x":2,"y":2,}, - "33":{"character":33,"h":75,"offset":13,"shift":35,"w":9,"x":24,"y":310,}, - "34":{"character":34,"h":75,"offset":8,"shift":35,"w":20,"x":2,"y":310,}, - "35":{"character":35,"h":75,"offset":1,"shift":35,"w":33,"x":457,"y":233,}, - "36":{"character":36,"h":75,"offset":3,"shift":35,"w":29,"x":426,"y":233,}, - "37":{"character":37,"h":75,"offset":0,"shift":35,"w":35,"x":389,"y":233,}, - "38":{"character":38,"h":75,"offset":1,"shift":35,"w":35,"x":352,"y":233,}, - "39":{"character":39,"h":75,"offset":14,"shift":35,"w":8,"x":342,"y":233,}, - "40":{"character":40,"h":75,"offset":9,"shift":35,"w":19,"x":321,"y":233,}, - "41":{"character":41,"h":75,"offset":8,"shift":35,"w":18,"x":301,"y":233,}, - "42":{"character":42,"h":75,"offset":5,"shift":35,"w":26,"x":35,"y":310,}, - "43":{"character":43,"h":75,"offset":2,"shift":35,"w":31,"x":268,"y":233,}, - "44":{"character":44,"h":75,"offset":7,"shift":35,"w":16,"x":222,"y":233,}, - "45":{"character":45,"h":75,"offset":8,"shift":35,"w":19,"x":201,"y":233,}, - "46":{"character":46,"h":75,"offset":12,"shift":35,"w":11,"x":188,"y":233,}, - "47":{"character":47,"h":75,"offset":3,"shift":35,"w":28,"x":158,"y":233,}, - "48":{"character":48,"h":75,"offset":2,"shift":35,"w":31,"x":125,"y":233,}, - "49":{"character":49,"h":75,"offset":4,"shift":35,"w":28,"x":95,"y":233,}, - "50":{"character":50,"h":75,"offset":4,"shift":35,"w":28,"x":65,"y":233,}, - "51":{"character":51,"h":75,"offset":5,"shift":35,"w":26,"x":37,"y":233,}, - "52":{"character":52,"h":75,"offset":1,"shift":35,"w":33,"x":2,"y":233,}, - "53":{"character":53,"h":75,"offset":5,"shift":35,"w":26,"x":240,"y":233,}, - "54":{"character":54,"h":75,"offset":3,"shift":35,"w":29,"x":63,"y":310,}, - "55":{"character":55,"h":75,"offset":3,"shift":35,"w":29,"x":94,"y":310,}, - "56":{"character":56,"h":75,"offset":3,"shift":35,"w":29,"x":125,"y":310,}, - "57":{"character":57,"h":75,"offset":3,"shift":35,"w":29,"x":213,"y":387,}, - "58":{"character":58,"h":75,"offset":12,"shift":35,"w":11,"x":200,"y":387,}, - "59":{"character":59,"h":75,"offset":7,"shift":35,"w":16,"x":182,"y":387,}, - "60":{"character":60,"h":75,"offset":4,"shift":35,"w":25,"x":155,"y":387,}, - "61":{"character":61,"h":75,"offset":4,"shift":35,"w":28,"x":125,"y":387,}, - "62":{"character":62,"h":75,"offset":6,"shift":35,"w":25,"x":98,"y":387,}, - "63":{"character":63,"h":75,"offset":9,"shift":35,"w":20,"x":76,"y":387,}, - "64":{"character":64,"h":75,"offset":0,"shift":35,"w":35,"x":39,"y":387,}, - "65":{"character":65,"h":75,"offset":0,"shift":35,"w":35,"x":2,"y":387,}, - "66":{"character":66,"h":75,"offset":4,"shift":35,"w":28,"x":479,"y":310,}, - "67":{"character":67,"h":75,"offset":2,"shift":35,"w":30,"x":447,"y":310,}, - "68":{"character":68,"h":75,"offset":3,"shift":35,"w":30,"x":415,"y":310,}, - "69":{"character":69,"h":75,"offset":6,"shift":35,"w":24,"x":389,"y":310,}, - "70":{"character":70,"h":75,"offset":6,"shift":35,"w":24,"x":363,"y":310,}, - "71":{"character":71,"h":75,"offset":2,"shift":35,"w":30,"x":331,"y":310,}, - "72":{"character":72,"h":75,"offset":3,"shift":35,"w":29,"x":300,"y":310,}, - "73":{"character":73,"h":75,"offset":5,"shift":35,"w":25,"x":273,"y":310,}, - "74":{"character":74,"h":75,"offset":5,"shift":35,"w":23,"x":248,"y":310,}, - "75":{"character":75,"h":75,"offset":4,"shift":35,"w":29,"x":217,"y":310,}, - "76":{"character":76,"h":75,"offset":7,"shift":35,"w":24,"x":191,"y":310,}, - "77":{"character":77,"h":75,"offset":1,"shift":35,"w":33,"x":156,"y":310,}, - "78":{"character":78,"h":75,"offset":3,"shift":35,"w":29,"x":449,"y":156,}, - "79":{"character":79,"h":75,"offset":1,"shift":35,"w":33,"x":414,"y":156,}, - "80":{"character":80,"h":75,"offset":4,"shift":35,"w":28,"x":384,"y":156,}, - "81":{"character":81,"h":75,"offset":1,"shift":35,"w":35,"x":184,"y":79,}, - "82":{"character":82,"h":75,"offset":5,"shift":35,"w":28,"x":135,"y":79,}, - "83":{"character":83,"h":75,"offset":3,"shift":35,"w":29,"x":104,"y":79,}, - "84":{"character":84,"h":75,"offset":2,"shift":35,"w":31,"x":71,"y":79,}, - "85":{"character":85,"h":75,"offset":3,"shift":35,"w":29,"x":40,"y":79,}, - "86":{"character":86,"h":75,"offset":0,"shift":35,"w":36,"x":2,"y":79,}, - "87":{"character":87,"h":75,"offset":1,"shift":35,"w":33,"x":466,"y":2,}, - "88":{"character":88,"h":75,"offset":0,"shift":35,"w":35,"x":429,"y":2,}, - "89":{"character":89,"h":75,"offset":0,"shift":35,"w":36,"x":391,"y":2,}, - "90":{"character":90,"h":75,"offset":3,"shift":35,"w":29,"x":360,"y":2,}, - "91":{"character":91,"h":75,"offset":10,"shift":35,"w":17,"x":165,"y":79,}, - "92":{"character":92,"h":75,"offset":5,"shift":35,"w":27,"x":331,"y":2,}, - "93":{"character":93,"h":75,"offset":9,"shift":35,"w":16,"x":278,"y":2,}, - "94":{"character":94,"h":75,"offset":3,"shift":35,"w":29,"x":247,"y":2,}, - "95":{"character":95,"h":75,"offset":0,"shift":35,"w":36,"x":209,"y":2,}, - "96":{"character":96,"h":75,"offset":0,"shift":35,"w":21,"x":186,"y":2,}, - "97":{"character":97,"h":75,"offset":4,"shift":35,"w":27,"x":157,"y":2,}, - "98":{"character":98,"h":75,"offset":5,"shift":35,"w":27,"x":128,"y":2,}, - "99":{"character":99,"h":75,"offset":4,"shift":35,"w":26,"x":100,"y":2,}, - "100":{"character":100,"h":75,"offset":3,"shift":35,"w":28,"x":70,"y":2,}, - "101":{"character":101,"h":75,"offset":3,"shift":35,"w":29,"x":39,"y":2,}, - "102":{"character":102,"h":75,"offset":0,"shift":35,"w":33,"x":296,"y":2,}, - "103":{"character":103,"h":75,"offset":2,"shift":35,"w":31,"x":221,"y":79,}, - "104":{"character":104,"h":75,"offset":5,"shift":35,"w":26,"x":30,"y":156,}, - "105":{"character":105,"h":75,"offset":5,"shift":35,"w":26,"x":254,"y":79,}, - "106":{"character":106,"h":75,"offset":4,"shift":35,"w":24,"x":331,"y":156,}, - "107":{"character":107,"h":75,"offset":5,"shift":35,"w":29,"x":300,"y":156,}, - "108":{"character":108,"h":75,"offset":5,"shift":35,"w":26,"x":272,"y":156,}, - "109":{"character":109,"h":75,"offset":2,"shift":35,"w":31,"x":239,"y":156,}, - "110":{"character":110,"h":75,"offset":5,"shift":35,"w":26,"x":211,"y":156,}, - "111":{"character":111,"h":75,"offset":2,"shift":35,"w":31,"x":178,"y":156,}, - "112":{"character":112,"h":75,"offset":5,"shift":35,"w":27,"x":149,"y":156,}, - "113":{"character":113,"h":75,"offset":3,"shift":35,"w":28,"x":119,"y":156,}, - "114":{"character":114,"h":75,"offset":6,"shift":35,"w":27,"x":90,"y":156,}, - "115":{"character":115,"h":75,"offset":5,"shift":35,"w":25,"x":357,"y":156,}, - "116":{"character":116,"h":75,"offset":1,"shift":35,"w":30,"x":58,"y":156,}, - "117":{"character":117,"h":75,"offset":5,"shift":35,"w":26,"x":2,"y":156,}, - "118":{"character":118,"h":75,"offset":2,"shift":35,"w":31,"x":474,"y":79,}, - "119":{"character":119,"h":75,"offset":1,"shift":35,"w":34,"x":438,"y":79,}, - "120":{"character":120,"h":75,"offset":2,"shift":35,"w":32,"x":404,"y":79,}, - "121":{"character":121,"h":75,"offset":1,"shift":35,"w":32,"x":370,"y":79,}, - "122":{"character":122,"h":75,"offset":5,"shift":35,"w":26,"x":342,"y":79,}, - "123":{"character":123,"h":75,"offset":5,"shift":35,"w":24,"x":316,"y":79,}, - "124":{"character":124,"h":75,"offset":15,"shift":35,"w":6,"x":308,"y":79,}, - "125":{"character":125,"h":75,"offset":7,"shift":35,"w":24,"x":282,"y":79,}, - "126":{"character":126,"h":75,"offset":2,"shift":35,"w":32,"x":244,"y":387,}, - "9647":{"character":9647,"h":75,"offset":12,"shift":62,"w":38,"x":278,"y":387,}, - }, - "hinting":0, - "includeTTF":false, - "interpreter":0, - "italic":false, - "kerningPairs":[], - "last":0, - "lineHeight":0, - "maintainGms1Font":false, - "name":"Fnt48", - "parent":{ - "name":"Fonts", - "path":"folders/Demo/Fonts.yy", - }, - "pointRounding":0, - "ranges":[ - {"lower":32,"upper":127,}, - {"lower":9647,"upper":9647,}, - ], - "regenerateBitmap":false, - "resourceType":"GMFont", - "resourceVersion":"2.0", - "sampleText":"abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: â–¯ (9647)", - "sdfSpread":8, - "size":48.0, - "styleName":"Regular", - "textureGroupId":{ - "name":"Default", - "path":"texturegroups/Default", - }, - "TTFName":"", - "usesSDF":false, -} \ No newline at end of file diff --git a/BBMOD_GML/objects/OCharacter/Create_0.gml b/BBMOD_GML/objects/OCharacter/Create_0.gml deleted file mode 100644 index 99ef0b66..00000000 --- a/BBMOD_GML/objects/OCharacter/Create_0.gml +++ /dev/null @@ -1,63 +0,0 @@ -event_inherited(); - -modCharacter = global.resourceManager.load( - "Data/Assets/Character/Character.bbmod", - method(self, function (_err, _model) { - if (!_err) - { - _model.freeze(); - } - })); - -// Maximum hitpoints. -hpMax = 100; - -// Current number of hitpoints. Character dies if reaches 0. -hp = hpMax; - -// A function that processes incoming damage. By default it simply subtracts -// the damage from the character's `hp` and sets `hurt` to 1. -ReceiveDamage = function (_damage) -{ - hp -= _damage; - hurt = 1.0; -}; - -// Controls the screen flash effect for the player and model flash for zombies. -hurt = 0.0; - -// The character's speed when they are walking. -speedWalk = 0.225; - -// The direction of the character's body. This is used to slowly turn it towards -// the look direction. -directionBody = direction; - -// A matrix used when rendering the character's body. -matrixBody = matrix_build_identity(); - -//////////////////////////////////////////////////////////////////////////////// -// Animation player -animationPlayer = new BBMOD_AnimationPlayer(modCharacter); - -animationPlayer.on_event("Footstep", method(self, function () { - // Play a random footstep sound at the character's position when a "Footstep" - // event is triggered. - var _sound = choose( - SndFootstep0, - SndFootstep1, - SndFootstep2, - SndFootstep3, - SndFootstep4, - SndFootstep5, - SndFootstep6, - SndFootstep7, - SndFootstep8, - SndFootstep9, - ); - audio_play_sound_at(_sound, x, y, z, 1, 200, 1, false, 1); - // Spawn dirt particle - ODirtEmitter.emitter.spawn_particle(new BBMOD_Vec3(x, y, z)); -})); - -animationStateMachine = new BBMOD_AnimationStateMachine(animationPlayer); diff --git a/BBMOD_GML/objects/OCharacter/Draw_0.gml b/BBMOD_GML/objects/OCharacter/Draw_0.gml deleted file mode 100644 index 113285bf..00000000 --- a/BBMOD_GML/objects/OCharacter/Draw_0.gml +++ /dev/null @@ -1,3 +0,0 @@ -bbmod_set_instance_id(id); -matrix_set(matrix_world, matrixBody); -animationPlayer.render(); diff --git a/BBMOD_GML/objects/OCharacter/Draw_77.gml b/BBMOD_GML/objects/OCharacter/Draw_77.gml deleted file mode 100644 index 64795314..00000000 --- a/BBMOD_GML/objects/OCharacter/Draw_77.gml +++ /dev/null @@ -1 +0,0 @@ -hurt = max(0.0, hurt - (DELTA_TIME * 0.000001) * 2.0); diff --git a/BBMOD_GML/objects/OCharacter/OCharacter.yy b/BBMOD_GML/objects/OCharacter/OCharacter.yy deleted file mode 100644 index b6407e32..00000000 --- a/BBMOD_GML/objects/OCharacter/OCharacter.yy +++ /dev/null @@ -1,41 +0,0 @@ -{ - "$GMObject":"", - "%Name":"OCharacter", - "eventList":[ - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":2,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":77,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - ], - "managed":true, - "name":"OCharacter", - "overriddenProperties":[], - "parent":{ - "name":"Characters", - "path":"folders/Demo/Objects/Characters.yy", - }, - "parentObjectId":{ - "name":"OObject3D", - "path":"objects/OObject3D/OObject3D.yy", - }, - "persistent":false, - "physicsAngularDamping":0.1, - "physicsDensity":0.5, - "physicsFriction":0.2, - "physicsGroup":1, - "physicsKinematic":false, - "physicsLinearDamping":0.1, - "physicsObject":false, - "physicsRestitution":0.1, - "physicsSensor":false, - "physicsShape":1, - "physicsShapePoints":[], - "physicsStartAwake":true, - "properties":[], - "resourceType":"GMObject", - "resourceVersion":"2.0", - "solid":false, - "spriteId":null, - "spriteMaskId":null, - "visible":true, -} \ No newline at end of file diff --git a/BBMOD_GML/objects/OCharacter/Step_2.gml b/BBMOD_GML/objects/OCharacter/Step_2.gml deleted file mode 100644 index 72ada1ce..00000000 --- a/BBMOD_GML/objects/OCharacter/Step_2.gml +++ /dev/null @@ -1,16 +0,0 @@ -event_inherited(); - -// Kill the character if it falls out of the map -if (z < -200) -{ - hp = 0; -} - -animationStateMachine.update(DELTA_TIME); - -// Slow turn body towards direction -directionBody += - angle_difference(direction, directionBody) * global.gameSpeed * 0.2; - -var _scale = 10; -matrixBody = matrix_build(x, y, z, 0, 0, directionBody, _scale, _scale, _scale); diff --git a/BBMOD_GML/objects/OFloatingText/Create_0.gml b/BBMOD_GML/objects/OFloatingText/Create_0.gml deleted file mode 100644 index afa4764d..00000000 --- a/BBMOD_GML/objects/OFloatingText/Create_0.gml +++ /dev/null @@ -1,6 +0,0 @@ -event_inherited(); - -text = ""; -zspeed = 1; -direction = random(360); -speedCurrent = random_range(0.5, 1); diff --git a/BBMOD_GML/objects/OFloatingText/OFloatingText.yy b/BBMOD_GML/objects/OFloatingText/OFloatingText.yy deleted file mode 100644 index 2a2aa02a..00000000 --- a/BBMOD_GML/objects/OFloatingText/OFloatingText.yy +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$GMObject":"", - "%Name":"OFloatingText", - "eventList":[ - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - ], - "managed":true, - "name":"OFloatingText", - "overriddenProperties":[], - "parent":{ - "name":"Effects", - "path":"folders/Demo/Objects/Effects.yy", - }, - "parentObjectId":{ - "name":"OObject3D", - "path":"objects/OObject3D/OObject3D.yy", - }, - "persistent":false, - "physicsAngularDamping":0.1, - "physicsDensity":0.5, - "physicsFriction":0.2, - "physicsGroup":1, - "physicsKinematic":false, - "physicsLinearDamping":0.1, - "physicsObject":false, - "physicsRestitution":0.1, - "physicsSensor":false, - "physicsShape":1, - "physicsShapePoints":[], - "physicsStartAwake":true, - "properties":[], - "resourceType":"GMObject", - "resourceVersion":"2.0", - "solid":false, - "spriteId":null, - "spriteMaskId":null, - "visible":true, -} \ No newline at end of file diff --git a/BBMOD_GML/objects/OFloatingText/Step_0.gml b/BBMOD_GML/objects/OFloatingText/Step_0.gml deleted file mode 100644 index 6be09129..00000000 --- a/BBMOD_GML/objects/OFloatingText/Step_0.gml +++ /dev/null @@ -1,7 +0,0 @@ -var _terrainHeight = global.terrain.get_height(x, y); - -if (_terrainHeight == undefined - || z <= _terrainHeight) -{ - instance_destroy(); -} diff --git a/BBMOD_GML/objects/OGameOver/Create_0.gml b/BBMOD_GML/objects/OGameOver/Create_0.gml deleted file mode 100644 index bab27ace..00000000 --- a/BBMOD_GML/objects/OGameOver/Create_0.gml +++ /dev/null @@ -1 +0,0 @@ -time = current_time; diff --git a/BBMOD_GML/objects/OGameOver/Draw_64.gml b/BBMOD_GML/objects/OGameOver/Draw_64.gml deleted file mode 100644 index fcd3e8a6..00000000 --- a/BBMOD_GML/objects/OGameOver/Draw_64.gml +++ /dev/null @@ -1,34 +0,0 @@ -var _windowWidth = window_get_width(); -var _windowHeight = window_get_height(); -var _font = draw_get_font(); -var _lineHeight, _x, _y; - -draw_set_halign(fa_center); - -draw_set_font(Fnt48); -_lineHeight = string_height("Q"); -_x = round(_windowWidth * 0.5); -_y = round(_windowHeight * 0.5) - _lineHeight * 2.0; -DrawTextShadow(_x, _y, "Game Over"); -_y += _lineHeight; - -draw_set_font(Fnt24); -_lineHeight = string_height("Q"); -DrawTextShadow(_x, _y, "Score: " + string(score + global.scoreBonus)); -_y += _lineHeight * 2.0; - -draw_set_font(Fnt16); -_lineHeight = string_height("Q"); -DrawTextShadow(_x, _y, "Zombie kills: " + string(score)); -_y += _lineHeight; - -DrawTextShadow(_x, _y, "Time bonus: " + string(global.scoreBonus)); -_y += _lineHeight * 3.0; - -draw_set_font(Fnt24); -_lineHeight = string_height("Q"); -DrawTextShadow(_x, _y, "Press LMB to try again", - c_white, c_black, dsin(current_time * 0.5) * 0.5 + 0.5); - -draw_set_font(_font); -draw_set_halign(fa_left); diff --git a/BBMOD_GML/objects/OGameOver/Mouse_53.gml b/BBMOD_GML/objects/OGameOver/Mouse_53.gml deleted file mode 100644 index 7a99d4fa..00000000 --- a/BBMOD_GML/objects/OGameOver/Mouse_53.gml +++ /dev/null @@ -1,4 +0,0 @@ -if (current_time - time > 500.0) -{ - room_goto(RmDemo); -} diff --git a/BBMOD_GML/objects/OGameOver/OGameOver.yy b/BBMOD_GML/objects/OGameOver/OGameOver.yy deleted file mode 100644 index 4f235f8b..00000000 --- a/BBMOD_GML/objects/OGameOver/OGameOver.yy +++ /dev/null @@ -1,37 +0,0 @@ -{ - "$GMObject":"", - "%Name":"OGameOver", - "eventList":[ - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":53,"eventType":6,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - ], - "managed":true, - "name":"OGameOver", - "overriddenProperties":[], - "parent":{ - "name":"Objects", - "path":"folders/Demo/Objects.yy", - }, - "parentObjectId":null, - "persistent":false, - "physicsAngularDamping":0.1, - "physicsDensity":0.5, - "physicsFriction":0.2, - "physicsGroup":1, - "physicsKinematic":false, - "physicsLinearDamping":0.1, - "physicsObject":false, - "physicsRestitution":0.1, - "physicsSensor":false, - "physicsShape":1, - "physicsShapePoints":[], - "physicsStartAwake":true, - "properties":[], - "resourceType":"GMObject", - "resourceVersion":"2.0", - "solid":false, - "spriteId":null, - "spriteMaskId":null, - "visible":true, -} \ No newline at end of file diff --git a/BBMOD_GML/objects/OGun/Create_0.gml b/BBMOD_GML/objects/OGun/Create_0.gml deleted file mode 100644 index 32935670..00000000 --- a/BBMOD_GML/objects/OGun/Create_0.gml +++ /dev/null @@ -1,9 +0,0 @@ -event_inherited(); - -// Ammo given to the player when picked up. -ammo = irandom_range(3, 6); - -OnPickUp = function (_other) -{ - _other.ammo += ammo; -}; diff --git a/BBMOD_GML/objects/OGun/Draw_0.gml b/BBMOD_GML/objects/OGun/Draw_0.gml deleted file mode 100644 index b76c8364..00000000 --- a/BBMOD_GML/objects/OGun/Draw_0.gml +++ /dev/null @@ -1,7 +0,0 @@ -bbmod_set_instance_id(id); -var _z = z + 2 + dsin(current_time * 0.25) * 0.5 + 0.5; -var _direction = current_time * 0.1; -var _scale = 10; -matrix_set(matrix_world, - matrix_build(x, y, _z, 0, 0, _direction, _scale, _scale, _scale)); -OMain.modGun.render(); diff --git a/BBMOD_GML/objects/OGun/OGun.yy b/BBMOD_GML/objects/OGun/OGun.yy deleted file mode 100644 index 3ed1807a..00000000 --- a/BBMOD_GML/objects/OGun/OGun.yy +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$GMObject":"", - "%Name":"OGun", - "eventList":[ - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - ], - "managed":true, - "name":"OGun", - "overriddenProperties":[], - "parent":{ - "name":"Items", - "path":"folders/Demo/Objects/Items.yy", - }, - "parentObjectId":{ - "name":"OItem", - "path":"objects/OItem/OItem.yy", - }, - "persistent":false, - "physicsAngularDamping":0.1, - "physicsDensity":0.5, - "physicsFriction":0.2, - "physicsGroup":1, - "physicsKinematic":false, - "physicsLinearDamping":0.1, - "physicsObject":false, - "physicsRestitution":0.1, - "physicsSensor":false, - "physicsShape":1, - "physicsShapePoints":[], - "physicsStartAwake":true, - "properties":[], - "resourceType":"GMObject", - "resourceVersion":"2.0", - "solid":false, - "spriteId":null, - "spriteMaskId":null, - "visible":true, -} \ No newline at end of file diff --git a/BBMOD_GML/objects/OInit/Create_0.gml b/BBMOD_GML/objects/OInit/Create_0.gml deleted file mode 100644 index 84392aaf..00000000 --- a/BBMOD_GML/objects/OInit/Create_0.gml +++ /dev/null @@ -1,39 +0,0 @@ -randomize(); -global.day = choose(true, false); - -// Used to easily load, retrieve and free resources from memory. -global.resourceManager = new BBMOD_ResourceManager(); - -//////////////////////////////////////////////////////////////////////////////// -// Create terrain -var _dirt = new BBMOD_TerrainLayer() -_dirt.BaseOpacity = sprite_get_texture(SprDirt, 0); -_dirt.NormalSmoothness = sprite_get_texture(SprDirt, 1); - -var _sand = new BBMOD_TerrainLayer() -_sand.BaseOpacity = sprite_get_texture(SprSand, 0); -_sand.NormalSmoothness = sprite_get_texture(SprSand, 1); - -var _deferred = bbmod_deferred_renderer_is_supported(); - -global.terrain = new BBMOD_Terrain(SprHeightmap); -global.terrain.Material = (_deferred ? BBMOD_MATERIAL_TERRAIN_DEFERRED : BBMOD_MATERIAL_TERRAIN).clone(); -if (!_deferred) -{ - global.terrain.Material.set_shader(BBMOD_ERenderPass.DepthOnly, BBMOD_SHADER_DEFAULT_DEPTH); -} -global.terrain.Material.set_shader(BBMOD_ERenderPass.Shadows, BBMOD_SHADER_DEFAULT_DEPTH); -global.terrain.Scale = new BBMOD_Vec3(4.0, 4.0, 1.0); -global.terrain.TextureRepeat = new BBMOD_Vec2(32.0); -global.terrain.Layer[@ 0] = _sand; -global.terrain.Layer[@ 1] = _dirt; -global.terrain.Splatmap = sprite_get_texture(SprSplatmap, 0); -global.terrain.build_layer_index(); - -if (!_deferred) -{ - BBMOD_MATERIAL_DEFAULT.set_shader( - BBMOD_ERenderPass.DepthOnly, BBMOD_SHADER_DEFAULT_DEPTH); -} - -room_goto(RmDemo); diff --git a/BBMOD_GML/objects/OInit/OInit.yy b/BBMOD_GML/objects/OInit/OInit.yy deleted file mode 100644 index 83e2f47c..00000000 --- a/BBMOD_GML/objects/OInit/OInit.yy +++ /dev/null @@ -1,35 +0,0 @@ -{ - "$GMObject":"", - "%Name":"OInit", - "eventList":[ - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - ], - "managed":true, - "name":"OInit", - "overriddenProperties":[], - "parent":{ - "name":"Objects", - "path":"folders/Demo/Objects.yy", - }, - "parentObjectId":null, - "persistent":false, - "physicsAngularDamping":0.1, - "physicsDensity":0.5, - "physicsFriction":0.2, - "physicsGroup":1, - "physicsKinematic":false, - "physicsLinearDamping":0.1, - "physicsObject":false, - "physicsRestitution":0.1, - "physicsSensor":false, - "physicsShape":1, - "physicsShapePoints":[], - "physicsStartAwake":true, - "properties":[], - "resourceType":"GMObject", - "resourceVersion":"2.0", - "solid":false, - "spriteId":null, - "spriteMaskId":null, - "visible":true, -} \ No newline at end of file diff --git a/BBMOD_GML/objects/OItem/Create_0.gml b/BBMOD_GML/objects/OItem/Create_0.gml deleted file mode 100644 index f93e5a2c..00000000 --- a/BBMOD_GML/objects/OItem/Create_0.gml +++ /dev/null @@ -1,10 +0,0 @@ -event_inherited(); - -// How far can the player be from the gun to be able to pick it up. -pickupRange = 20.0; - -// A function executed when the item is picked up. `_other` will be an instance -// that picked up the item. -OnPickUp = function (_other) -{ -}; diff --git a/BBMOD_GML/objects/OItem/OItem.yy b/BBMOD_GML/objects/OItem/OItem.yy deleted file mode 100644 index ef1de58b..00000000 --- a/BBMOD_GML/objects/OItem/OItem.yy +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$GMObject":"", - "%Name":"OItem", - "eventList":[ - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - ], - "managed":true, - "name":"OItem", - "overriddenProperties":[], - "parent":{ - "name":"Items", - "path":"folders/Demo/Objects/Items.yy", - }, - "parentObjectId":{ - "name":"OObject3D", - "path":"objects/OObject3D/OObject3D.yy", - }, - "persistent":false, - "physicsAngularDamping":0.1, - "physicsDensity":0.5, - "physicsFriction":0.2, - "physicsGroup":1, - "physicsKinematic":false, - "physicsLinearDamping":0.1, - "physicsObject":false, - "physicsRestitution":0.1, - "physicsSensor":false, - "physicsShape":1, - "physicsShapePoints":[], - "physicsStartAwake":true, - "properties":[], - "resourceType":"GMObject", - "resourceVersion":"2.0", - "solid":false, - "spriteId":null, - "spriteMaskId":null, - "visible":true, -} \ No newline at end of file diff --git a/BBMOD_GML/objects/OItem/Step_0.gml b/BBMOD_GML/objects/OItem/Step_0.gml deleted file mode 100644 index 84afa810..00000000 --- a/BBMOD_GML/objects/OItem/Step_0.gml +++ /dev/null @@ -1,7 +0,0 @@ -var _terrain = global.terrain; -var _terrainPosition = _terrain.Position; -var _terrainSize = _terrain.Size; -var _terrainScale = _terrain.Scale; - -x = _terrainPosition.X + clamp(x, 0, _terrainSize.X * _terrainScale.X); -y = _terrainPosition.Y + clamp(y, 0, _terrainSize.Y * _terrainScale.Y); diff --git a/BBMOD_GML/objects/OMain/CleanUp_0.gml b/BBMOD_GML/objects/OMain/CleanUp_0.gml deleted file mode 100644 index 64145029..00000000 --- a/BBMOD_GML/objects/OMain/CleanUp_0.gml +++ /dev/null @@ -1,4 +0,0 @@ -batchShell = batchShell.destroy(); -renderer = renderer.destroy(); -postProcessor = postProcessor.destroy(); -bbmod_reflection_probe_clear(); diff --git a/BBMOD_GML/objects/OMain/Create_0.gml b/BBMOD_GML/objects/OMain/Create_0.gml deleted file mode 100644 index b0ca2257..00000000 --- a/BBMOD_GML/objects/OMain/Create_0.gml +++ /dev/null @@ -1,151 +0,0 @@ -#macro DELTA_TIME (delta_time * global.gameSpeed) - -var _deferred = bbmod_deferred_renderer_is_supported(); - -// Used to pause the game (with 0.0). -global.gameSpeed = 1.0; - -randomize(); -os_powersave_enable(false); -display_set_gui_maximize(1, 1); -audio_falloff_set_model(audio_falloff_linear_distance); -gpu_set_tex_max_aniso(2); - -// If true then debug overlay is enabled. -debugOverlay = false; - -// Score recieved by killing zombies. -score = 0; - -// Score recieved when all zombies in a wave are killed before the timeout. -global.scoreBonus = 0; - -// Current wave of zombies. -wave = 1; - -// Timeout till the next wave of zombies (in seconds). -waveTimeout = 10.0; - -//////////////////////////////////////////////////////////////////////////////// -// Import OBJ models - -var _objImporter = new BBMOD_OBJImporter(); -_objImporter.FlipUVVertically = true; - -modGun = _objImporter.import("Data/Assets/Pistol.obj"); -modGun.freeze(); - -var _matGunBase = (_deferred ? BBMOD_MATERIAL_DEFERRED : BBMOD_MATERIAL_DEFAULT).clone() - .set_shader( - BBMOD_ERenderPass.Id, BBMOD_SHADER_INSTANCE_ID) // Enable instance selecting - .set_shader( - BBMOD_ERenderPass.Shadows, BBMOD_SHADER_DEFAULT_DEPTH); // Enable casting shadows - -matGun0 = _matGunBase.clone() - .set_base_opacity(BBMOD_C_SILVER, 1.0) - .set_metallic_ao(1.0, 1.0) - .set_normal_roughness(BBMOD_VEC3_UP, 0.3); - -matGun1 = _matGunBase.clone() - .set_base_opacity(new BBMOD_Color(32, 32, 32)); - -matGun2 = _matGunBase.clone() - .set_base_opacity(BBMOD_C_BLACK); - -modGun.Materials[@ 0] = matGun0; -modGun.Materials[@ 1] = matGun1; -modGun.Materials[@ 2] = matGun2; - -// Dynamically batch shells -modShell = _objImporter.import("Data/Assets/Shell.obj"); - -matShell = (_deferred ? BBMOD_MATERIAL_DEFERRED : BBMOD_MATERIAL_DEFAULT).clone() - .set_shader(BBMOD_ERenderPass.Id, BBMOD_SHADER_INSTANCE_ID_BATCHED) - .set_base_opacity(new BBMOD_Color().FromHex($E8DA56)) - .set_specular_color(new BBMOD_Color().FromConstant($E8DA56)) - .set_normal_smoothness(BBMOD_VEC3_UP, 0.7); -matShell.Culling = cull_noculling; - -batchShell = new BBMOD_DynamicBatch(modShell, 32).freeze(); -batchShell.Batch.Materials[0] = matShell; - -_objImporter = _objImporter.destroy(); - -//////////////////////////////////////////////////////////////////////////////// -// Create a renderer -gizmo = new BBMOD_Gizmo(); -gizmo.ButtonDrag = mb_right; - -renderer = new (_deferred ? BBMOD_DeferredRenderer : BBMOD_DefaultRenderer)(); -renderer.Gizmo = gizmo; -renderer.ButtonSelect = mb_right; -renderer.UseAppSurface = true; -renderer.RenderScale = (os_browser == browser_not_a_browser) ? 1.0 : 0.8; -renderer.EnableShadows = true; - -postProcessor = new BBMOD_PostProcessor(); -renderer.PostProcessor = postProcessor; - -postProcessor.add_effect(new BBMOD_LightBloomEffect()); -directionalBlur = new BBMOD_DirectionalBlurEffect(); -postProcessor.add_effect(directionalBlur); -radialBlur = new BBMOD_RadialBlurEffect(); -radialBlur.Strength = 0.0; -radialBlur.Step = 1.0 / 16.0; -postProcessor.add_effect(radialBlur); - -if (bbmod_deferred_renderer_is_supported()) -{ - postProcessor.add_effect(new BBMOD_ExposureEffect()); - postProcessor.add_effect(new BBMOD_ReinhardTonemapEffect()); - postProcessor.add_effect(new BBMOD_GammaCorrectEffect()); -} - -postProcessor.add_effect(new BBMOD_LensFlaresEffect()); - -postProcessor.add_effect( - new BBMOD_ColorGradingEffect( - sprite_get_texture(SprColorGrading, 0) - ) -); - -monochrome = new BBMOD_MonochromeEffect(0.0); -postProcessor.add_effect(monochrome); -postProcessor.add_effect( - new BBMOD_ChromaticAberrationEffect( - 3.0, - new BBMOD_Vec3(-1.0, 1.0, -1.0) - ) -); - -vignette = new BBMOD_VignetteEffect(0.0, c_red); -postProcessor.add_effect(vignette); -postProcessor.add_effect(new BBMOD_VignetteEffect(0.8)); - -if (os_browser == browser_not_a_browser) -{ - renderer.EnableGBuffer = true; - renderer.EnableSSAO = true; - renderer.SSAORadius = 32.0; - renderer.SSAODepthRange = 5.0; - renderer.SSAOPower = 2.0; - - postProcessor.add_effect(new BBMOD_FXAAEffect()); -} - -// Any object/struct that has a render method can be added to the renderer: -renderer - .add(batchShell) - .add(global.terrain) - ; - -// Add a refleciton probe -var _terrainWidth = global.terrain.Size.X * global.terrain.Scale.X; -var _terrainHeight = global.terrain.Size.Y * global.terrain.Scale.Y; -var _probeX = _terrainWidth / 2; -var _probeY = _terrainHeight / 2; -var _probeZ = global.terrain.get_height(_probeX, _probeY) + 20; - -reflectionProbe = new BBMOD_ReflectionProbe(new BBMOD_Vec3(_probeX, _probeY, _probeZ)); -reflectionProbe.Infinite = true; -bbmod_reflection_probe_add(reflectionProbe); diff --git a/BBMOD_GML/objects/OMain/Draw_0.gml b/BBMOD_GML/objects/OMain/Draw_0.gml deleted file mode 100644 index 34554830..00000000 --- a/BBMOD_GML/objects/OMain/Draw_0.gml +++ /dev/null @@ -1,13 +0,0 @@ -draw_clear(c_black); -OPlayer.camera.apply(); -renderer.render(); - -if (debugOverlay) -{ - matrix_set(matrix_world, matrix_build_identity()); - - with (OZombie) - { - collider.DrawDebug(); - } -} diff --git a/BBMOD_GML/objects/OMain/Draw_64.gml b/BBMOD_GML/objects/OMain/Draw_64.gml deleted file mode 100644 index f97d5c0b..00000000 --- a/BBMOD_GML/objects/OMain/Draw_64.gml +++ /dev/null @@ -1,127 +0,0 @@ -if (!renderer.UseAppSurface) -{ - renderer.present(); -} - -var _windowWidth = window_get_width(); -var _windowHeight = window_get_height(); -var _font = draw_get_font(); -var _camera = OPlayer.camera; - -//////////////////////////////////////////////////////////////////////////////// -// Draw zombies' healthbar -with (OZombie) -{ - if (hp <= 0 || hp == hpMax) - { - // Do not draw healthbar when dead or HP is full. - continue; - } - var _screenPos = _camera.world_to_screen(new BBMOD_Vec3(x, y, z + 42)); - if (!_screenPos) - { - // Zombie is outside of the screen. - continue; - } - var _width = 60; - var _height = 10; - var _x = round(_screenPos.X - _width * 0.5); - var _y = round(_screenPos.Y - _height * 0.5); - draw_rectangle_color(_x, _y, _x + _width, _y + _height, 0, 0, 0, 0, false); - draw_rectangle_color( - _x + 2, _y + 2, _x + 2 + (_width - 4) * (hp / hpMax), _y + 2 + _height - 4, - c_red, c_red, c_maroon, c_maroon, false); -} - -draw_set_font(Fnt16); - -//////////////////////////////////////////////////////////////////////////////// -// Draw floating text -with (OFloatingText) -{ - var _screenPos = _camera.world_to_screen(new BBMOD_Vec3(x, y, z)); - if (!_screenPos) - { - // Floating text is outside of the screen. - continue; - } - DrawTextShadow(_screenPos.X, _screenPos.Y, text); -} - -//////////////////////////////////////////////////////////////////////////////// -// Draw item pickup text -with (OItem) -{ - if (OPlayer.pickupTarget == id) - { - continue; - } - if (point_distance(x, y, OPlayer.x, OPlayer.y) > pickupRange) - { - continue; - } - var _screenPos = _camera.world_to_screen(new BBMOD_Vec3(x, y, z)); - if (!_screenPos) - { - // Text is outside of the screen. - continue; - } - DrawTextShadow(_screenPos.X, _screenPos.Y, "E"); -} - -draw_set_font(_font); - -//////////////////////////////////////////////////////////////////////////////// -// Draw crosshair -if (OPlayer.aiming) -{ - draw_sprite(SprCrosshair, 0, - round(_windowWidth / 2), - round(_windowHeight / 2)); -} - -//////////////////////////////////////////////////////////////////////////////// -// Draw score -draw_set_font(Fnt24); -draw_set_halign(fa_center); -var _text = string(score); -if (global.scoreBonus > 0) -{ - _text += "+" + string(global.scoreBonus); -} -DrawTextShadow(floor(_windowWidth * 0.5), 16, _text); - -//////////////////////////////////////////////////////////////////////////////// -// Draw time remaining till the next wave is spawned -draw_set_font(Fnt16); -draw_set_halign(fa_right); -DrawTextShadow( - _windowWidth - 16, 16, - string(ceil(waveTimeout)) + "s", - (waveTimeout > 5.0) ? c_white : c_red); - -//////////////////////////////////////////////////////////////////////////////// -// Draw ammo -if (OPlayer.ammo > 0) -{ - draw_set_valign(fa_bottom); - DrawTextShadow(_windowWidth - 16, _windowHeight - 16, OPlayer.ammo); - draw_set_valign(fa_top); -} - -//////////////////////////////////////////////////////////////////////////////// -// Draw pause text -if (global.gameSpeed == 0) -{ - draw_set_font(Fnt48); - draw_set_halign(fa_center); - draw_set_valign(fa_bottom); - DrawTextShadow( - round(_windowWidth * 0.5), _windowHeight - 16, - "PAUSE", - c_white, c_black, dsin(current_time * 0.5) * 0.5 + 0.5); - draw_set_valign(fa_top); -} - -draw_set_halign(fa_left); -draw_set_font(_font); diff --git a/BBMOD_GML/objects/OMain/Draw_77.gml b/BBMOD_GML/objects/OMain/Draw_77.gml deleted file mode 100644 index d8518d2e..00000000 --- a/BBMOD_GML/objects/OMain/Draw_77.gml +++ /dev/null @@ -1,6 +0,0 @@ -matrix_set(matrix_world, matrix_build_identity()); - -if (renderer.UseAppSurface) -{ - renderer.present(); -} diff --git a/BBMOD_GML/objects/OMain/OMain.yy b/BBMOD_GML/objects/OMain/OMain.yy deleted file mode 100644 index e98fa8d4..00000000 --- a/BBMOD_GML/objects/OMain/OMain.yy +++ /dev/null @@ -1,43 +0,0 @@ -{ - "$GMObject":"", - "%Name":"OMain", - "eventList":[ - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":77,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":64,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":2,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":12,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":72,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":60,"eventType":7,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - ], - "managed":true, - "name":"OMain", - "overriddenProperties":[], - "parent":{ - "name":"Objects", - "path":"folders/Demo/Objects.yy", - }, - "parentObjectId":null, - "persistent":false, - "physicsAngularDamping":0.1, - "physicsDensity":0.5, - "physicsFriction":0.2, - "physicsGroup":0, - "physicsKinematic":false, - "physicsLinearDamping":0.1, - "physicsObject":false, - "physicsRestitution":0.1, - "physicsSensor":false, - "physicsShape":1, - "physicsShapePoints":[], - "physicsStartAwake":true, - "properties":[], - "resourceType":"GMObject", - "resourceVersion":"2.0", - "solid":false, - "spriteId":null, - "spriteMaskId":null, - "visible":true, -} \ No newline at end of file diff --git a/BBMOD_GML/objects/OMain/Other_60.gml b/BBMOD_GML/objects/OMain/Other_60.gml deleted file mode 100644 index 795320e7..00000000 --- a/BBMOD_GML/objects/OMain/Other_60.gml +++ /dev/null @@ -1 +0,0 @@ -global.resourceManager.async_image_loaded_update(async_load); diff --git a/BBMOD_GML/objects/OMain/Other_72.gml b/BBMOD_GML/objects/OMain/Other_72.gml deleted file mode 100644 index 0799f6a0..00000000 --- a/BBMOD_GML/objects/OMain/Other_72.gml +++ /dev/null @@ -1 +0,0 @@ -global.resourceManager.async_save_load_update(async_load); diff --git a/BBMOD_GML/objects/OMain/Step_0.gml b/BBMOD_GML/objects/OMain/Step_0.gml deleted file mode 100644 index 0089a758..00000000 --- a/BBMOD_GML/objects/OMain/Step_0.gml +++ /dev/null @@ -1,67 +0,0 @@ -// Show/hide debug overlay -if (keyboard_check_pressed(vk_f1)) -{ - debugOverlay = !debugOverlay; - show_debug_overlay(debugOverlay); -} - -if (keyboard_check_pressed(vk_enter)) -{ - reflectionProbe.set_position(new BBMOD_Vec3( - OPlayer.x, - OPlayer.y, - OPlayer.z + 30, - )); - reflectionProbe.NeedsUpdate = true; -} - -// Enable editing mode when the game is paused -renderer.EditMode = (global.gameSpeed == 0.0); - -//////////////////////////////////////////////////////////////////////////////// -// Spawn waves of zombies -waveTimeout -= DELTA_TIME * 0.000001; -if (!instance_exists(OZombie) - || waveTimeout <= 0) -{ - global.scoreBonus += max(ceil(waveTimeout), 0); - - repeat (++wave) - { - repeat (3) - { - var _randomX = OPlayer.x + random_range(-250, 250); - var _randomY = OPlayer.y + random_range(-250, 250); - if (global.terrain.in_bounds(_randomX, _randomY)) - { - var _randomZ = global.terrain.get_height(_randomX, _randomY); - instance_create_layer( - _randomX, - _randomY, - "Instances", - OZombie, { z: _randomZ }); - break; - } - } - } - - // Give one zombie a gun - with (OZombie) - { - dropGun = true; - break; - } - - waveTimeout = wave * 10; -} - -//////////////////////////////////////////////////////////////////////////////// -// Screen effects based on players health etc. -var _grayscale = (OPlayer.hp <= ceil(OPlayer.hpMax / 3.0)) ? 0.75 : 0.0; -monochrome.Strength = bbmod_lerp_delta_time( - monochrome.Strength, _grayscale, 0.1, DELTA_TIME); - -vignette.Strength = lerp(0.0, 1.5, OPlayer.hurt); - -radialBlur.Strength = bbmod_lerp_delta_time( - radialBlur.Strength, OPlayer.aiming ? 1.0 : 0.0, 0.1, DELTA_TIME); diff --git a/BBMOD_GML/objects/OMain/Step_2.gml b/BBMOD_GML/objects/OMain/Step_2.gml deleted file mode 100644 index f96ea401..00000000 --- a/BBMOD_GML/objects/OMain/Step_2.gml +++ /dev/null @@ -1 +0,0 @@ -renderer.update(DELTA_TIME); diff --git a/BBMOD_GML/objects/OObject3D/Create_0.gml b/BBMOD_GML/objects/OObject3D/Create_0.gml deleted file mode 100644 index 3e958077..00000000 --- a/BBMOD_GML/objects/OObject3D/Create_0.gml +++ /dev/null @@ -1,11 +0,0 @@ -// Used instead of regular speed variable so we can pause the game easily. -speedCurrent = 0.0; - -// The object's position on the z axis. -z = 0; - -// The object's speed on the z axis. -zspeed = 0; - -// True if the object is on ground. -onGround = false; diff --git a/BBMOD_GML/objects/OObject3D/OObject3D.yy b/BBMOD_GML/objects/OObject3D/OObject3D.yy deleted file mode 100644 index d5f68d50..00000000 --- a/BBMOD_GML/objects/OObject3D/OObject3D.yy +++ /dev/null @@ -1,36 +0,0 @@ -{ - "$GMObject":"", - "%Name":"OObject3D", - "eventList":[ - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":2,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - ], - "managed":true, - "name":"OObject3D", - "overriddenProperties":[], - "parent":{ - "name":"Objects", - "path":"folders/Demo/Objects.yy", - }, - "parentObjectId":null, - "persistent":false, - "physicsAngularDamping":0.1, - "physicsDensity":0.5, - "physicsFriction":0.2, - "physicsGroup":1, - "physicsKinematic":false, - "physicsLinearDamping":0.1, - "physicsObject":false, - "physicsRestitution":0.1, - "physicsSensor":false, - "physicsShape":1, - "physicsShapePoints":[], - "physicsStartAwake":true, - "properties":[], - "resourceType":"GMObject", - "resourceVersion":"2.0", - "solid":false, - "spriteId":null, - "spriteMaskId":null, - "visible":true, -} \ No newline at end of file diff --git a/BBMOD_GML/objects/OObject3D/Step_2.gml b/BBMOD_GML/objects/OObject3D/Step_2.gml deleted file mode 100644 index 5fbd6515..00000000 --- a/BBMOD_GML/objects/OObject3D/Step_2.gml +++ /dev/null @@ -1,30 +0,0 @@ -x += lengthdir_x(speedCurrent * global.gameSpeed, direction); -y += lengthdir_y(speedCurrent * global.gameSpeed, direction); -z += zspeed * global.gameSpeed; - -zspeed -= 0.1 * global.gameSpeed; - -var _terrainHeight = global.terrain.get_height(x, y); - -if (_terrainHeight != undefined) -{ - if (zspeed > 0) - { - onGround = false; - } - - if (z < _terrainHeight) - { - onGround = true; - } - - if (onGround) - { - z = _terrainHeight; - zspeed = 0; - } -} -else -{ - onGround = false; -} diff --git a/BBMOD_GML/objects/OPlayer/CleanUp_0.gml b/BBMOD_GML/objects/OPlayer/CleanUp_0.gml deleted file mode 100644 index 4a0d582b..00000000 --- a/BBMOD_GML/objects/OPlayer/CleanUp_0.gml +++ /dev/null @@ -1,6 +0,0 @@ -event_inherited(); - -camera = camera.destroy(); - -bbmod_light_punctual_remove(flashlight); -window_set_cursor(cr_default); diff --git a/BBMOD_GML/objects/OPlayer/Create_0.gml b/BBMOD_GML/objects/OPlayer/Create_0.gml deleted file mode 100644 index 19dbcb60..00000000 --- a/BBMOD_GML/objects/OPlayer/Create_0.gml +++ /dev/null @@ -1,292 +0,0 @@ -event_inherited(); - -// The player speed when they're running. -speedRun = 1.75; - -// The id of the item that the player is picking up (or undefined). -pickupTarget = undefined; - -// Number of ammo that the player has. -ammo = 0; - -// If true then the player is aiming. -aiming = false; - -// The matrix used when we render a gun in the player's hand. -matrixGun = matrix_build_identity(); - -punchRight = true; - -chainPunch = false; - -flashlight = new BBMOD_SpotLight(); -flashlight.RenderPass = ~(1 << BBMOD_ERenderPass.ReflectionCapture); -flashlight.CastShadows = true; -flashlight.Range = 300; -flashlight.Color.Alpha = 0.5; -flashlight.AngleInner = 15; -flashlight.AngleOuter = 30; -bbmod_light_punctual_add(flashlight); - -//////////////////////////////////////////////////////////////////////////////// -// Camera - -// Define how for the camera is from the player when they aren't aiming. -zoomIdle = 50; - -// Define how for the camera is from the player when the are aiming. -zoomAim = 5; - -camera = new BBMOD_Camera(); -camera.FollowObject = self; -camera.FollowFactor = 0.25; -camera.Offset = new BBMOD_Vec3(10, 0, 25); -camera.Zoom = zoomIdle; -camera.MouseSensitivity = 0.75; - -//camera.Width = undefined; -//camera.Height = 150; -//camera.Orthographic = true; -//camera.ZFar = 300; -//camera.ZNear = -300; - -//////////////////////////////////////////////////////////////////////////////// -// Load resources -matPlayer = global.resourceManager.get_or_add("matPlayer", function () { - var _deferred = bbmod_deferred_renderer_is_supported(); - var _material = (_deferred ? BBMOD_MATERIAL_DEFERRED : BBMOD_MATERIAL_DEFAULT).clone() - .set_shader(BBMOD_ERenderPass.Id, BBMOD_SHADER_INSTANCE_ID) // Enable instance selecting - .set_shader(BBMOD_ERenderPass.Shadows, BBMOD_SHADER_DEFAULT_DEPTH); // Enable casting shadows - _material.BaseOpacity = sprite_get_texture(SprPlayer, choose(0, 1)); - return _material; -}); - -animAim = global.resourceManager.load( - "Data/Assets/Character/Character_Aim.bbanim"); - -animShoot = global.resourceManager.load( - "Data/Assets/Character/Character_Shoot.bbanim"); - -animPunchLeft = global.resourceManager.load( - "Data/Assets/Character/Character_PunchLeft.bbanim", - function (_err, _animation) { - if (!_err) - { - _animation.add_event(3, "Footstep"); - _animation.add_event(round(_animation.Duration / 4), "ChainPunch"); - } - }); - -animPunchRight = global.resourceManager.load( - "Data/Assets/Character/Character_PunchRight.bbanim", - function (_err, _animation) { - if (!_err) - { - _animation.add_event(3, "Footstep"); - _animation.add_event(round(_animation.Duration / 4), "ChainPunch"); - } - }); - -animIdle = global.resourceManager.load( - "Data/Assets/Character/Character_Idle.bbanim"); - -animInteractGround = global.resourceManager.load( - "Data/Assets/Character/Character_Interact_ground.bbanim", - function (_err, _animation) { - if (!_err) - { - _animation.add_event(52, "PickUp"); - } - }); - -animJump = global.resourceManager.load( - "Data/Assets/Character/Character_Jump.bbanim"); - -animRun = global.resourceManager.load( - "Data/Assets/Character/Character_Run.bbanim", - function (_err, _animation) { - if (!_err) - { - _animation.add_event(0, "Footstep") - .add_event(16, "Footstep"); - } - }); - -animWalk = global.resourceManager.load( - "Data/Assets/Character/Character_Walk.bbanim", - function (_err, _animation) { - if (!_err) - { - _animation.add_event(0, "Footstep") - .add_event(32, "Footstep"); - } - }); - -//////////////////////////////////////////////////////////////////////////////// -// Animation state machine - -animationPlayer.on_event("ChainPunch", method(self, function () { - chainPunch = true; -})); - -// Go to the state "Idle" when the state machine starts. -animationStateMachine.OnEnter = method(self, function () { - animationStateMachine.change_state(stateIdle); -}); - -// This function is executed independently on the current state. -animationStateMachine.OnPreUpdate = method(self, function () { - var _stateCurrent = animationStateMachine.State; - - // Go to state "Jump" if the player is above the ground of they're falling - // out of the map. - var _terrainHeight = global.terrain.get_height(x, y); - - if ((_terrainHeight == undefined || z > _terrainHeight + 5 || z < -1) - && _stateCurrent != stateJump) - { - animationStateMachine.change_state(stateJump); - return; - } - - // Go to state "InteractGround" when the player is picking up an item. - if (pickupTarget != undefined - && _stateCurrent != stateInteractGround) - { - animationStateMachine.change_state(stateInteractGround); - return; - } - - // Go to state "Aim" if the player is aiming. - if (aiming - && _stateCurrent != stateAim - && _stateCurrent != stateShoot) - { - animationStateMachine.change_state(stateAim); - return; - } -}); - -stateIdle = new BBMOD_AnimationState("Idle", animIdle, true); -stateIdle.OnUpdate = method(self, function () { - // Go to state "Run" if the player's speed is greater or equal to the - // running speed. - if (speedCurrent >= speedRun) - { - animationStateMachine.change_state(stateRun); - return; - } - - // Go to state "Walk" if the player's speed is greater or equal to the - // walking speed. - if (speedCurrent >= speedWalk) - { - animationStateMachine.change_state(stateWalk); - return; - } -}); -animationStateMachine.add_state(stateIdle); - -stateWalk = new BBMOD_AnimationState("Walk", animWalk, true); -stateWalk.OnUpdate = method(self, function () { - // Go to the "Idle" state if the player's speed is less than the walking - // speed. - if (speedCurrent < speedWalk) - { - animationStateMachine.change_state(stateIdle); - return; - } - - // Go to the "Run" state if the player's speed is greater than the walking - // speed. - if (speedCurrent >= speedRun) - { - animationStateMachine.change_state(stateRun); - return; - } -}); -animationStateMachine.add_state(stateWalk); - -stateRun = new BBMOD_AnimationState("Run", animRun, true); -stateRun.OnUpdate = method(self, function () { - // Go to the "Walk" state if the player's speed is less than the running - // speed. - if (speedCurrent < speedRun) - { - animationStateMachine.change_state(stateWalk); - return; - } -}); -animationStateMachine.add_state(stateRun); - -stateJump = new BBMOD_AnimationState("Jump", animJump, true); -stateJump.OnUpdate = method(self, function () { - // Go to the "Idle" state when player falls on the ground. - var _terrainHeight = global.terrain.get_height(x, y); - - if (z == _terrainHeight) - { - animationStateMachine.change_state(stateIdle); - return; - } -}); -animationStateMachine.add_state(stateJump); - -stateAim = new BBMOD_AnimationState("Aim", animAim, true); -stateAim.OnUpdate = method(self, function () { - // Go to the "Idle" state when the player is not aiming. - if (!aiming) - { - animationStateMachine.change_state(stateIdle); - return; - } -}); -animationStateMachine.add_state(stateAim); - -stateShoot = new BBMOD_AnimationState("Shoot", animShoot); -stateShoot.on_event(BBMOD_EV_ANIMATION_END, method(self, function () { - // Go to the "Aim" state at the end of the shooting animation. - animationStateMachine.change_state(stateAim); -})); -animationStateMachine.add_state(stateShoot); - -statePunchLeft = new BBMOD_AnimationState("PunchLeft", animPunchLeft); -statePunchLeft.on_event(BBMOD_EV_ANIMATION_END, method(self, function () { - // Go to the "Idle" state at the end of the punching animation. - animationStateMachine.change_state(stateIdle); -})); -animationStateMachine.add_state(statePunchLeft); - -statePunchRight = new BBMOD_AnimationState("PunchRight", animPunchRight); -statePunchRight.on_event(BBMOD_EV_ANIMATION_END, method(self, function () { - // Go to the "Idle" state at the end of the punching animation. - animationStateMachine.change_state(stateIdle); -})); -animationStateMachine.add_state(statePunchRight); - -stateInteractGround = new BBMOD_AnimationState("InteractGround", animInteractGround); -stateInteractGround.OnUpdate = method(self, function () { - // Rotate towards an item. - if (pickupTarget != undefined - && instance_exists(pickupTarget) - && point_distance(x, y, pickupTarget.x, pickupTarget.y) > 5) - { - direction = point_direction(x, y, pickupTarget.x, pickupTarget.y); - } -}); -stateInteractGround.on_event("PickUp", method(self, function () { - // Pick up an item. - if (instance_exists(pickupTarget)) - { - pickupTarget.OnPickUp(self); - instance_destroy(pickupTarget); - } - pickupTarget = undefined; -})); -stateInteractGround.on_event(BBMOD_EV_ANIMATION_END, method(self, function () { - // Go to the "Idle" state at the end of the animation. - animationStateMachine.change_state(stateIdle); -})); -animationStateMachine.add_state(stateInteractGround); - -animationStateMachine.start(); diff --git a/BBMOD_GML/objects/OPlayer/Draw_0.gml b/BBMOD_GML/objects/OPlayer/Draw_0.gml deleted file mode 100644 index adcdfa3a..00000000 --- a/BBMOD_GML/objects/OPlayer/Draw_0.gml +++ /dev/null @@ -1,10 +0,0 @@ -bbmod_set_instance_id(id); - -matrix_set(matrix_world, matrixBody); -animationPlayer.render([matPlayer]); - -if (ammo > 0) -{ - matrix_set(matrix_world, matrixGun); - OMain.modGun.render(); -} diff --git a/BBMOD_GML/objects/OPlayer/OPlayer.yy b/BBMOD_GML/objects/OPlayer/OPlayer.yy deleted file mode 100644 index c30b2537..00000000 --- a/BBMOD_GML/objects/OPlayer/OPlayer.yy +++ /dev/null @@ -1,42 +0,0 @@ -{ - "$GMObject":"", - "%Name":"OPlayer", - "eventList":[ - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":2,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":12,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - ], - "managed":true, - "name":"OPlayer", - "overriddenProperties":[], - "parent":{ - "name":"Characters", - "path":"folders/Demo/Objects/Characters.yy", - }, - "parentObjectId":{ - "name":"OCharacter", - "path":"objects/OCharacter/OCharacter.yy", - }, - "persistent":false, - "physicsAngularDamping":0.1, - "physicsDensity":0.5, - "physicsFriction":0.2, - "physicsGroup":1, - "physicsKinematic":false, - "physicsLinearDamping":0.1, - "physicsObject":false, - "physicsRestitution":0.1, - "physicsSensor":false, - "physicsShape":1, - "physicsShapePoints":[], - "physicsStartAwake":true, - "properties":[], - "resourceType":"GMObject", - "resourceVersion":"2.0", - "solid":false, - "spriteId":null, - "spriteMaskId":null, - "visible":true, -} \ No newline at end of file diff --git a/BBMOD_GML/objects/OPlayer/Step_0.gml b/BBMOD_GML/objects/OPlayer/Step_0.gml deleted file mode 100644 index 93cf35c3..00000000 --- a/BBMOD_GML/objects/OPlayer/Step_0.gml +++ /dev/null @@ -1,292 +0,0 @@ -var _mouseLeftPressed = mouse_check_button_pressed(mb_left); - -//////////////////////////////////////////////////////////////////////////////// -// Update camera -camera.AspectRatio = window_get_width() / window_get_height(); -camera.MouseSensitivity = aiming ? 0.25 : 1.0; - -if (!camera.MouseLook && mouse_check_button(mb_left)) -{ - camera.set_mouselook(true); - window_set_cursor(cr_none); - // Consume the mouse press when just activating the mouselook. - _mouseLeftPressed = false; -} -else if (keyboard_check_pressed(vk_escape)) -{ - camera.set_mouselook(false); - window_set_cursor(cr_default); -} - -global.gameSpeed = camera.MouseLook ? 1.0 : 0.0; - -camera.Zoom = bbmod_lerp_delta_time(camera.Zoom, aiming ? zoomAim : zoomIdle, 0.2, DELTA_TIME); - -var _directionPrev = camera.Direction; -var _directionUpPrev = camera.DirectionUp; - -camera.update(DELTA_TIME); - -if (DELTA_TIME > 0.0) -{ - var _blur = OMain.directionalBlur; - var _scale = 5.0; - _blur.Vector.Set( - angle_difference(camera.Direction, _directionPrev) * _scale, - angle_difference(camera.DirectionUp, _directionUpPrev) * _scale); - var _length = _blur.Vector.Length(); - _length = (_length > 0.0) ? _length : 1.0; - _blur.Step = 2.0 / min(_length, 32.0); -} - -var _cameraHeight = (global.terrain.get_height(camera.Position.X, camera.Position.Y) ?? 0.0) + 1.0; -if (camera.Position.Z < _cameraHeight) -{ - camera.Position.Z = _cameraHeight; - - // We have to update the camera's matrices if we change its position or - // target after we call its update method. - camera.update_matrices(); -} - -// Increase camera exposure during nighttime -camera.Exposure = bbmod_lerp_delta_time(camera.Exposure, global.day ? 1.0 : 2.0, 0.05, delta_time); - -//////////////////////////////////////////////////////////////////////////////// -// Player controls -if (global.gameSpeed > 0.0) -{ - var _gameSpeed = game_get_speed(gamespeed_microseconds); - var _deltaTime = DELTA_TIME / _gameSpeed; - speedCurrent *= 1.0 - (0.1 * _deltaTime); - - if (global.terrain.in_bounds(x, y) - && animationPlayer.Animation != animInteractGround) - { - var _terrainHeight = global.terrain.get_height(x, y); - - if (_terrainHeight != undefined - && z >= _terrainHeight - && z < _terrainHeight + 5.0) - { - // Shooting - if (ammo > 0 - && camera.MouseLook - && mouse_check_button_pressed(mb_right)) - { - aiming = !aiming; - } - - if (aiming) - { - direction = camera.Direction; - - if (_mouseLeftPressed - /*&& animationStateMachine.State == stateAim*/) - { - animationStateMachine.change_state(stateShoot); - - // Compute the position where a gun shell will be spawned - var _shellPos = matrix_transform_vertex(matrixGun, -0.1, 0, 0.2); - - // Create a shell - var _shell = instance_create_layer(_shellPos[0], _shellPos[1], layer, OShell); - _shell.z = _shellPos[2]; - _shell.direction = direction - 90; - _shell.image_angle = direction; - _shell.speedCurrent = random_range(0.2, 0.5); - _shell.zspeed = random_range(0.5, 1.0); - - // Play a rundom gunshot sound - var _gunfirePosition = matrix_transform_vertex(matrixGun, -0.5, 0, 0.2); - - var _sound = choose( - SndGunshot0, - SndGunshot1, - SndGunshot2, - SndGunshot3, - SndGunshot4, - ); - audio_play_sound_at(_sound, _gunfirePosition[0], _gunfirePosition[1], _gunfirePosition[2], 150, 1000, 1, false, 1); - - // Spawn gunfire emitter - var _emitter = instance_create_layer(_gunfirePosition[0], _gunfirePosition[1], layer, OGunfireEmitter); - _emitter.z = _gunfirePosition[2]; - - // Determine which enemy was shot using a raycast against an AABB at its position. - var _ray = new BBMOD_Ray(camera.Position, camera.get_forward()); - - with (OZombie) - { - if (hp <= 0) - { - continue; - } - - if (collider.Raycast(_ray)) - { - ReceiveDamage(irandom_range(45, 55)); - - knockback = new BBMOD_Vec3( - lengthdir_x(5, other.camera.Direction), - lengthdir_y(5, other.camera.Direction), - 0); - - var _index = audio_play_sound_at( - choose(SndZombie0, SndZombie1), - x, - y, - z + 30, - 10, 1000, 1, false, 1); - audio_sound_pitch(_index, random_range(1.0, 1.5)); - } - } - - if (--ammo == 0) - { - aiming = false; - } - } - } - else if (_mouseLeftPressed - && ((animationStateMachine.State != statePunchRight - && animationStateMachine.State != statePunchLeft) - || chainPunch)) - { - // Punch - animationStateMachine.change_state(punchRight ? statePunchRight : statePunchLeft); - punchRight = !punchRight; - chainPunch = false; - speedCurrent = 2; - - var _hit = false; - var _zombie = instance_nearest(x, y, OZombie); - if (_zombie != noone) - { - var _dist = point_distance(x, y, _zombie.x, _zombie.y); - if (_dist < 30) - { - if (_dist < 25) - { - speedCurrent = 1; - } - - if (_dist > 10) - { - direction = point_direction(x, y, _zombie.x, _zombie.y); - } - - _zombie.ReceiveDamage(irandom_range(15, 20)); - - _zombie.knockback = new BBMOD_Vec3( - lengthdir_x(2, direction), - lengthdir_y(2, direction), - 0); - - var _index = audio_play_sound_at( - SndPunch, - x + lengthdir_x(30, direction), - y + lengthdir_y(30, direction), - z + 30, - 10, 200, 1, false, 1); - audio_sound_pitch(_index, random_range(0.75, 1)); - - _hit = true; - } - } - - if (!_hit) - { - var _index = audio_play_sound_at( - SndWhoosh, - x + lengthdir_x(30, direction), - y + lengthdir_y(30, direction), - z + 30, - 10, 200, 1, false, 1); - audio_sound_pitch(_index, random_range(0.75, 1)); - } - } - - if (keyboard_check_pressed(vk_space)) - { - // Jump - zspeed += 2; - aiming = false; - } - else if (keyboard_check_pressed(ord("E")) - && instance_exists(OItem)) - { - // Pick up an item - var _item = instance_nearest(x, y, OItem); - if (point_distance(x, y, _item.x, _item.y) < _item.pickupRange) - { - pickupTarget = _item; - } - } - } - - var _moveX = keyboard_check(ord("W")) - keyboard_check(ord("S")); - var _moveY = keyboard_check(ord("D")) - keyboard_check(ord("A")); - - if ((_moveX != 0 || _moveY != 0) - && (animationStateMachine.State != statePunchLeft - && animationStateMachine.State != statePunchRight)) - { - aiming = false; - direction = point_direction(0, 0, _moveX, _moveY) + camera.Direction; - speedCurrent = keyboard_check(vk_shift) ? speedWalk : speedRun; - } - } -} - -//////////////////////////////////////////////////////////////////////////////// -// Control bones when the player is aiming -var _chestIndex = 2; -var _neckIndex = 4; -var _rightArmIndex = 16; - -if (aiming) -{ - var _chestRot = (new BBMOD_Quaternion()) - .FromAxisAngle(new BBMOD_Vec3(1, 0, 0), -camera.DirectionUp * 0.25); - animationPlayer.set_node_rotation_post(_chestIndex, _chestRot); - - var _neckRot = (new BBMOD_Quaternion()) - .FromAxisAngle(new BBMOD_Vec3(1, 0, 0), -camera.DirectionUp * 0.25); - animationPlayer.set_node_rotation_post(_neckIndex, _neckRot); - - var _rightArmRot = (new BBMOD_Quaternion()) - .FromAxisAngle(new BBMOD_Vec3(0, 1, 0), camera.DirectionUp * 0.75); - animationPlayer.set_node_rotation_post(_rightArmIndex, _rightArmRot); -} -else -{ - animationPlayer.set_node_rotation_post(_chestIndex, undefined); - animationPlayer.set_node_rotation_post(_neckIndex, undefined); - animationPlayer.set_node_rotation_post(_rightArmIndex, undefined); -} - -//////////////////////////////////////////////////////////////////////////////// -// Game over -if (hp <= 0.0) -{ - room_goto(RmGameOver); -} - -//////////////////////////////////////////////////////////////////////////////// -// Test: Create shadow casting point lights - -//if (keyboard_check_pressed(vk_enter)) -//{ -// var _light = new BBMOD_PointLight(); -// _light.Color = new BBMOD_Color().FromHSV( -// random(255), -// 255, -// 255 -// ); -// _light.Color.Alpha = 0.5; -// _light.Position = new BBMOD_Vec3(x, y, z + 30); -// _light.Range = random_range(50, 100); -// _light.CastShadows = true; -// bbmod_light_punctual_add(_light); -//} diff --git a/BBMOD_GML/objects/OPlayer/Step_2.gml b/BBMOD_GML/objects/OPlayer/Step_2.gml deleted file mode 100644 index cf852d8a..00000000 --- a/BBMOD_GML/objects/OPlayer/Step_2.gml +++ /dev/null @@ -1,31 +0,0 @@ -event_inherited(); - -if (ammo > 0) -{ - var _dqHand = animationPlayer.get_node_transform(19); // 19 = RightHandIndex1 - var _matrixHand = _dqHand.ToMatrix(); - matrixGun = matrix_multiply( - matrix_multiply( - matrix_build(0, 0.1, 0.1, -90, 90, 0, 1, 1, 1), - _matrixHand), - matrixBody); -} - -//////////////////////////////////////////////////////////////////////////////// -// Adjust flashlight -flashlight.Enabled = !global.day; - -if (flashlight.Enabled - && modCharacter.IsLoaded) -{ - var _idHead = modCharacter.find_node_id("Head"); - var _dqHead = animationPlayer.get_node_transform(_idHead); - var _matrixHead = _dqHead.ToMatrix(); - var _matrixFlashlight = matrix_multiply( - matrix_multiply( - matrix_build(0, 0.5, -1, 0, -90, 0, 1, 1, 1), - _matrixHead), - matrixBody); - flashlight.Direction = new BBMOD_Vec4(1.0, -0.25, 0.0, 0.0).Transform(_matrixFlashlight); - flashlight.Position.Set(_matrixFlashlight[12], _matrixFlashlight[13], _matrixFlashlight[14]); -} diff --git a/BBMOD_GML/objects/OShell/Alarm_0.gml b/BBMOD_GML/objects/OShell/Alarm_0.gml deleted file mode 100644 index c4ab0c69..00000000 --- a/BBMOD_GML/objects/OShell/Alarm_0.gml +++ /dev/null @@ -1 +0,0 @@ -instance_destroy(); diff --git a/BBMOD_GML/objects/OShell/CleanUp_0.gml b/BBMOD_GML/objects/OShell/CleanUp_0.gml deleted file mode 100644 index 6241945f..00000000 --- a/BBMOD_GML/objects/OShell/CleanUp_0.gml +++ /dev/null @@ -1,4 +0,0 @@ -if (OMain.batchShell != undefined) -{ - OMain.batchShell.remove_instance(id); -} diff --git a/BBMOD_GML/objects/OShell/Create_0.gml b/BBMOD_GML/objects/OShell/Create_0.gml deleted file mode 100644 index 1e7dc97d..00000000 --- a/BBMOD_GML/objects/OShell/Create_0.gml +++ /dev/null @@ -1,5 +0,0 @@ -event_inherited(); - -onGround = false; - -OMain.batchShell.add_instance(id); diff --git a/BBMOD_GML/objects/OShell/OShell.yy b/BBMOD_GML/objects/OShell/OShell.yy deleted file mode 100644 index d9d10dab..00000000 --- a/BBMOD_GML/objects/OShell/OShell.yy +++ /dev/null @@ -1,41 +0,0 @@ -{ - "$GMObject":"", - "%Name":"OShell", - "eventList":[ - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":2,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":12,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - ], - "managed":true, - "name":"OShell", - "overriddenProperties":[], - "parent":{ - "name":"Effects", - "path":"folders/Demo/Objects/Effects.yy", - }, - "parentObjectId":{ - "name":"OObject3D", - "path":"objects/OObject3D/OObject3D.yy", - }, - "persistent":false, - "physicsAngularDamping":0.1, - "physicsDensity":0.5, - "physicsFriction":0.2, - "physicsGroup":1, - "physicsKinematic":false, - "physicsLinearDamping":0.1, - "physicsObject":false, - "physicsRestitution":0.1, - "physicsSensor":false, - "physicsShape":1, - "physicsShapePoints":[], - "physicsStartAwake":true, - "properties":[], - "resourceType":"GMObject", - "resourceVersion":"2.0", - "solid":false, - "spriteId":null, - "spriteMaskId":null, - "visible":false, -} \ No newline at end of file diff --git a/BBMOD_GML/objects/OShell/Step_2.gml b/BBMOD_GML/objects/OShell/Step_2.gml deleted file mode 100644 index 30bd380b..00000000 --- a/BBMOD_GML/objects/OShell/Step_2.gml +++ /dev/null @@ -1,27 +0,0 @@ -event_inherited(); - -if (onGround && alarm[0] == -1) -{ - var _sound = choose( - SndShell0, - SndShell1, - SndShell2, - SndShell3, - SndShell4, - SndShell5, - SndShell6, - SndShell7, - ); - audio_play_sound_at(_sound, x, y, z, 1, 100, 1, false, 1); - - alarm[0] = 600; -} - -if (onGround) -{ - var _gameSpeed = game_get_speed(gamespeed_microseconds); - var _deltaTime = DELTA_TIME / _gameSpeed; - speedCurrent *= 1.0 - (0.05 * _deltaTime); -} - -OMain.batchShell.update_instance(id); diff --git a/BBMOD_GML/objects/OSky/CleanUp_0.gml b/BBMOD_GML/objects/OSky/CleanUp_0.gml deleted file mode 100644 index 375202a2..00000000 --- a/BBMOD_GML/objects/OSky/CleanUp_0.gml +++ /dev/null @@ -1,4 +0,0 @@ -if (lensFlare != undefined) -{ - bbmod_lens_flare_remove(lensFlare); -} diff --git a/BBMOD_GML/objects/OSky/Create_0.gml b/BBMOD_GML/objects/OSky/Create_0.gml deleted file mode 100644 index 54940ebd..00000000 --- a/BBMOD_GML/objects/OSky/Create_0.gml +++ /dev/null @@ -1,85 +0,0 @@ -event_inherited(); - -global.day = !global.day; - -modSky = global.resourceManager.load( - "Data/BBMOD/Models/Sphere.bbmod", - function (_err, _model) { - if (!_err) - { - _model.freeze(); - } - }); - -matSky = BBMOD_MATERIAL_SKY.clone(); -matSky.BaseOpacity = -1; - -bbmod_light_ambient_set(BBMOD_C_BLACK); - -sunLight = new BBMOD_DirectionalLight(); -sunLight.CastShadows = bbmod_deferred_renderer_is_supported() || global.day; -sunLight.ShadowmapResolution = 4096; -sunLight.ShadowmapArea = 1500; -bbmod_light_directional_set(sunLight); - -// TODO: Fix memory leaks -bbmod_sprite_add_async( - global.day ? "Data/BBMOD/Skies/Sky+20.png" : "Data/BBMOD/Skies/Sky-15.png", - method(self, function (_err, _sprite) { - if (!_err) - { - matSky.BaseOpacity = sprite_get_texture(_sprite, 0); - } - })); - -bbmod_sprite_add_async( - global.day ? "Data/BBMOD/Skies/IBL+20.png" : "Data/BBMOD/Skies/IBL-15.png", - method(self, function (_err, _sprite) { - if (!_err) - { - skyLight = new BBMOD_ImageBasedLight(sprite_get_texture(_sprite, 0)); - bbmod_ibl_set(skyLight); - } - })); - -lensFlare = undefined; - -if (global.day) -{ - sunLight.Color = BBMOD_C_WHITE; - //sunLight.Direction.Set(0.30, 0.30, -0.87); - sunLight.Direction.Set(0.54, 0.77, -0.34); - - lensFlare = new BBMOD_LensFlare(); - lensFlare.Direction = sunLight.Direction; - lensFlare.add_ghosts(BBMOD_SprLensFlareHeptagon, 0, 8, 0.1, 1.0, 0.5, 0.1, 3.0, BBMOD_C_BLUE); - - _e = new BBMOD_LensFlareElement(BBMOD_SprLensFlareStreak, 0, new BBMOD_Vec2(0.0)); - _e.Scale.Set(2.0, 1.0); - _e.Color = BBMOD_C_ORANGE; - _e.Color.Alpha = 0.5; - lensFlare.add_element(_e); - - _e = new BBMOD_LensFlareElement(BBMOD_SprLensFlareHoop, 0, new BBMOD_Vec2(0.75)); - _e.Scale.Set(5.0); - _e.ScaleByDistanceMin.Set(0.0); - _e.ScaleByDistanceMax.Set(1.0); - _e.ApplyStarburst = true; - _e.AngleRelative = true; - _e.Color.Alpha = 0.5; - lensFlare.add_element(_e); - - bbmod_lens_flare_add(lensFlare); - - var _sunshafts = new BBMOD_SunShaftsEffect(sunLight.Direction); - _sunshafts.Color = BBMOD_C_ORANGE.Mix(BBMOD_C_WHITE, 0.5); - _sunshafts.BlendMode = bm_max; - OMain.postProcessor.add_effect(_sunshafts); -} -else -{ - sunLight.Color = new BBMOD_Color().FromHex($2a2a32); - sunLight.Direction.Set(0, -1, -1); -} - -//bbmod_fog_set(BBMOD_C_SILVER, 0.8, 200.0, 1500.0); diff --git a/BBMOD_GML/objects/OSky/Draw_0.gml b/BBMOD_GML/objects/OSky/Draw_0.gml deleted file mode 100644 index 316a0563..00000000 --- a/BBMOD_GML/objects/OSky/Draw_0.gml +++ /dev/null @@ -1,10 +0,0 @@ -var _cameraPosition = OPlayer.camera.Position; - -matrix_set(matrix_world, matrix_build( - _cameraPosition.X, - _cameraPosition.Y, - _cameraPosition.Z, - 0, 0, 0, - 1000, 1000, 1000)); - -modSky.render([matSky]); diff --git a/BBMOD_GML/objects/OSky/OSky.yy b/BBMOD_GML/objects/OSky/OSky.yy deleted file mode 100644 index d431a8b3..00000000 --- a/BBMOD_GML/objects/OSky/OSky.yy +++ /dev/null @@ -1,40 +0,0 @@ -{ - "$GMObject":"", - "%Name":"OSky", - "eventList":[ - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":12,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - ], - "managed":true, - "name":"OSky", - "overriddenProperties":[], - "parent":{ - "name":"Objects", - "path":"folders/Demo/Objects.yy", - }, - "parentObjectId":{ - "name":"OObject3D", - "path":"objects/OObject3D/OObject3D.yy", - }, - "persistent":false, - "physicsAngularDamping":0.1, - "physicsDensity":0.5, - "physicsFriction":0.2, - "physicsGroup":1, - "physicsKinematic":false, - "physicsLinearDamping":0.1, - "physicsObject":false, - "physicsRestitution":0.1, - "physicsSensor":false, - "physicsShape":1, - "physicsShapePoints":[], - "physicsStartAwake":true, - "properties":[], - "resourceType":"GMObject", - "resourceVersion":"2.0", - "solid":false, - "spriteId":null, - "spriteMaskId":null, - "visible":true, -} \ No newline at end of file diff --git a/BBMOD_GML/objects/OTree/Create_0.gml b/BBMOD_GML/objects/OTree/Create_0.gml deleted file mode 100644 index 89ae60ab..00000000 --- a/BBMOD_GML/objects/OTree/Create_0.gml +++ /dev/null @@ -1,4 +0,0 @@ -z = global.terrain.get_height(x, y) - 5; -image_xscale = random_range(0.8, 1.2) * 40; -image_angle = random(360); -OMain.treeBatch.add_instance(id); diff --git a/BBMOD_GML/objects/OTree/OTree.yy b/BBMOD_GML/objects/OTree/OTree.yy deleted file mode 100644 index 9d85bf2e..00000000 --- a/BBMOD_GML/objects/OTree/OTree.yy +++ /dev/null @@ -1,35 +0,0 @@ -{ - "$GMObject":"", - "%Name":"OTree", - "eventList":[ - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - ], - "managed":true, - "name":"OTree", - "overriddenProperties":[], - "parent":{ - "name":"Objects", - "path":"folders/Demo/Objects.yy", - }, - "parentObjectId":null, - "persistent":false, - "physicsAngularDamping":0.1, - "physicsDensity":0.5, - "physicsFriction":0.2, - "physicsGroup":1, - "physicsKinematic":false, - "physicsLinearDamping":0.1, - "physicsObject":false, - "physicsRestitution":0.1, - "physicsSensor":false, - "physicsShape":1, - "physicsShapePoints":[], - "physicsStartAwake":true, - "properties":[], - "resourceType":"GMObject", - "resourceVersion":"2.0", - "solid":false, - "spriteId":null, - "spriteMaskId":null, - "visible":true, -} \ No newline at end of file diff --git a/BBMOD_GML/objects/OZombie/CleanUp_0.gml b/BBMOD_GML/objects/OZombie/CleanUp_0.gml deleted file mode 100644 index 62a47e80..00000000 --- a/BBMOD_GML/objects/OZombie/CleanUp_0.gml +++ /dev/null @@ -1 +0,0 @@ -material = material.destroy(); diff --git a/BBMOD_GML/objects/OZombie/Create_0.gml b/BBMOD_GML/objects/OZombie/Create_0.gml deleted file mode 100644 index bb18cc56..00000000 --- a/BBMOD_GML/objects/OZombie/Create_0.gml +++ /dev/null @@ -1,226 +0,0 @@ -event_inherited(); - -z = global.terrain.get_height(x, y) ?? 0.0; - -// Used to raycast shots from the player's gun. -collider = new BBMOD_AABBCollider( - new BBMOD_Vec3(x, y, z), - new BBMOD_Vec3(5, 5, 18)); - -ReceiveDamage = function (_damage) -{ - hp -= _damage; - hurt = 1.0; - var _floatingText = instance_create_layer(x, y, layer, OFloatingText); - _floatingText.z = z + 42; - _floatingText.text = "-" + string(_damage); - var _index = audio_play_sound_at(choose(SndZombie0, SndZombie1), - x, y, z + 30, 10, 200, 1, false, 1); - audio_sound_pitch(_index, random_range(1.0, 1.5)); -}; - -// Knockback vector. -knockback = new BBMOD_Vec3(); - -// If true then the zombie drops a gun when killed. -dropGun = false; - -// Number of ms till the zombie changes to the "Idle" state. -timeout = random_range(500, 1000); - -// Number of ms till the zombie changes from "Idle" to "Attack" state if player -// is in range. -timeoutAttack = undefined; - -// If true then the zombie will be destroyed. -destroy = false; - -// Rotate the zombie towards the player on spawn. -direction = point_direction(x, y, OPlayer.x, OPlayer.y); -directionBody = direction; - -// Returns true if the player is within the zombie's attack range. -playerInRange = function () -{ - return (point_distance(x, y, OPlayer.x, OPlayer.y) <= 30); -}; - -// Strength of the dissolve shader effect. -dissolve = 1.0; - -emitter = undefined; - -//////////////////////////////////////////////////////////////////////////////// -// Create material and prepare material property block - -material = choose(MatZombieMale, MatZombieFemale)(); - -materialProps = new BBMOD_MaterialPropertyBlock(); -materialProps.set_float3("u_vDissolveColor", new BBMOD_Vec3(0.0, 1.0, 0.5)); -materialProps.set_float("u_fDissolveRange", 0.3); -materialProps.set_float2("u_vDissolveScale", new BBMOD_Vec2(20.0)); - -//////////////////////////////////////////////////////////////////////////////// -// Load resources - -animIdle = global.resourceManager.load("Data/Assets/Character/Zombie_Idle.bbanim"); - -animWalk = global.resourceManager.load( - "Data/Assets/Character/Zombie_Walk.bbanim", - function (_err, _animation) { - if (!_err) - { - _animation.add_event(0, "Footstep") - .add_event(32, "Footstep"); - } - }); - -animAttack = global.resourceManager.load( - "Data/Assets/Character/Zombie_Attack.bbanim", - function (_err, _animation) { - if (!_err) - { - _animation.add_event(50, "Attack"); - } - }); - -animDeath = global.resourceManager.load("Data/Assets/Character/Zombie_Death.bbanim"); - -//////////////////////////////////////////////////////////////////////////////// -// Animation state machine - -// Enter the "Deactivated" state on the start of the state machine. -animationStateMachine.OnEnter = method(self, function () { - animationStateMachine.change_state(stateDeactivated); -}); - -// Regardless on the current state, go to state "Death" if the zombie -// is dead. -animationStateMachine.OnPreUpdate = method(self, function () { - var _gameSpeed = game_get_speed(gamespeed_microseconds); - var _deltaTime = DELTA_TIME / _gameSpeed; - x += knockback.X * _deltaTime; - y += knockback.Y * _deltaTime; - z += knockback.Z * _deltaTime; - knockback = knockback.Scale(1.0 - (0.1 * _deltaTime)); - - if (animationStateMachine.State != stateAttack) - { - if (hp <= 0 - && animationStateMachine.State != stateDeath) - { - animationStateMachine.change_state(stateDeath); - return; - } - } -}); - -// If the zombie is active, rotate it towards the player. -animationStateMachine.OnPostUpdate = method(self, function () { - if (animationStateMachine.State != stateDeactivated - && animationStateMachine.State != stateDeath) - { - direction = point_direction(x, y, OPlayer.x, OPlayer.y); - } -}); - -// When the zombie is activated, wait for the timeout and then switch to the -// "Idle" state. -stateDeactivated = new BBMOD_AnimationState("Deactivated", animIdle, true); -stateDeactivated.OnUpdate = method(self, function () { - timeout -= DELTA_TIME * 0.001; - if (timeout <= 0) - { - animationStateMachine.change_state(stateIdle); - } -}); -animationStateMachine.add_state(stateDeactivated); - -// When the player is out of the zombie's range, change to the "Walk" state. -stateIdle = new BBMOD_AnimationState("Idle", animIdle, true); -stateIdle.OnEnter = method(self, function () { - timeoutAttack = random(100); -}); -stateIdle.OnUpdate = method(self, function () { - if (!playerInRange()) - { - animationStateMachine.change_state(stateWalk); - return; - } - - timeoutAttack -= DELTA_TIME * 0.001; - if (timeoutAttack <= 0) - { - animationStateMachine.change_state(stateAttack); - return; - } -}); -animationStateMachine.add_state(stateIdle); - -// When the player is within the zombie's range again, change to the "Idle" state. -stateWalk = new BBMOD_AnimationState("Walk", animWalk, true); -stateWalk.OnUpdate = method(self, function () { - if (playerInRange()) - { - animationStateMachine.change_state(stateIdle); - return; - } - - if (global.terrain.in_bounds(x, y)) - { - mp_potential_step_object(OPlayer.x, OPlayer.y, speedWalk * global.gameSpeed, OZombie); - } -}); -animationStateMachine.add_state(stateWalk); - -// Attack the player. -stateAttack = new BBMOD_AnimationState("Attack", animAttack); -stateAttack.on_event("Attack", method(self, function () { - if (z >= 0) - { - var _index; - - if (playerInRange()) - { - // Player is killed in 3 hits - OPlayer.ReceiveDamage(OPlayer.hpMax / 3.0); - - _index = audio_play_sound_at( - SndPunch, - x + lengthdir_x(30, direction), - y + lengthdir_y(30, direction), - z + 30, - 10, 200, 1, false, 1); - } - else - { - _index = audio_play_sound_at( - SndWhoosh, - x + lengthdir_x(30, direction), - y + lengthdir_y(30, direction), - z + 30, - 10, 200, 1, false, 1); - } - - audio_sound_pitch(_index, random_range(0.5, 0.8)); - } -})); -stateAttack.on_event(BBMOD_EV_ANIMATION_END, method(self, function () { - knockback.Set(0.0); - animationStateMachine.change_state(stateIdle); -})); -animationStateMachine.add_state(stateAttack); - -// When the zombie is killed, remove its collision mask and enter the final state -// of the state machine after the death animation is finished. -stateDeath = new BBMOD_AnimationState("Death", animDeath); -stateDeath.OnEnter = method(self, function () { - mask_index = noone; - hp = 0; -}); -stateDeath.on_event(BBMOD_EV_ANIMATION_END, method(self, function () { - animationStateMachine.finish(); -})); -animationStateMachine.add_state(stateDeath); - -animationStateMachine.start(); diff --git a/BBMOD_GML/objects/OZombie/Destroy_0.gml b/BBMOD_GML/objects/OZombie/Destroy_0.gml deleted file mode 100644 index 7c0d4097..00000000 --- a/BBMOD_GML/objects/OZombie/Destroy_0.gml +++ /dev/null @@ -1,5 +0,0 @@ -++score; -if (dropGun) -{ - instance_create_layer(x, y, layer, OGun); -} diff --git a/BBMOD_GML/objects/OZombie/Draw_0.gml b/BBMOD_GML/objects/OZombie/Draw_0.gml deleted file mode 100644 index db8ecc13..00000000 --- a/BBMOD_GML/objects/OZombie/Draw_0.gml +++ /dev/null @@ -1,5 +0,0 @@ -bbmod_set_instance_id(id); -matrix_set(matrix_world, matrixBody); -bbmod_material_props_set(materialProps); -animationPlayer.render([material]); -bbmod_material_props_reset(); diff --git a/BBMOD_GML/objects/OZombie/OZombie.yy b/BBMOD_GML/objects/OZombie/OZombie.yy deleted file mode 100644 index 07918b2d..00000000 --- a/BBMOD_GML/objects/OZombie/OZombie.yy +++ /dev/null @@ -1,46 +0,0 @@ -{ - "$GMObject":"", - "%Name":"OZombie", - "eventList":[ - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":2,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":12,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":1,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - ], - "managed":true, - "name":"OZombie", - "overriddenProperties":[], - "parent":{ - "name":"Characters", - "path":"folders/Demo/Objects/Characters.yy", - }, - "parentObjectId":{ - "name":"OCharacter", - "path":"objects/OCharacter/OCharacter.yy", - }, - "persistent":false, - "physicsAngularDamping":0.1, - "physicsDensity":0.5, - "physicsFriction":0.2, - "physicsGroup":1, - "physicsKinematic":false, - "physicsLinearDamping":0.1, - "physicsObject":false, - "physicsRestitution":0.1, - "physicsSensor":false, - "physicsShape":1, - "physicsShapePoints":[], - "physicsStartAwake":true, - "properties":[], - "resourceType":"GMObject", - "resourceVersion":"2.0", - "solid":false, - "spriteId":null, - "spriteMaskId":{ - "name":"SprCharacterCollisionMask", - "path":"sprites/SprCharacterCollisionMask/SprCharacterCollisionMask.yy", - }, - "visible":true, -} \ No newline at end of file diff --git a/BBMOD_GML/objects/OZombie/Step_0.gml b/BBMOD_GML/objects/OZombie/Step_0.gml deleted file mode 100644 index f40c2f51..00000000 --- a/BBMOD_GML/objects/OZombie/Step_0.gml +++ /dev/null @@ -1,28 +0,0 @@ -if (hp <= 0) -{ - emitter ??= instance_create_layer(x, y, layer, ODissolveEmitter); - - dissolve += DELTA_TIME * 0.000001; - if (dissolve >= 1.0) - { - destroy = true; - } -} -else -{ - if (dissolve > 0.0) - { - dissolve = max(dissolve - (DELTA_TIME * 0.000001), 0.0); - } -} - -if (emitter != undefined - && instance_exists(emitter)) -{ - emitter.x = x; - emitter.y = y; - emitter.z = z; -} - -materialProps.set_float("u_fDissolveThreshold", dissolve); -materialProps.set_float4("u_vSilhouette", new BBMOD_Vec4(1.0, 1.0, 1.0, hurt)); diff --git a/BBMOD_GML/objects/OZombie/Step_2.gml b/BBMOD_GML/objects/OZombie/Step_2.gml deleted file mode 100644 index 16c454ec..00000000 --- a/BBMOD_GML/objects/OZombie/Step_2.gml +++ /dev/null @@ -1,8 +0,0 @@ -event_inherited(); - -collider.Position.Set(x, y, z + 18); - -if (destroy) -{ - instance_destroy(); -} diff --git a/BBMOD_GML/objects/odirtemitter/Create_0.gml b/BBMOD_GML/objects/odirtemitter/Create_0.gml deleted file mode 100644 index bab1254c..00000000 --- a/BBMOD_GML/objects/odirtemitter/Create_0.gml +++ /dev/null @@ -1,5 +0,0 @@ -event_inherited(); - -emitter = new BBMOD_ParticleEmitter( - new BBMOD_Vec3(x, y, z), - DirtParticleSystem()); diff --git a/BBMOD_GML/objects/odirtemitter/ODirtEmitter.yy b/BBMOD_GML/objects/odirtemitter/ODirtEmitter.yy deleted file mode 100644 index b0674158..00000000 --- a/BBMOD_GML/objects/odirtemitter/ODirtEmitter.yy +++ /dev/null @@ -1,38 +0,0 @@ -{ - "$GMObject":"", - "%Name":"ODirtEmitter", - "eventList":[ - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - ], - "managed":true, - "name":"ODirtEmitter", - "overriddenProperties":[], - "parent":{ - "name":"Particles", - "path":"folders/Demo/Objects/Particles.yy", - }, - "parentObjectId":{ - "name":"OParticleEmitter", - "path":"objects/OParticleEmitter/OParticleEmitter.yy", - }, - "persistent":false, - "physicsAngularDamping":0.1, - "physicsDensity":0.5, - "physicsFriction":0.2, - "physicsGroup":1, - "physicsKinematic":false, - "physicsLinearDamping":0.1, - "physicsObject":false, - "physicsRestitution":0.1, - "physicsSensor":false, - "physicsShape":1, - "physicsShapePoints":[], - "physicsStartAwake":true, - "properties":[], - "resourceType":"GMObject", - "resourceVersion":"2.0", - "solid":false, - "spriteId":null, - "spriteMaskId":null, - "visible":true, -} \ No newline at end of file diff --git a/BBMOD_GML/objects/odissolveemitter/CleanUp_0.gml b/BBMOD_GML/objects/odissolveemitter/CleanUp_0.gml deleted file mode 100644 index 1576287b..00000000 --- a/BBMOD_GML/objects/odissolveemitter/CleanUp_0.gml +++ /dev/null @@ -1,3 +0,0 @@ -event_inherited(); - -bbmod_light_punctual_remove(light); diff --git a/BBMOD_GML/objects/odissolveemitter/Create_0.gml b/BBMOD_GML/objects/odissolveemitter/Create_0.gml deleted file mode 100644 index c0485bab..00000000 --- a/BBMOD_GML/objects/odissolveemitter/Create_0.gml +++ /dev/null @@ -1,10 +0,0 @@ -event_inherited(); - -position = new BBMOD_Vec3(x, y, z); - -emitter = new BBMOD_ParticleEmitter(position, DissolveParticleSystem()); - -light = new BBMOD_PointLight(new BBMOD_Color(0, 255, 127, 0), position, 40); -light.RenderPass = ~(1 << BBMOD_ERenderPass.ReflectionCapture); - -bbmod_light_punctual_add(light); diff --git a/BBMOD_GML/objects/odissolveemitter/ODissolveEmitter.yy b/BBMOD_GML/objects/odissolveemitter/ODissolveEmitter.yy deleted file mode 100644 index 7480a702..00000000 --- a/BBMOD_GML/objects/odissolveemitter/ODissolveEmitter.yy +++ /dev/null @@ -1,40 +0,0 @@ -{ - "$GMObject":"", - "%Name":"ODissolveEmitter", - "eventList":[ - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":12,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - ], - "managed":true, - "name":"ODissolveEmitter", - "overriddenProperties":[], - "parent":{ - "name":"Particles", - "path":"folders/Demo/Objects/Particles.yy", - }, - "parentObjectId":{ - "name":"OParticleEmitter", - "path":"objects/OParticleEmitter/OParticleEmitter.yy", - }, - "persistent":false, - "physicsAngularDamping":0.1, - "physicsDensity":0.5, - "physicsFriction":0.2, - "physicsGroup":1, - "physicsKinematic":false, - "physicsLinearDamping":0.1, - "physicsObject":false, - "physicsRestitution":0.1, - "physicsSensor":false, - "physicsShape":1, - "physicsShapePoints":[], - "physicsStartAwake":true, - "properties":[], - "resourceType":"GMObject", - "resourceVersion":"2.0", - "solid":false, - "spriteId":null, - "spriteMaskId":null, - "visible":true, -} \ No newline at end of file diff --git a/BBMOD_GML/objects/odissolveemitter/Step_0.gml b/BBMOD_GML/objects/odissolveemitter/Step_0.gml deleted file mode 100644 index e5c676fd..00000000 --- a/BBMOD_GML/objects/odissolveemitter/Step_0.gml +++ /dev/null @@ -1,7 +0,0 @@ -light.Position = position.Add(new BBMOD_Vec3(0, 0, 18)); -if (DELTA_TIME > 0) -{ - light.Color.Alpha = random_range(0.2, 0.3) - * (emitter.ParticlesAlive / emitter.System.ParticleCount); -} -event_inherited(); diff --git a/BBMOD_GML/objects/ogunfireemitter/CleanUp_0.gml b/BBMOD_GML/objects/ogunfireemitter/CleanUp_0.gml deleted file mode 100644 index 1576287b..00000000 --- a/BBMOD_GML/objects/ogunfireemitter/CleanUp_0.gml +++ /dev/null @@ -1,3 +0,0 @@ -event_inherited(); - -bbmod_light_punctual_remove(light); diff --git a/BBMOD_GML/objects/ogunfireemitter/Create_0.gml b/BBMOD_GML/objects/ogunfireemitter/Create_0.gml deleted file mode 100644 index f83f5919..00000000 --- a/BBMOD_GML/objects/ogunfireemitter/Create_0.gml +++ /dev/null @@ -1,11 +0,0 @@ -event_inherited(); - -position = new BBMOD_Vec3(x, y, z); - -emitter = new BBMOD_ParticleEmitter(position, GunfireParticleSystem()); - -light = new BBMOD_PointLight(BBMOD_C_ORANGE, position, random_range(70, 80)); -light.RenderPass = ~(1 << BBMOD_ERenderPass.ReflectionCapture); -light.Color.Alpha = random_range(2.5, 3); - -bbmod_light_punctual_add(light); diff --git a/BBMOD_GML/objects/ogunfireemitter/OGunfireEmitter.yy b/BBMOD_GML/objects/ogunfireemitter/OGunfireEmitter.yy deleted file mode 100644 index 390c66aa..00000000 --- a/BBMOD_GML/objects/ogunfireemitter/OGunfireEmitter.yy +++ /dev/null @@ -1,39 +0,0 @@ -{ - "$GMObject":"", - "%Name":"OGunfireEmitter", - "eventList":[ - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":12,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - ], - "managed":true, - "name":"OGunfireEmitter", - "overriddenProperties":[], - "parent":{ - "name":"Particles", - "path":"folders/Demo/Objects/Particles.yy", - }, - "parentObjectId":{ - "name":"OParticleEmitter", - "path":"objects/OParticleEmitter/OParticleEmitter.yy", - }, - "persistent":false, - "physicsAngularDamping":0.1, - "physicsDensity":0.5, - "physicsFriction":0.2, - "physicsGroup":1, - "physicsKinematic":false, - "physicsLinearDamping":0.1, - "physicsObject":false, - "physicsRestitution":0.1, - "physicsSensor":false, - "physicsShape":1, - "physicsShapePoints":[], - "physicsStartAwake":true, - "properties":[], - "resourceType":"GMObject", - "resourceVersion":"2.0", - "solid":false, - "spriteId":null, - "spriteMaskId":null, - "visible":true, -} \ No newline at end of file diff --git a/BBMOD_GML/objects/oparticleemitter/CleanUp_0.gml b/BBMOD_GML/objects/oparticleemitter/CleanUp_0.gml deleted file mode 100644 index 23ceafdf..00000000 --- a/BBMOD_GML/objects/oparticleemitter/CleanUp_0.gml +++ /dev/null @@ -1,4 +0,0 @@ -if (emitter) -{ - emitter = emitter.destroy(); -} diff --git a/BBMOD_GML/objects/oparticleemitter/Create_0.gml b/BBMOD_GML/objects/oparticleemitter/Create_0.gml deleted file mode 100644 index 5771c8ae..00000000 --- a/BBMOD_GML/objects/oparticleemitter/Create_0.gml +++ /dev/null @@ -1,2 +0,0 @@ -z = 0; -emitter = undefined; diff --git a/BBMOD_GML/objects/oparticleemitter/Draw_0.gml b/BBMOD_GML/objects/oparticleemitter/Draw_0.gml deleted file mode 100644 index 23f5b7fe..00000000 --- a/BBMOD_GML/objects/oparticleemitter/Draw_0.gml +++ /dev/null @@ -1,4 +0,0 @@ -if (emitter) -{ - emitter.render(); -} diff --git a/BBMOD_GML/objects/oparticleemitter/OParticleEmitter.yy b/BBMOD_GML/objects/oparticleemitter/OParticleEmitter.yy deleted file mode 100644 index e461027b..00000000 --- a/BBMOD_GML/objects/oparticleemitter/OParticleEmitter.yy +++ /dev/null @@ -1,38 +0,0 @@ -{ - "$GMObject":"", - "%Name":"OParticleEmitter", - "eventList":[ - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - {"$GMEvent":"","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":12,"isDnD":false,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, - ], - "managed":true, - "name":"OParticleEmitter", - "overriddenProperties":[], - "parent":{ - "name":"Particles", - "path":"folders/Demo/Objects/Particles.yy", - }, - "parentObjectId":null, - "persistent":false, - "physicsAngularDamping":0.1, - "physicsDensity":0.5, - "physicsFriction":0.2, - "physicsGroup":1, - "physicsKinematic":false, - "physicsLinearDamping":0.1, - "physicsObject":false, - "physicsRestitution":0.1, - "physicsSensor":false, - "physicsShape":1, - "physicsShapePoints":[], - "physicsStartAwake":true, - "properties":[], - "resourceType":"GMObject", - "resourceVersion":"2.0", - "solid":false, - "spriteId":null, - "spriteMaskId":null, - "visible":true, -} \ No newline at end of file diff --git a/BBMOD_GML/objects/oparticleemitter/Step_0.gml b/BBMOD_GML/objects/oparticleemitter/Step_0.gml deleted file mode 100644 index 08767f4d..00000000 --- a/BBMOD_GML/objects/oparticleemitter/Step_0.gml +++ /dev/null @@ -1,13 +0,0 @@ -if (emitter) -{ - emitter.Position.Set(x, y, z); - - if (DELTA_TIME > 0.0) - { - emitter.update(DELTA_TIME); - } - if (emitter.finished(true)) - { - instance_destroy(); - } -} diff --git a/BBMOD_GML/rooms/RmDemo/InstanceCreationCode_inst_21FC6344.gml b/BBMOD_GML/rooms/RmDemo/InstanceCreationCode_inst_21FC6344.gml deleted file mode 100644 index fd337ad7..00000000 --- a/BBMOD_GML/rooms/RmDemo/InstanceCreationCode_inst_21FC6344.gml +++ /dev/null @@ -1,2 +0,0 @@ -dropGun = true; -dissolve = 0.0; diff --git a/BBMOD_GML/rooms/RmDemo/RmDemo.yy b/BBMOD_GML/rooms/RmDemo/RmDemo.yy deleted file mode 100644 index 061ca685..00000000 --- a/BBMOD_GML/rooms/RmDemo/RmDemo.yy +++ /dev/null @@ -1,66 +0,0 @@ -{ - "$GMRoom":"", - "%Name":"RmDemo", - "creationCodeFile":"${project_dir}/rooms/RmDemo/RoomCreationCode.gml", - "inheritCode":false, - "inheritCreationOrder":false, - "inheritLayers":false, - "instanceCreationOrder":[ - {"name":"inst_498721B7","path":"rooms/RmDemo/RmDemo.yy",}, - {"name":"inst_15A6E850","path":"rooms/RmDemo/RmDemo.yy",}, - {"name":"inst_21FC6344","path":"rooms/RmDemo/RmDemo.yy",}, - {"name":"inst_5897D947","path":"rooms/RmDemo/RmDemo.yy",}, - {"name":"inst_5F36C65","path":"rooms/RmDemo/RmDemo.yy",}, - ], - "isDnd":false, - "layers":[ - {"$GMRInstanceLayer":"","%Name":"Controller","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"","%Name":"inst_498721B7","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_498721B7","objectId":{"name":"OMain","path":"objects/OMain/OMain.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":0.0,}, - ],"layers":[],"name":"Controller","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,}, - {"$GMRInstanceLayer":"","%Name":"Instances","depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"","%Name":"inst_5897D947","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5897D947","objectId":{"name":"OSky","path":"objects/OSky/OSky.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":32.0,"y":0.0,}, - {"$GMRInstance":"","%Name":"inst_15A6E850","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_15A6E850","objectId":{"name":"OPlayer","path":"objects/OPlayer/OPlayer.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":992.0,"y":992.0,}, - {"$GMRInstance":"","%Name":"inst_21FC6344","colour":4294967295,"frozen":false,"hasCreationCode":true,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_21FC6344","objectId":{"name":"OZombie","path":"objects/OZombie/OZombie.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":1120.0,"y":992.0,}, - {"$GMRInstance":"","%Name":"inst_5F36C65","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5F36C65","objectId":{"name":"ODirtEmitter","path":"objects/ODirtEmitter/ODirtEmitter.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":64.0,"y":0.0,}, - ],"layers":[],"name":"Instances","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,}, - ], - "name":"RmDemo", - "parent":{ - "name":"Rooms", - "path":"folders/Demo/Rooms.yy", - }, - "parentRoom":null, - "physicsSettings":{ - "inheritPhysicsSettings":false, - "PhysicsWorld":false, - "PhysicsWorldGravityX":0.0, - "PhysicsWorldGravityY":10.0, - "PhysicsWorldPixToMetres":0.1, - }, - "resourceType":"GMRoom", - "resourceVersion":"2.0", - "roomSettings":{ - "Height":2048, - "inheritRoomSettings":false, - "persistent":false, - "Width":2048, - }, - "sequenceId":null, - "views":[ - {"hborder":32,"hport":720,"hspeed":-1,"hview":720,"inherit":false,"objectId":null,"vborder":32,"visible":true,"vspeed":-1,"wport":1280,"wview":1280,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1024,"wview":1024,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1024,"wview":1024,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1024,"wview":1024,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1024,"wview":1024,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1024,"wview":1024,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1024,"wview":1024,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1024,"wview":1024,"xport":0,"xview":0,"yport":0,"yview":0,}, - ], - "viewSettings":{ - "clearDisplayBuffer":true, - "clearViewBackground":false, - "enableViews":true, - "inheritViewSettings":false, - }, - "volume":1.0, -} \ No newline at end of file diff --git a/BBMOD_GML/rooms/RmGameOver/RmGameOver.yy b/BBMOD_GML/rooms/RmGameOver/RmGameOver.yy deleted file mode 100644 index 6c5f49d1..00000000 --- a/BBMOD_GML/rooms/RmGameOver/RmGameOver.yy +++ /dev/null @@ -1,57 +0,0 @@ -{ - "$GMRoom":"", - "%Name":"RmGameOver", - "creationCodeFile":"", - "inheritCode":false, - "inheritCreationOrder":false, - "inheritLayers":false, - "instanceCreationOrder":[ - {"name":"inst_7D64578F","path":"rooms/RmGameOver/RmGameOver.yy",}, - ], - "isDnd":false, - "layers":[ - {"$GMRInstanceLayer":"","%Name":"Instances","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"","%Name":"inst_7D64578F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_7D64578F","objectId":{"name":"OGameOver","path":"objects/OGameOver/OGameOver.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":0.0,}, - ],"layers":[],"name":"Instances","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,}, - {"$GMRBackgroundLayer":"","%Name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4279769112,"depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Background","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, - ], - "name":"RmGameOver", - "parent":{ - "name":"Rooms", - "path":"folders/Demo/Rooms.yy", - }, - "parentRoom":null, - "physicsSettings":{ - "inheritPhysicsSettings":false, - "PhysicsWorld":false, - "PhysicsWorldGravityX":0.0, - "PhysicsWorldGravityY":10.0, - "PhysicsWorldPixToMetres":0.1, - }, - "resourceType":"GMRoom", - "resourceVersion":"2.0", - "roomSettings":{ - "Height":720, - "inheritRoomSettings":false, - "persistent":false, - "Width":1280, - }, - "sequenceId":null, - "views":[ - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, - ], - "viewSettings":{ - "clearDisplayBuffer":true, - "clearViewBackground":false, - "enableViews":false, - "inheritViewSettings":false, - }, - "volume":1.0, -} \ No newline at end of file diff --git a/BBMOD_GML/rooms/RmInit/RmInit.yy b/BBMOD_GML/rooms/RmInit/RmInit.yy deleted file mode 100644 index 64cba144..00000000 --- a/BBMOD_GML/rooms/RmInit/RmInit.yy +++ /dev/null @@ -1,56 +0,0 @@ -{ - "$GMRoom":"", - "%Name":"RmInit", - "creationCodeFile":"", - "inheritCode":false, - "inheritCreationOrder":false, - "inheritLayers":false, - "instanceCreationOrder":[ - {"name":"inst_6916107A","path":"rooms/RmInit/RmInit.yy",}, - ], - "isDnd":false, - "layers":[ - {"$GMRInstanceLayer":"","%Name":"Instances","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"","%Name":"inst_6916107A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_6916107A","objectId":{"name":"OInit","path":"objects/OInit/OInit.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":0.0,"y":0.0,}, - ],"layers":[],"name":"Instances","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,}, - ], - "name":"RmInit", - "parent":{ - "name":"Rooms", - "path":"folders/Demo/Rooms.yy", - }, - "parentRoom":null, - "physicsSettings":{ - "inheritPhysicsSettings":false, - "PhysicsWorld":false, - "PhysicsWorldGravityX":0.0, - "PhysicsWorldGravityY":10.0, - "PhysicsWorldPixToMetres":0.1, - }, - "resourceType":"GMRoom", - "resourceVersion":"2.0", - "roomSettings":{ - "Height":720, - "inheritRoomSettings":false, - "persistent":false, - "Width":1280, - }, - "sequenceId":null, - "views":[ - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, - {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, - ], - "viewSettings":{ - "clearDisplayBuffer":true, - "clearViewBackground":false, - "enableViews":false, - "inheritViewSettings":false, - }, - "volume":1.0, -} \ No newline at end of file diff --git a/BBMOD_GML/scripts/DrawTextShadow/DrawTextShadow.gml b/BBMOD_GML/scripts/DrawTextShadow/DrawTextShadow.gml deleted file mode 100644 index 2d8835ec..00000000 --- a/BBMOD_GML/scripts/DrawTextShadow/DrawTextShadow.gml +++ /dev/null @@ -1,20 +0,0 @@ -/// @func DrawTextShadow(_x, _y, _text[, _color[, _colorShadow[, _alpha]]]) -/// -/// @desc Draws a text with a shadow. -/// -/// @param {Real} _x The x position of the text. -/// @param {Real} _y The y position of the text. -/// @param {String} _text The text to draw. -/// @param {Constant.Color} [_color] The color of the text. Defaults to white. -/// @param {Constant.Color} [_colorShadow] The color of the shadow. Defaults to -/// black. -/// @param {Real} [_alpha] The alpha of both the text and its shadow. Defaults -/// to 1. -function DrawTextShadow( - _x, _y, _text, _color=c_white, _colorShadow=c_black, _alpha=1.0) -{ - gml_pragma("forceinline"); - draw_text_color(_x + 2, _y + 2, _text, - _colorShadow, _colorShadow, _colorShadow, _colorShadow, _alpha); - draw_text_color(_x, _y, _text, _color, _color, _color, _color, _alpha); -} diff --git a/BBMOD_GML/scripts/DrawTextShadow/DrawTextShadow.yy b/BBMOD_GML/scripts/DrawTextShadow/DrawTextShadow.yy deleted file mode 100644 index a8940eb7..00000000 --- a/BBMOD_GML/scripts/DrawTextShadow/DrawTextShadow.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "$GMScript":"", - "%Name":"DrawTextShadow", - "isCompatibility":false, - "isDnD":false, - "name":"DrawTextShadow", - "parent":{ - "name":"Scripts", - "path":"folders/Demo/Scripts.yy", - }, - "resourceType":"GMScript", - "resourceVersion":"2.0", -} \ No newline at end of file diff --git a/BBMOD_GML/scripts/MatZombie/MatZombie.gml b/BBMOD_GML/scripts/MatZombie/MatZombie.gml deleted file mode 100644 index 6bb6a408..00000000 --- a/BBMOD_GML/scripts/MatZombie/MatZombie.gml +++ /dev/null @@ -1,50 +0,0 @@ -function MatZombie() -{ - static _shader = undefined; - static _shaderDepth = undefined; - static _material = undefined; - if (_material == undefined) - { - var _deferred = bbmod_deferred_renderer_is_supported(); - _shader = new BBMOD_DefaultShader(_deferred ? ShZombieGBuffer : ShZombie, BBMOD_VFORMAT_DEFAULT_ANIMATED); - _shaderDepth = new BBMOD_BaseShader(ShZombieDepth, BBMOD_VFORMAT_DEFAULT_ANIMATED); - _material = (_deferred ? BBMOD_MATERIAL_DEFERRED : BBMOD_MATERIAL_DEFAULT).clone() - .set_shader(BBMOD_ERenderPass.Id, BBMOD_SHADER_INSTANCE_ID) // Enable instance selecting - .set_shader(BBMOD_ERenderPass.Shadows, _shaderDepth); // Enable casting shadows - if (_deferred) - { - _material.set_shader(BBMOD_ERenderPass.GBuffer, _shader); - } - else - { - _material.set_shader(BBMOD_ERenderPass.Forward, _shader) - .set_shader(BBMOD_ERenderPass.DepthOnly, _shaderDepth); - } - _material.Culling = cull_noculling; - } - return _material; -} - -function MatZombieMale() -{ - static _material = undefined; - if (_material == undefined) - { - _material = MatZombie().clone(); - _material.RenderQueue = new BBMOD_MeshRenderQueue("MaleZombies"); - _material.BaseOpacity = sprite_get_texture(SprZombie, 0); - } - return _material; -} - -function MatZombieFemale() -{ - static _material = undefined; - if (_material == undefined) - { - _material = MatZombie().clone(); - _material.RenderQueue = new BBMOD_MeshRenderQueue("FemaleZombies"); - _material.BaseOpacity = sprite_get_texture(SprZombie, 1); - } - return _material; -} diff --git a/BBMOD_GML/scripts/MatZombie/MatZombie.yy b/BBMOD_GML/scripts/MatZombie/MatZombie.yy deleted file mode 100644 index 148dda02..00000000 --- a/BBMOD_GML/scripts/MatZombie/MatZombie.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "$GMScript":"", - "%Name":"MatZombie", - "isCompatibility":false, - "isDnD":false, - "name":"MatZombie", - "parent":{ - "name":"Materials", - "path":"folders/Demo/Materials.yy", - }, - "resourceType":"GMScript", - "resourceVersion":"2.0", -} \ No newline at end of file diff --git a/BBMOD_GML/scripts/dirtparticlesystem/DirtParticleSystem.yy b/BBMOD_GML/scripts/dirtparticlesystem/DirtParticleSystem.yy deleted file mode 100644 index 292bb032..00000000 --- a/BBMOD_GML/scripts/dirtparticlesystem/DirtParticleSystem.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "$GMScript":"", - "%Name":"DirtParticleSystem", - "isCompatibility":false, - "isDnD":false, - "name":"DirtParticleSystem", - "parent":{ - "name":"ParticleSystems", - "path":"folders/Demo/ParticleSystems.yy", - }, - "resourceType":"GMScript", - "resourceVersion":"2.0", -} \ No newline at end of file diff --git a/BBMOD_GML/scripts/dirtparticlesystem/dirtparticlesystem.gml b/BBMOD_GML/scripts/dirtparticlesystem/dirtparticlesystem.gml deleted file mode 100644 index 8dbc932a..00000000 --- a/BBMOD_GML/scripts/dirtparticlesystem/dirtparticlesystem.gml +++ /dev/null @@ -1,38 +0,0 @@ -function DirtParticleSystem() -{ - static _particleSystem = undefined; - if (!_particleSystem) - { - var _material = BBMOD_MATERIAL_PARTICLE_LIT.clone(); - _material.RenderQueue = new BBMOD_MeshRenderQueue("Dirt"); - _material.BaseOpacity = sprite_get_texture(SprDirtParticle, 0); - _material.NormalSmoothness = sprite_get_texture(SprDirtParticle, 1); - _material.SoftDistance = 2.0; - _material.AlphaBlend = true; - - _particleSystem = new BBMOD_ParticleSystem(BBMOD_MODEL_PARTICLE, _material, 500) - .add_modules( - // Set particle color - new BBMOD_SetColorModule(BBMOD_EParticle.ColorR, new BBMOD_Color(153, 140, 127)), - // Rotate the particle randomly - new BBMOD_RandomRotationModule(), - // Make the particle move up on spawn - new BBMOD_MixRealModule(BBMOD_EParticle.VelocityZ, 4), - // Set random scale - new BBMOD_MixVec3Module(BBMOD_EParticle.ScaleX, - new BBMOD_Vec3(20.0), - new BBMOD_Vec3(30.0)), - // Decrease health over time - new BBMOD_AddRealOverTimeModule(BBMOD_EParticle.HealthLeft, -1.0, 1.0), - // Increase scale over time - new BBMOD_AddVec3OverTimeModule(BBMOD_EParticle.ScaleX, new BBMOD_Vec3(2.0)), - // Decrease alpha with health - new BBMOD_MixRealFromHealthModule(BBMOD_EParticle.ColorA, 1.0, 0.0), - // Apply gravity - new BBMOD_GravityModule(), - ); - _particleSystem.Loop = true; - _particleSystem.Sort = true; - } - return _particleSystem; -} diff --git a/BBMOD_GML/scripts/dissolveparticlesystem/DissolveParticleSystem.yy b/BBMOD_GML/scripts/dissolveparticlesystem/DissolveParticleSystem.yy deleted file mode 100644 index 317b3f23..00000000 --- a/BBMOD_GML/scripts/dissolveparticlesystem/DissolveParticleSystem.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "$GMScript":"", - "%Name":"DissolveParticleSystem", - "isCompatibility":false, - "isDnD":false, - "name":"DissolveParticleSystem", - "parent":{ - "name":"ParticleSystems", - "path":"folders/Demo/ParticleSystems.yy", - }, - "resourceType":"GMScript", - "resourceVersion":"2.0", -} \ No newline at end of file diff --git a/BBMOD_GML/scripts/dissolveparticlesystem/dissolveparticlesystem.gml b/BBMOD_GML/scripts/dissolveparticlesystem/dissolveparticlesystem.gml deleted file mode 100644 index d64245d4..00000000 --- a/BBMOD_GML/scripts/dissolveparticlesystem/dissolveparticlesystem.gml +++ /dev/null @@ -1,42 +0,0 @@ -/// @func DissolveParticleSystem() -/// -/// @desc -/// -/// @return {Struct.BBMOD_ParticleSystem} -function DissolveParticleSystem() -{ - static _particleSystem = undefined; - if (!_particleSystem) - { - var _material = BBMOD_MATERIAL_PARTICLE_UNLIT.clone(); - _material.RenderQueue = new BBMOD_RenderQueue("Dissolve"); - - _particleSystem = new BBMOD_ParticleSystem(BBMOD_MODEL_PARTICLE, _material, 100) - .add_modules( - // Emit 20 particles every 0.05 seconds - new BBMOD_EmissionOverTimeModule(20, 0.05), - // Emit particles in an AABB shape - new BBMOD_AABBEmissionModule( - new BBMOD_Vec3(-5.0, -5.0, 0.0), - new BBMOD_Vec3(5.0, 5.0, 36.0)), - // Set random particle direction - new BBMOD_MixRealModule(BBMOD_EParticle.VelocityX, -1, 1), - new BBMOD_MixRealModule(BBMOD_EParticle.VelocityY, -1, 1), - new BBMOD_MixRealModule(BBMOD_EParticle.VelocityZ, -1, 1), - // Set particle speed to 10 - new BBMOD_MixSpeedModule(10.0), - // Set partile color to green whey the are spawned - new BBMOD_SetColorModule(BBMOD_EParticle.ColorR, new BBMOD_Color(0, 255 * 1.2, 127 * 1.2)), - // Decrease particle health over time - new BBMOD_AddRealOverTimeModule(BBMOD_EParticle.HealthLeft, -1.0, 1.0), - // Scale particles based on their health - new BBMOD_MixVec3FromHealthModule(BBMOD_EParticle.ScaleX, - new BBMOD_Vec3(1.0), new BBMOD_Vec3(0.0)), - // Move particles upwards - new BBMOD_GravityModule(new BBMOD_Vec3(10.0, 10.0, 20.0)), - ); - // Emit particles for 0.5 seconds - _particleSystem.Duration = 0.5; - } - return _particleSystem; -} diff --git a/BBMOD_GML/scripts/gunfireparticlesystem/GunfireParticleSystem.yy b/BBMOD_GML/scripts/gunfireparticlesystem/GunfireParticleSystem.yy deleted file mode 100644 index 68be8721..00000000 --- a/BBMOD_GML/scripts/gunfireparticlesystem/GunfireParticleSystem.yy +++ /dev/null @@ -1,13 +0,0 @@ -{ - "$GMScript":"", - "%Name":"GunfireParticleSystem", - "isCompatibility":false, - "isDnD":false, - "name":"GunfireParticleSystem", - "parent":{ - "name":"ParticleSystems", - "path":"folders/Demo/ParticleSystems.yy", - }, - "resourceType":"GMScript", - "resourceVersion":"2.0", -} \ No newline at end of file diff --git a/BBMOD_GML/scripts/gunfireparticlesystem/gunfireparticlesystem.gml b/BBMOD_GML/scripts/gunfireparticlesystem/gunfireparticlesystem.gml deleted file mode 100644 index 02744377..00000000 --- a/BBMOD_GML/scripts/gunfireparticlesystem/gunfireparticlesystem.gml +++ /dev/null @@ -1,31 +0,0 @@ -function GunfireParticleSystem() -{ - static _particleSystem = undefined; - if (!_particleSystem) - { - var _material = BBMOD_MATERIAL_PARTICLE_UNLIT.clone(); - _material.RenderQueue = new BBMOD_RenderQueue("Gunfire"); - _material.BaseOpacity = sprite_get_texture(SprGunfire, 0); - _material.BlendMode = bm_add; - - _particleSystem = new BBMOD_ParticleSystem(BBMOD_MODEL_PARTICLE, _material, 10) - .add_modules( - // Emit particles at start - new BBMOD_EmissionModule(10), - // Set particle color - new BBMOD_MixColorModule(BBMOD_EParticle.ColorR, BBMOD_C_RED, BBMOD_C_YELLOW), - // Rotate the particle randomly - new BBMOD_RandomRotationModule(), - // Set random scale - new BBMOD_MixVec3Module(BBMOD_EParticle.ScaleX, - new BBMOD_Vec3(3.0), - new BBMOD_Vec3(8.0)), - // Decrease health over time - new BBMOD_AddRealOverTimeModule(BBMOD_EParticle.HealthLeft, -1.0, 0.1), - // Decrease alpha with health - new BBMOD_MixRealFromHealthModule(BBMOD_EParticle.ColorA, 1.0, 0.0), - ); - _particleSystem.Duration = 0.1; - } - return _particleSystem; -} diff --git a/BBMOD_GML/shaders/ShZombie/ShZombie.fsh b/BBMOD_GML/shaders/ShZombie/ShZombie.fsh deleted file mode 100644 index 93ab3589..00000000 --- a/BBMOD_GML/shaders/ShZombie/ShZombie.fsh +++ /dev/null @@ -1,894 +0,0 @@ -// FIXME: Temporary fix! -precision highp float; - -// Dissolve effect -uniform vec3 u_vDissolveColor; -uniform float u_fDissolveThreshold; -uniform float u_fDissolveRange; -uniform vec2 u_vDissolveScale; - -// Silhouette effect -uniform vec4 u_vSilhouette; - -float Random(in vec2 st) -{ - return fract(sin(dot(st.xy, vec2(12.9898, 78.233))) * 43758.5453); -} - -// Based on Morgan McGuire @morgan3d -// https://www.shadertoy.com/view/4dS3Wd -float Noise(in vec2 st) -{ - vec2 i = floor(st); - vec2 f = fract(st); - float a = Random(i); - float b = Random(i + vec2(1.0, 0.0)); - float c = Random(i + vec2(0.0, 1.0)); - float d = Random(i + vec2(1.0, 1.0)); - vec2 u = smoothstep(0.0, 1.0, f); - return mix( - mix(a, b, u.x), - mix(c, d, u.x), - u.y); -} - -//////////////////////////////////////////////////////////////////////////////// -// -// Defines -// - -// Maximum number of punctual lights -#define BBMOD_MAX_PUNCTUAL_LIGHTS 8 -// Number of samples used when computing shadows -#define SHADOWMAP_SAMPLE_COUNT 12 - -//////////////////////////////////////////////////////////////////////////////// -// -// Varyings -// - -varying vec3 v_vVertex; - -varying vec2 v_vTexCoord; -varying mat3 v_mTBN; -varying vec4 v_vPosition; - -varying vec4 v_vPosShadowmap; - -varying vec4 v_vEye; - -//////////////////////////////////////////////////////////////////////////////// -// -// Uniforms -// - -//////////////////////////////////////////////////////////////////////////////// -// Material - -// Material index -// uniform float bbmod_MaterialIndex; - -// RGB: Base color, A: Opacity -#define bbmod_BaseOpacity gm_BaseTexture - -// RGBA -uniform vec4 bbmod_BaseOpacityMultiplier; - -// If 1.0 then the material uses roughness -uniform float bbmod_IsRoughness; -// RGB: Tangent-space normal, A: Smoothness or roughness -uniform sampler2D bbmod_NormalW; -// If 1.0 then the material uses metallic workflow -uniform float bbmod_IsMetallic; -// RGB: specular color / R: Metallic, G: ambient occlusion -uniform sampler2D bbmod_Material; - -// RGB: Subsurface color, A: Intensity -uniform sampler2D bbmod_Subsurface; -// RGBA: RGBM encoded emissive color -uniform sampler2D bbmod_Emissive; - -// Pixels with alpha less than this value will be discarded -uniform float bbmod_AlphaTest; - -//////////////////////////////////////////////////////////////////////////////// -// Camera - -// Camera's position in world space -uniform vec3 bbmod_CamPos; -// Distance to the far clipping plane -uniform float bbmod_ZFar; -// Camera's exposure value -uniform float bbmod_Exposure; - -//////////////////////////////////////////////////////////////////////////////// -// Fog - -// The color of the fog -uniform vec4 bbmod_FogColor; -// Maximum fog intensity -uniform float bbmod_FogIntensity; -// Distance at which the fog starts -uniform float bbmod_FogStart; -// 1.0 / (fogEnd - fogStart) -uniform float bbmod_FogRcpRange; - -//////////////////////////////////////////////////////////////////////////////// -// Ambient light - -// Ambient light's up vector. -uniform vec3 bbmod_LightAmbientDirUp; -// Ambient light color on the upper hemisphere. -uniform vec4 bbmod_LightAmbientUp; -// Ambient light color on the lower hemisphere. -uniform vec4 bbmod_LightAmbientDown; - -//////////////////////////////////////////////////////////////////////////////// -// Directional light - -// Direction of the directional light -uniform vec3 bbmod_LightDirectionalDir; -// Color of the directional light -uniform vec4 bbmod_LightDirectionalColor; - -//////////////////////////////////////////////////////////////////////////////// -// SSAO - -// SSAO texture -uniform sampler2D bbmod_SSAO; - -//////////////////////////////////////////////////////////////////////////////// -// Image based lighting - -// 1.0 to enable IBL -uniform float bbmod_IBLEnable; -// Prefiltered octahedron env. map -uniform sampler2D bbmod_IBL; -// Texel size of one octahedron -uniform vec2 bbmod_IBLTexel; - -//////////////////////////////////////////////////////////////////////////////// -// Punctual lights - -// [(x, y, z, range), (r, g, b, m), ...] -uniform vec4 bbmod_LightPunctualDataA[2 * BBMOD_MAX_PUNCTUAL_LIGHTS]; -// [(isSpotLight, dcosInner, dcosOuter), (dX, dY, dZ), ...] -uniform vec3 bbmod_LightPunctualDataB[2 * BBMOD_MAX_PUNCTUAL_LIGHTS]; - -//////////////////////////////////////////////////////////////////////////////// -// Shadow mapping - -// 1.0 to enable shadows -uniform float bbmod_ShadowmapEnablePS; -// Shadowmap texture -uniform sampler2D bbmod_Shadowmap; -// (1.0/shadowmapWidth, 1.0/shadowmapHeight) -uniform vec2 bbmod_ShadowmapTexel; -// The area that the shadowmap captures -uniform float bbmod_ShadowmapArea; -// The range over which meshes smoothly transition into shadow. -uniform float bbmod_ShadowmapBias; -// The index of the light that casts shadows. Use -1 for the directional light. -uniform float bbmod_ShadowCasterIndex; -// Offsets vertex position by its normal scaled by this value -uniform float bbmod_ShadowmapNormalOffsetPS; - -//////////////////////////////////////////////////////////////////////////////// -// HDR rendering - -// 0.0 = apply exposure, tonemap and gamma correct, 1.0 = output raw values -uniform float bbmod_HDR; - -//////////////////////////////////////////////////////////////////////////////// -// -// Includes -// -#define X_GAMMA 2.2 - -/// @desc Converts gamma space color to linear space. -vec3 xGammaToLinear(vec3 rgb) -{ - return pow(rgb, vec3(X_GAMMA)); -} - -/// @desc Converts linear space color to gamma space. -vec3 xLinearToGamma(vec3 rgb) -{ - return pow(rgb, vec3(1.0 / X_GAMMA)); -} - -/// @desc Gets color's luminance. -float xLuminance(vec3 rgb) -{ - return (0.2126 * rgb.r + 0.7152 * rgb.g + 0.0722 * rgb.b); -} -struct Material -{ - vec3 Base; - float Opacity; - vec3 Normal; - float Metallic; - float Roughness; - vec3 Specular; - float Smoothness; - float SpecularPower; - float AO; - vec3 Emissive; - vec4 Subsurface; - vec3 Lightmap; -}; - -Material CreateMaterial() -{ - Material m; - m.Base = vec3(1.0); - m.Opacity = 1.0; - m.Normal = vec3(0.0, 0.0, 1.0); - m.Metallic = 0.0; - m.Roughness = 1.0; - m.Specular = vec3(0.0); - m.Smoothness = 0.0; - m.SpecularPower = 1.0; - m.AO = 1.0; - m.Emissive = vec3(0.0); - m.Subsurface = vec4(0.0); - m.Lightmap = vec3(0.0); - return m; -} -/// @param subsurface Color in RGB and thickness/intensity in A. -/// @source https://colinbarrebrisebois.com/2011/03/07/gdc-2011-approximating-translucency-for-a-fast-cheap-and-convincing-subsurface-scattering-look/ -vec3 xCheapSubsurface(vec4 subsurface, vec3 eye, vec3 normal, vec3 light, vec3 lightColor) -{ - const float fLTPower = 1.0; - const float fLTScale = 1.0; - vec3 vLTLight = light + normal; - float fLTDot = pow(clamp(dot(eye, -vLTLight), 0.0, 1.0), fLTPower) * fLTScale; - float fLT = fLTDot * subsurface.a; - return subsurface.rgb * lightColor * fLT; -} -#define X_PI 3.14159265359 -#define X_2_PI 6.28318530718 - -/// @return x^2 -#define xPow2(x) ((x) * (x)) - -/// @return x^3 -#define xPow3(x) ((x) * (x) * (x)) - -/// @return x^4 -#define xPow4(x) ((x) * (x) * (x) * (x)) - -/// @return x^5 -#define xPow5(x) ((x) * (x) * (x) * (x) * (x)) - -/// @return arctan2(x,y) -#define xAtan2(x, y) atan(y, x) - -/// @return Direction from point `from` to point `to` in degrees (0-360 range). -float xPointDirection(vec2 from, vec2 to) -{ - float x = xAtan2(from.x - to.x, from.y - to.y); - return ((x > 0.0) ? x : (2.0 * X_PI + x)) * 180.0 / X_PI; -} - -/// @desc Default specular color for dielectrics -/// @source http://blog.selfshadow.com/publications/s2013-shading-course/karis/s2013_pbs_epic_notes_v2.pdf -#define X_F0_DEFAULT vec3(0.04, 0.04, 0.04) - -/// @desc Normal distribution function -/// @source http://blog.selfshadow.com/publications/s2013-shading-course/karis/s2013_pbs_epic_notes_v2.pdf -float xSpecularD_GGX(float roughness, float NdotH) -{ - float r = xPow4(roughness); - float a = NdotH * NdotH * (r - 1.0) + 1.0; - return r / (X_PI * a * a); -} - -/// @source https://www.unrealengine.com/en-US/blog/physically-based-shading-on-mobile -float xSpecularD_Approx(float roughness, float RdotL) -{ - float a = roughness * roughness; - float a2 = a * a; - float rcp_a2 = 1.0 / a2; - // 0.5 / ln(2), 0.275 / ln(2) - float c = (0.72134752 * rcp_a2) + 0.39674113; - return (rcp_a2 * exp2((c * RdotL) - c)); -} - -/// @desc Roughness remapping for analytic lights. -/// @source http://blog.selfshadow.com/publications/s2013-shading-course/karis/s2013_pbs_epic_notes_v2.pdf -float xK_Analytic(float roughness) -{ - return xPow2(roughness + 1.0) * 0.125; -} - -/// @desc Roughness remapping for IBL lights. -/// @source http://blog.selfshadow.com/publications/s2013-shading-course/karis/s2013_pbs_epic_notes_v2.pdf -float xK_IBL(float roughness) -{ - return xPow2(roughness) * 0.5; -} - -/// @desc Geometric attenuation -/// @param k Use either xK_Analytic for analytic lights or xK_IBL for image based lighting. -/// @source http://blog.selfshadow.com/publications/s2013-shading-course/karis/s2013_pbs_epic_notes_v2.pdf -float xSpecularG_Schlick(float k, float NdotL, float NdotV) -{ - return (NdotL / (NdotL * (1.0 - k) + k)) - * (NdotV / (NdotV * (1.0 - k) + k)); -} - -/// @desc Fresnel -/// @source https://en.wikipedia.org/wiki/Schlick%27s_approximation -vec3 xSpecularF_Schlick(vec3 f0, float VdotH) -{ - return f0 + (1.0 - f0) * xPow5(1.0 - VdotH); -} - -/// @desc Cook-Torrance microfacet specular shading -/// @note N = normalize(vertexNormal) -/// L = normalize(light - vertex) -/// V = normalize(camera - vertex) -/// H = normalize(L + V) -/// @source http://blog.selfshadow.com/publications/s2013-shading-course/karis/s2013_pbs_epic_notes_v2.pdf -vec3 xBRDF(vec3 f0, float roughness, float NdotL, float NdotV, float NdotH, float VdotH) -{ - vec3 specular = xSpecularD_GGX(roughness, NdotH) - * xSpecularF_Schlick(f0, VdotH) - * xSpecularG_Schlick(xK_Analytic(roughness), NdotL, NdotH); - return specular / ((4.0 * NdotL * NdotV) + 0.1); -} - -vec3 SpecularGGX(Material m, vec3 N, vec3 V, vec3 L) -{ - vec3 H = normalize(L + V); - float NdotL = max(dot(N, L), 0.0); - float NdotV = max(dot(N, V), 0.0); - float NdotH = max(dot(N, H), 0.0); - float VdotH = max(dot(V, H), 0.0); - return xBRDF(m.Specular, m.Roughness, NdotL, NdotV, NdotH, VdotH); -} - -void DoDirectionalLightPS( - vec3 direction, - vec3 color, - float shadow, - vec3 vertex, - vec3 N, - vec3 V, - Material m, - inout vec3 diffuse, - inout vec3 specular, - inout vec3 subsurface) -{ - vec3 L = normalize(-direction); - float NdotL = max(dot(N, L), 0.0); - subsurface += xCheapSubsurface(m.Subsurface, V, N, L, color); - color *= (1.0 - shadow) * NdotL; - diffuse += color; - specular += color * SpecularGGX(m, N, V, L); -} - -void DoPointLightPS( - vec3 position, - float range, - vec3 color, - float shadow, - vec3 vertex, - vec3 N, - vec3 V, - Material m, - inout vec3 diffuse, - inout vec3 specular, - inout vec3 subsurface) -{ - vec3 L = position - vertex; - float dist = length(L); - L = normalize(L); - float att = clamp(1.0 - (dist / range), 0.0, 1.0); - att *= att; - float NdotL = max(dot(N, L), 0.0); - subsurface += xCheapSubsurface(m.Subsurface, V, N, L, color); - color *= (1.0 - shadow) * NdotL * att; - diffuse += color; - specular += color * SpecularGGX(m, N, V, L); -} - -void DoSpotLightPS( - vec3 position, - float range, - vec3 color, - float shadow, - vec3 direction, - float dcosInner, - float dcosOuter, - vec3 vertex, - vec3 N, - vec3 V, - Material m, - inout vec3 diffuse, - inout vec3 specular, - inout vec3 subsurface) -{ - vec3 L = position - vertex; - float dist = length(L); - L = normalize(L); - float att = clamp(1.0 - (dist / range), 0.0, 1.0); - float theta = dot(L, normalize(-direction)); - float epsilon = dcosInner - dcosOuter; - float intensity = clamp((theta - dcosOuter) / epsilon, 0.0, 1.0); - subsurface += xCheapSubsurface(m.Subsurface, V, N, L, color); - color *= (1.0 - shadow) * intensity * att * max(dot(N, L), 0.0); - diffuse += color; - specular += color * SpecularGGX(m, N, V, L); -} -void Exposure() -{ - gl_FragColor.rgb *= bbmod_Exposure * bbmod_Exposure; -} -void TonemapReinhard() -{ - gl_FragColor.rgb = gl_FragColor.rgb / (vec3(1.0) + gl_FragColor.rgb); -} - -void Fog(float depth) -{ - vec3 ambientUp = xGammaToLinear(bbmod_LightAmbientUp.rgb) * bbmod_LightAmbientUp.a; - vec3 ambientDown = xGammaToLinear(bbmod_LightAmbientDown.rgb) * bbmod_LightAmbientDown.a; - vec3 directionalLightColor = xGammaToLinear(bbmod_LightDirectionalColor.rgb) * bbmod_LightDirectionalColor.a; - vec3 fogColor = xGammaToLinear(bbmod_FogColor.rgb) * (ambientUp + ambientDown + directionalLightColor); - float fogStrength = clamp((depth - bbmod_FogStart) * bbmod_FogRcpRange, 0.0, 1.0) * bbmod_FogColor.a; - gl_FragColor.rgb = mix(gl_FragColor.rgb, fogColor, fogStrength * bbmod_FogIntensity); -} - -void GammaCorrect() -{ - gl_FragColor.rgb = xLinearToGamma(gl_FragColor.rgb); -} -// Source: https://gamedev.stackexchange.com/questions/169508/octahedral-impostors-octahedral-mapping - -/// @param dir Sampling dir vector in world-space. -/// @return UV coordinates on an octahedron map. -vec2 xVec3ToOctahedronUv(vec3 dir) -{ - vec3 octant = sign(dir); - float sum = dot(dir, octant); - vec3 octahedron = dir / sum; - if (octahedron.z < 0.0) - { - vec3 absolute = abs(octahedron); - octahedron.xy = octant.xy * vec2(1.0 - absolute.y, 1.0 - absolute.x); - } - return octahedron.xy * 0.5 + 0.5; -} - -/// @desc Converts octahedron UV into a world-space vector. -vec3 xOctahedronUvToVec3Normalized(vec2 uv) -{ - vec3 position = vec3(2.0 * (uv - 0.5), 0); - vec2 absolute = abs(position.xy); - position.z = 1.0 - absolute.x - absolute.y; - if (position.z < 0.0) - { - position.xy = sign(position.xy) * vec2(1.0 - absolute.y, 1.0 - absolute.x); - } - return position; -} -/// @note Input color should be in gamma space. -/// @source https://graphicrants.blogspot.cz/2009/04/rgbm-color-encoding.html -vec4 xEncodeRGBM(vec3 color) -{ - vec4 rgbm; - color *= 1.0 / 6.0; - rgbm.a = clamp(max(max(color.r, color.g), max(color.b, 0.000001)), 0.0, 1.0); - rgbm.a = ceil(rgbm.a * 255.0) / 255.0; - rgbm.rgb = color / rgbm.a; - return rgbm; -} - -/// @source https://graphicrants.blogspot.cz/2009/04/rgbm-color-encoding.html -vec3 xDecodeRGBM(vec4 rgbm) -{ - return 6.0 * rgbm.rgb * rgbm.a; -} - -vec3 xDiffuseIBL(sampler2D ibl, vec2 texel, vec3 N) -{ - const float s = 1.0 / 8.0; - const float r2 = 7.0; - - vec2 uv0 = xVec3ToOctahedronUv(N); - uv0.x = (r2 + mix(texel.x, 1.0 - texel.x, uv0.x)) * s; - uv0.y = mix(texel.y, 1.0 - texel.y, uv0.y); - - return xGammaToLinear(xDecodeRGBM(texture2D(ibl, uv0))); -} - -/// @source https://www.unrealengine.com/en-US/blog/physically-based-shading-on-mobile -vec2 xEnvBRDFApprox(float roughness, float NdotV) -{ - const vec4 c0 = vec4(-1.0, -0.0275, -0.572, 0.022); - const vec4 c1 = vec4(1.0, 0.0425, 1.04, -0.04); - vec4 r = (roughness * c0) + c1; - float a004 = (min(r.x * r.x, exp2(-9.28 * NdotV)) * r.x) + r.y; - return ((vec2(-1.04, 1.04) * a004) + r.zw); -} - -/// @source https://www.unrealengine.com/en-US/blog/physically-based-shading-on-mobile -float xEnvBRDFApproxNonmetal(float roughness, float NdotV) -{ - // Same as EnvBRDFApprox(0.04, Roughness, NdotV) - const vec2 c0 = vec2(-1.0, -0.0275); - const vec2 c1 = vec2(1.0, 0.0425); - vec2 r = (roughness * c0) + c1; - return (min(r.x * r.x, exp2(-9.28 * NdotV)) * r.x) + r.y; -} - -// Fully rough optimization: -// xEnvBRDFApprox(SpecularColor, 1, 1) == SpecularColor * 0.4524 - 0.0024 -// DiffuseColor += SpecularColor * 0.45; -// SpecularColor = 0.0; - -/// @source http://blog.selfshadow.com/publications/s2013-shading-course/karis/s2013_pbs_epic_notes_v2.pdf -vec3 xSpecularIBL(sampler2D ibl, vec2 texel/*, sampler2D brdf*/, vec3 f0, float roughness, vec3 N, vec3 V) -{ - float NdotV = clamp(dot(N, V), 0.0, 1.0); - vec3 R = 2.0 * dot(V, N) * N - V; - // vec2 envBRDF = texture2D(brdf, vec2(roughness, NdotV)).xy; - vec2 envBRDF = xEnvBRDFApprox(roughness, NdotV); - - const float s = 1.0 / 8.0; - float r = roughness * 7.0; - float r2 = floor(r); - float rDiff = r - r2; - - vec2 uv0 = xVec3ToOctahedronUv(R); - uv0.x = (r2 + mix(texel.x, 1.0 - texel.x, uv0.x)) * s; - uv0.y = mix(texel.y, 1.0 - texel.y, uv0.y); - - vec2 uv1 = uv0; - uv1.x = uv1.x + s; - - vec3 specular = f0 * envBRDF.x + envBRDF.y; - - vec3 col0 = xGammaToLinear(xDecodeRGBM(texture2D(ibl, uv0))) * specular; - vec3 col1 = xGammaToLinear(xDecodeRGBM(texture2D(ibl, uv1))) * specular; - - return mix(col0, col1, rDiff); -} -#define F0_DEFAULT vec3(0.04) - -/// @desc Unpacks material from textures. -/// @param texBaseOpacity RGB: base color, A: opacity -/// @param isRoughness -/// @param texNormalW -/// @param isMetallic -/// @param texMaterial -/// @param texSubsurface RGB: subsurface color, A: intensity -/// @param texEmissive RGBA: RGBM encoded emissive color -/// @param texLightmap RGBA: RGBM encoded lightmap -/// @param uvLightmap Lightmap texture coordinates -/// @param TBN Tangent-bitangent-normal matrix -/// @param uv Texture coordinates -Material UnpackMaterial( - sampler2D texBaseOpacity, - float isRoughness, - sampler2D texNormalW, - float isMetallic, - sampler2D texMaterial, - sampler2D texSubsurface, - sampler2D texEmissive, - mat3 TBN, - vec2 uv) -{ - Material m = CreateMaterial(); - - // Base color and opacity - vec4 baseOpacity = texture2D(texBaseOpacity, - uv - ); - m.Base = xGammaToLinear(baseOpacity.rgb); - m.Opacity = baseOpacity.a; - - // Normal vector and smoothness/roughness - vec4 normalW = texture2D(texNormalW, - uv - ); - m.Normal = normalize(TBN * (normalW.rgb * 2.0 - 1.0)); - - if (!gl_FrontFacing) - { - m.Normal *= -1.0; - } - - if (isRoughness == 1.0) - { - m.Roughness = mix(0.1, 0.9, normalW.a); - m.Smoothness = 1.0 - m.Roughness; - } - else - { - m.Smoothness = mix(0.1, 0.9, normalW.a); - m.Roughness = 1.0 - m.Smoothness; - } - - // Material properties - vec4 materialProps = texture2D(texMaterial, - uv - ); - - if (isMetallic == 1.0) - { - m.Metallic = materialProps.r; - m.AO = materialProps.g; - m.Specular = mix(F0_DEFAULT, m.Base, m.Metallic); - m.Base *= (1.0 - m.Metallic); - } - else - { - m.Specular = materialProps.rgb; - m.SpecularPower = exp2(1.0 + (m.Smoothness * 10.0)); - } - - // Subsurface (color and intensity) - vec4 subsurface = texture2D(texSubsurface, uv); - m.Subsurface = vec4(xGammaToLinear(subsurface.rgb).rgb, subsurface.a); - - // Emissive color - m.Emissive = xGammaToLinear(xDecodeRGBM(texture2D(texEmissive, uv))); - - return m; -} -/// @param tanAspect (tanFovY*(screenWidth/screenHeight),-tanFovY), where -/// tanFovY = dtan(fov*0.5) -/// @param texCoord Sceen-space UV. -/// @param depth Scene depth at texCoord. -/// @return Point projected to view-space. -vec3 xProject(vec2 tanAspect, vec2 texCoord, float depth) -{ -#if !(defined(_YY_HLSL11_) || defined(_YY_PSSL_)) - tanAspect.y *= -1.0; -#endif - return vec3(tanAspect * (texCoord * 2.0 - 1.0) * depth, depth); -} - -/// @param p A point in clip space (transformed by projection matrix, but not -/// normalized). -/// @return P's UV coordinates on the screen. -vec2 xUnproject(vec4 p) -{ - vec2 uv = p.xy / p.w; - uv = uv * 0.5 + 0.5; -#if defined(_YY_HLSL11_) || defined(_YY_PSSL_) - uv.y = 1.0 - uv.y; -#endif - return uv; -} -/// @param d Linearized depth to encode. -/// @return Encoded depth. -/// @source http://aras-p.info/blog/2009/07/30/encoding-floats-to-rgba-the-final/ -vec3 xEncodeDepth(float d) -{ - const float inv255 = 1.0 / 255.0; - vec3 enc; - enc.x = d; - enc.y = d * 255.0; - enc.z = enc.y * 255.0; - enc = fract(enc); - float temp = enc.z * inv255; - enc.x -= enc.y * inv255; - enc.y -= temp; - enc.z -= temp; - return enc; -} - -/// @param c Encoded depth. -/// @return Docoded linear depth. -/// @source http://aras-p.info/blog/2009/07/30/encoding-floats-to-rgba-the-final/ -float xDecodeDepth(vec3 c) -{ - const float inv255 = 1.0 / 255.0; - return c.x + (c.y * inv255) + (c.z * inv255 * inv255); -} -// Shadowmap filtering source: https://www.gamedev.net/tutorials/programming/graphics/contact-hardening-soft-shadows-made-fast-r4906/ -float InterleavedGradientNoise(vec2 positionScreen) -{ - vec3 magic = vec3(0.06711056, 0.00583715, 52.9829189); - return fract(magic.z * fract(dot(positionScreen, magic.xy))); -} -vec2 VogelDiskSample(int sampleIndex, int samplesCount, float phi) -{ - float GoldenAngle = 2.4; - float r = sqrt(float(sampleIndex) + 0.5) / sqrt(float(samplesCount)); - float theta = float(sampleIndex) * GoldenAngle + phi; - float sine = sin(theta); - float cosine = cos(theta); - return vec2(r * cosine, r * sine); -} - -float ShadowMap(sampler2D shadowMap, vec2 texel, vec2 uv, float compareZ) -{ - if (clamp(uv.xy, vec2(0.0), vec2(1.0)) != uv.xy) - { - return 0.0; - } - float shadow = 0.0; - float noise = 6.28 * InterleavedGradientNoise(gl_FragCoord.xy); - float bias = bbmod_ShadowmapBias / bbmod_ShadowmapArea; - for (int i = 0; i < SHADOWMAP_SAMPLE_COUNT; ++i) - { - vec2 uv2 = uv + VogelDiskSample(i, SHADOWMAP_SAMPLE_COUNT, noise) * texel * 4.0; - float depth = xDecodeDepth(texture2D(shadowMap, uv2).rgb); - if (bias != 0.0) - { - shadow += clamp((compareZ - depth) / bias, 0.0, 1.0); - } - else - { - shadow += step(depth, compareZ); - } - } - return (shadow / float(SHADOWMAP_SAMPLE_COUNT)); -} - -void PBRShader(Material material, float depth) -{ - vec3 N = material.Normal; - vec3 V = (v_vEye.w == 1.0) ? v_vEye.xyz : normalize(bbmod_CamPos - v_vVertex); - vec3 lightDiffuse = vec3(0.0); - vec3 lightSpecular = vec3(0.0); - vec3 lightSubsurface = vec3(0.0); - - // Ambient light - vec3 ambientUp = xGammaToLinear(bbmod_LightAmbientUp.rgb) * bbmod_LightAmbientUp.a; - vec3 ambientDown = xGammaToLinear(bbmod_LightAmbientDown.rgb) * bbmod_LightAmbientDown.a; - lightDiffuse += mix(ambientDown, ambientUp, dot(N, bbmod_LightAmbientDirUp) * 0.5 + 0.5); - - // Shadow mapping - float shadow = 0.0; - if (bbmod_ShadowmapEnablePS == 1.0) - { - int shadowCasterIndex = int(bbmod_ShadowCasterIndex); - bool isPoint = (shadowCasterIndex >= 0) && (bbmod_LightPunctualDataB[shadowCasterIndex * 2].x == 0.0); - - if (!isPoint) - { - vec4 shadowmapPos = v_vPosShadowmap; - shadowmapPos.xy /= shadowmapPos.w; - float shadowmapAtt = (bbmod_ShadowCasterIndex == -1.0) - ? clamp((1.0 - length(shadowmapPos.xy)) / 0.1, 0.0, 1.0) - : 1.0; - shadowmapPos.xy = shadowmapPos.xy * 0.5 + 0.5; - #if defined(_YY_HLSL11_) || defined(_YY_PSSL_) - shadowmapPos.y = 1.0 - shadowmapPos.y; - #endif - shadowmapPos.z /= bbmod_ShadowmapArea; - - shadow = ShadowMap(bbmod_Shadowmap, bbmod_ShadowmapTexel, shadowmapPos.xy, shadowmapPos.z) - * shadowmapAtt; - } - else - { - vec3 position = bbmod_LightPunctualDataA[shadowCasterIndex * 2].xyz; - vec3 lightVec = position - v_vVertex; - vec2 uv = xVec3ToOctahedronUv(-lightVec); - shadow = ShadowMap(bbmod_Shadowmap, bbmod_ShadowmapTexel, uv, (length(lightVec) - bbmod_ShadowmapNormalOffsetPS) / bbmod_ShadowmapArea); - } - } - - // IBL - if (bbmod_IBLEnable == 1.0) - { - lightDiffuse += xDiffuseIBL(bbmod_IBL, bbmod_IBLTexel, N); - lightSpecular += xSpecularIBL(bbmod_IBL, bbmod_IBLTexel, material.Specular, material.Roughness, N, V); - // TODO: Subsurface scattering for IBL - } - - // Directional light - vec3 directionalLightColor = xGammaToLinear(bbmod_LightDirectionalColor.rgb) * bbmod_LightDirectionalColor.a; - DoDirectionalLightPS( - bbmod_LightDirectionalDir, - directionalLightColor, - (bbmod_ShadowCasterIndex == -1.0) ? shadow : 0.0, - v_vVertex, N, V, material, lightDiffuse, lightSpecular, lightSubsurface); - - // SSAO - float ssao = texture2D(bbmod_SSAO, xUnproject(v_vPosition)).r; - lightDiffuse *= ssao; - lightSpecular *= ssao; - - // Punctual lights - for (int i = 0; i < BBMOD_MAX_PUNCTUAL_LIGHTS; ++i) - { - vec4 positionRange = bbmod_LightPunctualDataA[i * 2]; - vec4 colorAlpha = bbmod_LightPunctualDataA[(i * 2) + 1]; - vec3 isSpotInnerOuter = bbmod_LightPunctualDataB[i * 2]; - vec3 direction = bbmod_LightPunctualDataB[(i * 2) + 1]; - vec3 color = xGammaToLinear(colorAlpha.rgb) * colorAlpha.a; - - if (isSpotInnerOuter.x == 1.0) - { - DoSpotLightPS( - positionRange.xyz, positionRange.w, color, - (bbmod_ShadowCasterIndex == float(i)) ? shadow : 0.0, - direction, isSpotInnerOuter.y, isSpotInnerOuter.z, - v_vVertex, N, V, material, - lightDiffuse, lightSpecular, lightSubsurface); - } - else - { - DoPointLightPS( - positionRange.xyz, positionRange.w, color, - (bbmod_ShadowCasterIndex == float(i)) ? shadow : 0.0, - v_vVertex, N, V, material, - lightDiffuse, lightSpecular, lightSubsurface); - } - } - - // Lightmap - - // Diffuse - gl_FragColor.rgb = material.Base * lightDiffuse; - // Specular - gl_FragColor.rgb += lightSpecular; - // Ambient occlusion - gl_FragColor.rgb *= material.AO; - // Emissive - gl_FragColor.rgb += material.Emissive; - // Subsurface scattering - gl_FragColor.rgb += lightSubsurface; - // Opacity - gl_FragColor.a = material.Opacity; - // Soft particles - // Fog - Fog(depth); - - if (bbmod_HDR == 0.0) - { - Exposure(); - TonemapReinhard(); - GammaCorrect(); - } -} - -//////////////////////////////////////////////////////////////////////////////// -// -// Main -// -void main() -{ - Material material = UnpackMaterial( - bbmod_BaseOpacity, - bbmod_IsRoughness, - bbmod_NormalW, - bbmod_IsMetallic, - bbmod_Material, - bbmod_Subsurface, - bbmod_Emissive, - v_mTBN, - v_vTexCoord); - - material.Base *= xGammaToLinear(bbmod_BaseOpacityMultiplier.rgb); - material.Opacity *= bbmod_BaseOpacityMultiplier.a; - - // Dissolve - float noise = Noise(v_vTexCoord * u_vDissolveScale); - if (noise < u_fDissolveThreshold) - { - discard; - } - material.Emissive = mix( - material.Emissive, - xGammaToLinear(u_vDissolveColor), - (1.0 - clamp((noise - u_fDissolveThreshold) / u_fDissolveRange, 0.0, 1.0)) * u_fDissolveThreshold); - - // Silhouette - material.Emissive = mix(material.Emissive, xGammaToLinear(u_vSilhouette.rgb), u_vSilhouette.a); - - if (material.Opacity < bbmod_AlphaTest) - { - discard; - } - - PBRShader(material, v_vPosition.z); -} diff --git a/BBMOD_GML/shaders/ShZombie/ShZombie.vsh b/BBMOD_GML/shaders/ShZombie/ShZombie.vsh deleted file mode 100644 index 1e286fba..00000000 --- a/BBMOD_GML/shaders/ShZombie/ShZombie.vsh +++ /dev/null @@ -1,171 +0,0 @@ -// FIXME: Temporary fix! -precision highp float; - -//////////////////////////////////////////////////////////////////////////////// -// -// Defines -// - -// Maximum number of bones of animated models -#define BBMOD_MAX_BONES 128 -// Maximum number of vec4 uniforms for dynamic batch data -#define BBMOD_MAX_BATCH_VEC4S 192 - -//////////////////////////////////////////////////////////////////////////////// -// -// Attributes -// -attribute vec4 in_Position; - -attribute vec3 in_Normal; - -attribute vec2 in_TextureCoord0; - -attribute vec4 in_TangentW; - -attribute vec4 in_BoneIndex; -attribute vec4 in_BoneWeight; - -//////////////////////////////////////////////////////////////////////////////// -// -// Uniforms -// - -uniform vec2 bbmod_TextureOffset; -uniform vec2 bbmod_TextureScale; - -uniform vec4 bbmod_Bones[2 * BBMOD_MAX_BONES]; - -// 1.0 to enable shadows -uniform float bbmod_ShadowmapEnableVS; -// WORLD_VIEW_PROJECTION matrix used when rendering shadowmap -uniform mat4 bbmod_ShadowmapMatrix; -// Offsets vertex position by its normal scaled by this value -uniform float bbmod_ShadowmapNormalOffsetVS; - -//////////////////////////////////////////////////////////////////////////////// -// -// Varyings -// -varying vec3 v_vVertex; - -varying vec2 v_vTexCoord; -varying mat3 v_mTBN; -varying vec4 v_vPosition; - -varying vec4 v_vPosShadowmap; - -varying vec4 v_vEye; - -//////////////////////////////////////////////////////////////////////////////// -// -// Includes -// -vec3 QuaternionRotate(vec4 q, vec3 v) -{ - return (v + 2.0 * cross(q.xyz, cross(q.xyz, v) + q.w * v)); -} - -vec3 DualQuaternionTransform(vec4 real, vec4 dual, vec3 v) -{ - return (QuaternionRotate(real, v) - + 2.0 * (real.w * dual.xyz - dual.w * real.xyz + cross(real.xyz, dual.xyz))); -} - -/// @desc Transforms vertex and normal by animation and/or batch data. -/// -/// @param vertex Variable to hold the transformed vertex. -/// @param normal Variable to hold the transformed normal. -/// @param tangent Variable to hold the transformed tangent. -/// @param bitangent Variable to hold the transformed bitangent. -void Transform( - inout vec4 vertex, - inout vec3 normal, - inout vec3 tangent, - inout vec3 bitangent) -{ - - // Source: - // https://www.cs.utah.edu/~ladislav/kavan07skinning/kavan07skinning.pdf - // https://www.cs.utah.edu/~ladislav/dq/dqs.cg - ivec4 i = ivec4(in_BoneIndex) * 2; - ivec4 j = i + 1; - - vec4 real0 = bbmod_Bones[i.x]; - vec4 real1 = bbmod_Bones[i.y]; - vec4 real2 = bbmod_Bones[i.z]; - vec4 real3 = bbmod_Bones[i.w]; - - vec4 dual0 = bbmod_Bones[j.x]; - vec4 dual1 = bbmod_Bones[j.y]; - vec4 dual2 = bbmod_Bones[j.z]; - vec4 dual3 = bbmod_Bones[j.w]; - - if (dot(real0, real1) < 0.0) { real1 *= -1.0; dual1 *= -1.0; } - if (dot(real0, real2) < 0.0) { real2 *= -1.0; dual2 *= -1.0; } - if (dot(real0, real3) < 0.0) { real3 *= -1.0; dual3 *= -1.0; } - - vec4 blendReal = - real0 * in_BoneWeight.x - + real1 * in_BoneWeight.y - + real2 * in_BoneWeight.z - + real3 * in_BoneWeight.w; - - vec4 blendDual = - dual0 * in_BoneWeight.x - + dual1 * in_BoneWeight.y - + dual2 * in_BoneWeight.z - + dual3 * in_BoneWeight.w; - - float len = length(blendReal); - blendReal /= len; - blendDual /= len; - - vertex = vec4(DualQuaternionTransform(blendReal, blendDual, vertex.xyz), 1.0); - normal = QuaternionRotate(blendReal, normal); - tangent = QuaternionRotate(blendReal, tangent); - bitangent = QuaternionRotate(blendReal, bitangent); - - vertex = gm_Matrices[MATRIX_WORLD] * vertex; - normal = normalize((gm_Matrices[MATRIX_WORLD] * vec4(normal, 0.0)).xyz); - tangent = normalize((gm_Matrices[MATRIX_WORLD] * vec4(tangent, 0.0)).xyz); - bitangent = normalize((gm_Matrices[MATRIX_WORLD] * vec4(bitangent, 0.0)).xyz); -} - -//////////////////////////////////////////////////////////////////////////////// -// -// Main -// -void main() -{ - vec4 position = in_Position; - vec3 normal = in_Normal; - vec3 tangent = in_TangentW.xyz; - vec3 bitangent = cross(normal, tangent) * in_TangentW.w; - - Transform(position, normal, tangent, bitangent); - - vec4 positionWVP = gm_Matrices[MATRIX_PROJECTION] * (gm_Matrices[MATRIX_VIEW] * position); - v_vVertex = position.xyz; - - gl_Position = positionWVP; - v_vPosition = positionWVP; - v_vTexCoord = bbmod_TextureOffset + in_TextureCoord0 * bbmod_TextureScale; - - v_vEye.xyz = normalize(-vec3( - gm_Matrices[MATRIX_VIEW][0][2], - gm_Matrices[MATRIX_VIEW][1][2], - gm_Matrices[MATRIX_VIEW][2][2] - )); - v_vEye.w = (gm_Matrices[MATRIX_PROJECTION][2][3] == 0.0) ? 1.0 : 0.0; - - v_mTBN = mat3(tangent, bitangent, normal); - - //////////////////////////////////////////////////////////////////////////// - // Vertex position in shadowmap - if (bbmod_ShadowmapEnableVS == 1.0) - { - v_vPosShadowmap = bbmod_ShadowmapMatrix - * vec4(v_vVertex + normal * bbmod_ShadowmapNormalOffsetVS, 1.0); - } -} diff --git a/BBMOD_GML/shaders/ShZombie/ShZombie.yy b/BBMOD_GML/shaders/ShZombie/ShZombie.yy deleted file mode 100644 index dea03505..00000000 --- a/BBMOD_GML/shaders/ShZombie/ShZombie.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$GMShader":"", - "%Name":"ShZombie", - "name":"ShZombie", - "parent":{ - "name":"Shaders", - "path":"folders/Demo/Shaders.yy", - }, - "resourceType":"GMShader", - "resourceVersion":"2.0", - "type":1, -} \ No newline at end of file diff --git a/BBMOD_GML/shaders/ShZombieDepth/ShZombieDepth.fsh b/BBMOD_GML/shaders/ShZombieDepth/ShZombieDepth.fsh deleted file mode 100644 index 1d1e8539..00000000 --- a/BBMOD_GML/shaders/ShZombieDepth/ShZombieDepth.fsh +++ /dev/null @@ -1,151 +0,0 @@ -// FIXME: Temporary fix! -precision highp float; - -// Dissolve effect -uniform vec3 u_vDissolveColor; -uniform float u_fDissolveThreshold; -uniform float u_fDissolveRange; -uniform vec2 u_vDissolveScale; - -float Random(in vec2 st) -{ - return fract(sin(dot(st.xy, vec2(12.9898, 78.233))) * 43758.5453); -} - -// Based on Morgan McGuire @morgan3d -// https://www.shadertoy.com/view/4dS3Wd -float Noise(in vec2 st) -{ - vec2 i = floor(st); - vec2 f = fract(st); - float a = Random(i); - float b = Random(i + vec2(1.0, 0.0)); - float c = Random(i + vec2(0.0, 1.0)); - float d = Random(i + vec2(1.0, 1.0)); - vec2 u = smoothstep(0.0, 1.0, f); - return mix( - mix(a, b, u.x), - mix(c, d, u.x), - u.y); -} - -//////////////////////////////////////////////////////////////////////////////// -// -// Defines -// - -// Maximum number of punctual lights -#define BBMOD_MAX_PUNCTUAL_LIGHTS 8 -// Number of samples used when computing shadows -#define SHADOWMAP_SAMPLE_COUNT 12 - -//////////////////////////////////////////////////////////////////////////////// -// -// Varyings -// - -varying vec3 v_vVertex; - -varying vec2 v_vTexCoord; -varying mat3 v_mTBN; -varying vec4 v_vPosition; - -//////////////////////////////////////////////////////////////////////////////// -// -// Uniforms -// - -//////////////////////////////////////////////////////////////////////////////// -// Material - -// Material index -// uniform float bbmod_MaterialIndex; - -// RGB: Base color, A: Opacity -#define bbmod_BaseOpacity gm_BaseTexture - -// Pixels with alpha less than this value will be discarded -uniform float bbmod_AlphaTest; - -//////////////////////////////////////////////////////////////////////////////// -// Camera - -// Camera's position in world space -uniform vec3 bbmod_CamPos; -// Distance to the far clipping plane -uniform float bbmod_ZFar; -// Camera's exposure value -uniform float bbmod_Exposure; - -//////////////////////////////////////////////////////////////////////////////// -// Writing shadow maps - -// 0.0 = output depth, 1.0 = output distance from camera -uniform float u_fOutputDistance; - -//////////////////////////////////////////////////////////////////////////////// -// HDR rendering - -// 0.0 = apply exposure, tonemap and gamma correct, 1.0 = output raw values -uniform float bbmod_HDR; - -//////////////////////////////////////////////////////////////////////////////// -// -// Includes -// -/// @param d Linearized depth to encode. -/// @return Encoded depth. -/// @source http://aras-p.info/blog/2009/07/30/encoding-floats-to-rgba-the-final/ -vec3 xEncodeDepth(float d) -{ - const float inv255 = 1.0 / 255.0; - vec3 enc; - enc.x = d; - enc.y = d * 255.0; - enc.z = enc.y * 255.0; - enc = fract(enc); - float temp = enc.z * inv255; - enc.x -= enc.y * inv255; - enc.y -= temp; - enc.z -= temp; - return enc; -} - -/// @param c Encoded depth. -/// @return Docoded linear depth. -/// @source http://aras-p.info/blog/2009/07/30/encoding-floats-to-rgba-the-final/ -float xDecodeDepth(vec3 c) -{ - const float inv255 = 1.0 / 255.0; - return c.x + (c.y * inv255) + (c.z * inv255 * inv255); -} - -void DepthShader(float depth) -{ - gl_FragColor.rgb = xEncodeDepth(depth / bbmod_ZFar); - gl_FragColor.a = 1.0; -} - -//////////////////////////////////////////////////////////////////////////////// -// -// Main -// -void main() -{ - float opacity = texture2D(gm_BaseTexture, v_vTexCoord).a; - - // Dissolve - float noise = Noise(v_vTexCoord * u_vDissolveScale); - if (noise < u_fDissolveThreshold) - { - discard; - } - - if (opacity < bbmod_AlphaTest) - { - discard; - } - - DepthShader((u_fOutputDistance == 1.0) ? length(v_vPosition.xyz) : v_vPosition.z); - -} diff --git a/BBMOD_GML/shaders/ShZombieDepth/ShZombieDepth.vsh b/BBMOD_GML/shaders/ShZombieDepth/ShZombieDepth.vsh deleted file mode 100644 index 238b0254..00000000 --- a/BBMOD_GML/shaders/ShZombieDepth/ShZombieDepth.vsh +++ /dev/null @@ -1,146 +0,0 @@ -// FIXME: Temporary fix! -precision highp float; - -//////////////////////////////////////////////////////////////////////////////// -// -// Defines -// - -// Maximum number of bones of animated models -#define BBMOD_MAX_BONES 128 -// Maximum number of vec4 uniforms for dynamic batch data -#define BBMOD_MAX_BATCH_VEC4S 192 - -//////////////////////////////////////////////////////////////////////////////// -// -// Attributes -// -attribute vec4 in_Position; - -attribute vec3 in_Normal; - -attribute vec2 in_TextureCoord0; - -attribute vec4 in_TangentW; - -attribute vec4 in_BoneIndex; -attribute vec4 in_BoneWeight; - -//////////////////////////////////////////////////////////////////////////////// -// -// Uniforms -// - -uniform vec2 bbmod_TextureOffset; -uniform vec2 bbmod_TextureScale; - -uniform vec4 bbmod_Bones[2 * BBMOD_MAX_BONES]; - -//////////////////////////////////////////////////////////////////////////////// -// -// Varyings -// -varying vec3 v_vVertex; - -varying vec2 v_vTexCoord; -varying mat3 v_mTBN; -varying vec4 v_vPosition; - -//////////////////////////////////////////////////////////////////////////////// -// -// Includes -// -vec3 QuaternionRotate(vec4 q, vec3 v) -{ - return (v + 2.0 * cross(q.xyz, cross(q.xyz, v) + q.w * v)); -} - -vec3 DualQuaternionTransform(vec4 real, vec4 dual, vec3 v) -{ - return (QuaternionRotate(real, v) - + 2.0 * (real.w * dual.xyz - dual.w * real.xyz + cross(real.xyz, dual.xyz))); -} - -/// @desc Transforms vertex and normal by animation and/or batch data. -/// -/// @param vertex Variable to hold the transformed vertex. -/// @param normal Variable to hold the transformed normal. -/// @param tangent Variable to hold the transformed tangent. -/// @param bitangent Variable to hold the transformed bitangent. -void Transform( - inout vec4 vertex, - inout vec3 normal, - inout vec3 tangent, - inout vec3 bitangent) -{ - - // Source: - // https://www.cs.utah.edu/~ladislav/kavan07skinning/kavan07skinning.pdf - // https://www.cs.utah.edu/~ladislav/dq/dqs.cg - ivec4 i = ivec4(in_BoneIndex) * 2; - ivec4 j = i + 1; - - vec4 real0 = bbmod_Bones[i.x]; - vec4 real1 = bbmod_Bones[i.y]; - vec4 real2 = bbmod_Bones[i.z]; - vec4 real3 = bbmod_Bones[i.w]; - - vec4 dual0 = bbmod_Bones[j.x]; - vec4 dual1 = bbmod_Bones[j.y]; - vec4 dual2 = bbmod_Bones[j.z]; - vec4 dual3 = bbmod_Bones[j.w]; - - if (dot(real0, real1) < 0.0) { real1 *= -1.0; dual1 *= -1.0; } - if (dot(real0, real2) < 0.0) { real2 *= -1.0; dual2 *= -1.0; } - if (dot(real0, real3) < 0.0) { real3 *= -1.0; dual3 *= -1.0; } - - vec4 blendReal = - real0 * in_BoneWeight.x - + real1 * in_BoneWeight.y - + real2 * in_BoneWeight.z - + real3 * in_BoneWeight.w; - - vec4 blendDual = - dual0 * in_BoneWeight.x - + dual1 * in_BoneWeight.y - + dual2 * in_BoneWeight.z - + dual3 * in_BoneWeight.w; - - float len = length(blendReal); - blendReal /= len; - blendDual /= len; - - vertex = vec4(DualQuaternionTransform(blendReal, blendDual, vertex.xyz), 1.0); - normal = QuaternionRotate(blendReal, normal); - tangent = QuaternionRotate(blendReal, tangent); - bitangent = QuaternionRotate(blendReal, bitangent); - - vertex = gm_Matrices[MATRIX_WORLD] * vertex; - normal = normalize((gm_Matrices[MATRIX_WORLD] * vec4(normal, 0.0)).xyz); - tangent = normalize((gm_Matrices[MATRIX_WORLD] * vec4(tangent, 0.0)).xyz); - bitangent = normalize((gm_Matrices[MATRIX_WORLD] * vec4(bitangent, 0.0)).xyz); -} - -//////////////////////////////////////////////////////////////////////////////// -// -// Main -// -void main() -{ - vec4 position = in_Position; - vec3 normal = in_Normal; - vec3 tangent = in_TangentW.xyz; - vec3 bitangent = cross(normal, tangent) * in_TangentW.w; - - Transform(position, normal, tangent, bitangent); - - vec4 positionWVP = gm_Matrices[MATRIX_PROJECTION] * (gm_Matrices[MATRIX_VIEW] * position); - v_vVertex = position.xyz; - - gl_Position = positionWVP; - v_vPosition = positionWVP; - v_vTexCoord = bbmod_TextureOffset + in_TextureCoord0 * bbmod_TextureScale; - - v_mTBN = mat3(tangent, bitangent, normal); - -} diff --git a/BBMOD_GML/shaders/ShZombieDepth/ShZombieDepth.yy b/BBMOD_GML/shaders/ShZombieDepth/ShZombieDepth.yy deleted file mode 100644 index 313b9dba..00000000 --- a/BBMOD_GML/shaders/ShZombieDepth/ShZombieDepth.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$GMShader":"", - "%Name":"ShZombieDepth", - "name":"ShZombieDepth", - "parent":{ - "name":"Shaders", - "path":"folders/Demo/Shaders.yy", - }, - "resourceType":"GMShader", - "resourceVersion":"2.0", - "type":1, -} \ No newline at end of file diff --git a/BBMOD_GML/shaders/ShZombieGBuffer/ShZombieGBuffer.fsh b/BBMOD_GML/shaders/ShZombieGBuffer/ShZombieGBuffer.fsh deleted file mode 100644 index 260dbb89..00000000 --- a/BBMOD_GML/shaders/ShZombieGBuffer/ShZombieGBuffer.fsh +++ /dev/null @@ -1,359 +0,0 @@ -// FIXME: Temporary fix! -precision highp float; - -// Dissolve effect -uniform vec3 u_vDissolveColor; -uniform float u_fDissolveThreshold; -uniform float u_fDissolveRange; -uniform vec2 u_vDissolveScale; - -// Silhouette effect -uniform vec4 u_vSilhouette; - -float Random(in vec2 st) -{ - return fract(sin(dot(st.xy, vec2(12.9898, 78.233))) * 43758.5453); -} - -// Based on Morgan McGuire @morgan3d -// https://www.shadertoy.com/view/4dS3Wd -float Noise(in vec2 st) -{ - vec2 i = floor(st); - vec2 f = fract(st); - float a = Random(i); - float b = Random(i + vec2(1.0, 0.0)); - float c = Random(i + vec2(0.0, 1.0)); - float d = Random(i + vec2(1.0, 1.0)); - vec2 u = smoothstep(0.0, 1.0, f); - return mix( - mix(a, b, u.x), - mix(c, d, u.x), - u.y); -} - -//////////////////////////////////////////////////////////////////////////////// -// -// Defines -// - -// Maximum number of punctual lights -#define BBMOD_MAX_PUNCTUAL_LIGHTS 8 -// Number of samples used when computing shadows -#define SHADOWMAP_SAMPLE_COUNT 12 - -//////////////////////////////////////////////////////////////////////////////// -// -// Varyings -// - -varying vec3 v_vVertex; - -varying vec2 v_vTexCoord; -varying mat3 v_mTBN; -varying vec4 v_vPosition; - -varying vec4 v_vPosShadowmap; - -varying vec4 v_vEye; - -//////////////////////////////////////////////////////////////////////////////// -// -// Uniforms -// - -//////////////////////////////////////////////////////////////////////////////// -// Material - -// Material index -// uniform float bbmod_MaterialIndex; - -// RGB: Base color, A: Opacity -#define bbmod_BaseOpacity gm_BaseTexture - -// RGBA -uniform vec4 bbmod_BaseOpacityMultiplier; - -// If 1.0 then the material uses roughness -uniform float bbmod_IsRoughness; -// RGB: Tangent-space normal, A: Smoothness or roughness -uniform sampler2D bbmod_NormalW; -// If 1.0 then the material uses metallic workflow -uniform float bbmod_IsMetallic; -// RGB: specular color / R: Metallic, G: ambient occlusion -uniform sampler2D bbmod_Material; - -// RGB: Subsurface color, A: Intensity -uniform sampler2D bbmod_Subsurface; -// RGBA: RGBM encoded emissive color -uniform sampler2D bbmod_Emissive; - -// Pixels with alpha less than this value will be discarded -uniform float bbmod_AlphaTest; - -//////////////////////////////////////////////////////////////////////////////// -// Camera - -// Camera's position in world space -uniform vec3 bbmod_CamPos; -// Distance to the far clipping plane -uniform float bbmod_ZFar; -// Camera's exposure value -uniform float bbmod_Exposure; - -//////////////////////////////////////////////////////////////////////////////// -// G-Buffer - -// Lookup texture for best fit normal encoding -uniform sampler2D u_texBestFitNormalLUT; - -//////////////////////////////////////////////////////////////////////////////// -// HDR rendering - -// 0.0 = apply exposure, tonemap and gamma correct, 1.0 = output raw values -uniform float bbmod_HDR; - -//////////////////////////////////////////////////////////////////////////////// -// -// Includes -// -/// @param d Linearized depth to encode. -/// @return Encoded depth. -/// @source http://aras-p.info/blog/2009/07/30/encoding-floats-to-rgba-the-final/ -vec3 xEncodeDepth(float d) -{ - const float inv255 = 1.0 / 255.0; - vec3 enc; - enc.x = d; - enc.y = d * 255.0; - enc.z = enc.y * 255.0; - enc = fract(enc); - float temp = enc.z * inv255; - enc.x -= enc.y * inv255; - enc.y -= temp; - enc.z -= temp; - return enc; -} - -/// @param c Encoded depth. -/// @return Docoded linear depth. -/// @source http://aras-p.info/blog/2009/07/30/encoding-floats-to-rgba-the-final/ -float xDecodeDepth(vec3 c) -{ - const float inv255 = 1.0 / 255.0; - return c.x + (c.y * inv255) + (c.z * inv255 * inv255); -} -/// @source http://advances.realtimerendering.com/s2010/Kaplanyan-CryEngine3(SIGGRAPH%202010%20Advanced%20RealTime%20Rendering%20Course).pdf -vec3 xBestFitNormal(vec3 normal, sampler2D tex) -{ - normal = normalize(normal); - vec3 normalUns = abs(normal); - float maxNAbs = max(max(normalUns.x, normalUns.y), normalUns.z); - vec2 texCoord = normalUns.z < maxNAbs ? (normalUns.y < maxNAbs ? normalUns.yz : normalUns.xz) : normalUns.xy; - texCoord = texCoord.x < texCoord.y ? texCoord.yx : texCoord.xy; - texCoord.y /= texCoord.x; - normal /= maxNAbs; - float fittingScale = texture2D(tex, texCoord).r; - return normal * fittingScale; -} -struct Material -{ - vec3 Base; - float Opacity; - vec3 Normal; - float Metallic; - float Roughness; - vec3 Specular; - float Smoothness; - float SpecularPower; - float AO; - vec3 Emissive; - vec4 Subsurface; - vec3 Lightmap; -}; - -Material CreateMaterial() -{ - Material m; - m.Base = vec3(1.0); - m.Opacity = 1.0; - m.Normal = vec3(0.0, 0.0, 1.0); - m.Metallic = 0.0; - m.Roughness = 1.0; - m.Specular = vec3(0.0); - m.Smoothness = 0.0; - m.SpecularPower = 1.0; - m.AO = 1.0; - m.Emissive = vec3(0.0); - m.Subsurface = vec4(0.0); - m.Lightmap = vec3(0.0); - return m; -} -#define F0_DEFAULT vec3(0.04) -#define X_GAMMA 2.2 - -/// @desc Converts gamma space color to linear space. -vec3 xGammaToLinear(vec3 rgb) -{ - return pow(rgb, vec3(X_GAMMA)); -} - -/// @desc Converts linear space color to gamma space. -vec3 xLinearToGamma(vec3 rgb) -{ - return pow(rgb, vec3(1.0 / X_GAMMA)); -} - -/// @desc Gets color's luminance. -float xLuminance(vec3 rgb) -{ - return (0.2126 * rgb.r + 0.7152 * rgb.g + 0.0722 * rgb.b); -} -/// @note Input color should be in gamma space. -/// @source https://graphicrants.blogspot.cz/2009/04/rgbm-color-encoding.html -vec4 xEncodeRGBM(vec3 color) -{ - vec4 rgbm; - color *= 1.0 / 6.0; - rgbm.a = clamp(max(max(color.r, color.g), max(color.b, 0.000001)), 0.0, 1.0); - rgbm.a = ceil(rgbm.a * 255.0) / 255.0; - rgbm.rgb = color / rgbm.a; - return rgbm; -} - -/// @source https://graphicrants.blogspot.cz/2009/04/rgbm-color-encoding.html -vec3 xDecodeRGBM(vec4 rgbm) -{ - return 6.0 * rgbm.rgb * rgbm.a; -} - -/// @desc Unpacks material from textures. -/// @param texBaseOpacity RGB: base color, A: opacity -/// @param isRoughness -/// @param texNormalW -/// @param isMetallic -/// @param texMaterial -/// @param texSubsurface RGB: subsurface color, A: intensity -/// @param texEmissive RGBA: RGBM encoded emissive color -/// @param texLightmap RGBA: RGBM encoded lightmap -/// @param uvLightmap Lightmap texture coordinates -/// @param TBN Tangent-bitangent-normal matrix -/// @param uv Texture coordinates -Material UnpackMaterial( - sampler2D texBaseOpacity, - float isRoughness, - sampler2D texNormalW, - float isMetallic, - sampler2D texMaterial, - sampler2D texSubsurface, - sampler2D texEmissive, - mat3 TBN, - vec2 uv) -{ - Material m = CreateMaterial(); - - // Base color and opacity - vec4 baseOpacity = texture2D(texBaseOpacity, - uv - ); - m.Base = xGammaToLinear(baseOpacity.rgb); - m.Opacity = baseOpacity.a; - - // Normal vector and smoothness/roughness - vec4 normalW = texture2D(texNormalW, - uv - ); - m.Normal = normalize(TBN * (normalW.rgb * 2.0 - 1.0)); - - if (!gl_FrontFacing) - { - m.Normal *= -1.0; - } - - if (isRoughness == 1.0) - { - m.Roughness = mix(0.1, 0.9, normalW.a); - m.Smoothness = 1.0 - m.Roughness; - } - else - { - m.Smoothness = mix(0.1, 0.9, normalW.a); - m.Roughness = 1.0 - m.Smoothness; - } - - // Material properties - vec4 materialProps = texture2D(texMaterial, - uv - ); - - if (isMetallic == 1.0) - { - m.Metallic = materialProps.r; - m.AO = materialProps.g; - m.Specular = mix(F0_DEFAULT, m.Base, m.Metallic); - m.Base *= (1.0 - m.Metallic); - } - else - { - m.Specular = materialProps.rgb; - m.SpecularPower = exp2(1.0 + (m.Smoothness * 10.0)); - } - - // Subsurface (color and intensity) - vec4 subsurface = texture2D(texSubsurface, uv); - m.Subsurface = vec4(xGammaToLinear(subsurface.rgb).rgb, subsurface.a); - - // Emissive color - m.Emissive = xGammaToLinear(xDecodeRGBM(texture2D(texEmissive, uv))); - - return m; -} - -//////////////////////////////////////////////////////////////////////////////// -// -// Main -// -void main() -{ - Material material = UnpackMaterial( - bbmod_BaseOpacity, - bbmod_IsRoughness, - bbmod_NormalW, - bbmod_IsMetallic, - bbmod_Material, - bbmod_Subsurface, - bbmod_Emissive, - v_mTBN, - v_vTexCoord); - - material.Base *= xGammaToLinear(bbmod_BaseOpacityMultiplier.rgb); - material.Opacity *= bbmod_BaseOpacityMultiplier.a; - - // Dissolve - float noise = Noise(v_vTexCoord * u_vDissolveScale); - if (noise < u_fDissolveThreshold) - { - discard; - } - material.Emissive = mix( - material.Emissive, - xGammaToLinear(u_vDissolveColor), - (1.0 - clamp((noise - u_fDissolveThreshold) / u_fDissolveRange, 0.0, 1.0)) * u_fDissolveThreshold); - - // Silhouette - material.Emissive = mix(material.Emissive, xGammaToLinear(u_vSilhouette.rgb), u_vSilhouette.a); - - if (material.Opacity < bbmod_AlphaTest) - { - discard; - } - - gl_FragData[0] = vec4(xLinearToGamma(mix(material.Base, material.Specular, material.Metallic)), material.AO); - gl_FragData[1] = vec4(xBestFitNormal(material.Normal, u_texBestFitNormalLUT) * 0.5 + 0.5, material.Roughness); - gl_FragData[2] = vec4(xEncodeDepth(v_vPosition.z / bbmod_ZFar), material.Metallic); - gl_FragData[3] = vec4(material.Emissive, 1.0); - if (bbmod_HDR == 0.0) - { - gl_FragData[3].rgb = xLinearToGamma(gl_FragData[3].rgb); - } -} diff --git a/BBMOD_GML/shaders/ShZombieGBuffer/ShZombieGBuffer.vsh b/BBMOD_GML/shaders/ShZombieGBuffer/ShZombieGBuffer.vsh deleted file mode 100644 index 1e286fba..00000000 --- a/BBMOD_GML/shaders/ShZombieGBuffer/ShZombieGBuffer.vsh +++ /dev/null @@ -1,171 +0,0 @@ -// FIXME: Temporary fix! -precision highp float; - -//////////////////////////////////////////////////////////////////////////////// -// -// Defines -// - -// Maximum number of bones of animated models -#define BBMOD_MAX_BONES 128 -// Maximum number of vec4 uniforms for dynamic batch data -#define BBMOD_MAX_BATCH_VEC4S 192 - -//////////////////////////////////////////////////////////////////////////////// -// -// Attributes -// -attribute vec4 in_Position; - -attribute vec3 in_Normal; - -attribute vec2 in_TextureCoord0; - -attribute vec4 in_TangentW; - -attribute vec4 in_BoneIndex; -attribute vec4 in_BoneWeight; - -//////////////////////////////////////////////////////////////////////////////// -// -// Uniforms -// - -uniform vec2 bbmod_TextureOffset; -uniform vec2 bbmod_TextureScale; - -uniform vec4 bbmod_Bones[2 * BBMOD_MAX_BONES]; - -// 1.0 to enable shadows -uniform float bbmod_ShadowmapEnableVS; -// WORLD_VIEW_PROJECTION matrix used when rendering shadowmap -uniform mat4 bbmod_ShadowmapMatrix; -// Offsets vertex position by its normal scaled by this value -uniform float bbmod_ShadowmapNormalOffsetVS; - -//////////////////////////////////////////////////////////////////////////////// -// -// Varyings -// -varying vec3 v_vVertex; - -varying vec2 v_vTexCoord; -varying mat3 v_mTBN; -varying vec4 v_vPosition; - -varying vec4 v_vPosShadowmap; - -varying vec4 v_vEye; - -//////////////////////////////////////////////////////////////////////////////// -// -// Includes -// -vec3 QuaternionRotate(vec4 q, vec3 v) -{ - return (v + 2.0 * cross(q.xyz, cross(q.xyz, v) + q.w * v)); -} - -vec3 DualQuaternionTransform(vec4 real, vec4 dual, vec3 v) -{ - return (QuaternionRotate(real, v) - + 2.0 * (real.w * dual.xyz - dual.w * real.xyz + cross(real.xyz, dual.xyz))); -} - -/// @desc Transforms vertex and normal by animation and/or batch data. -/// -/// @param vertex Variable to hold the transformed vertex. -/// @param normal Variable to hold the transformed normal. -/// @param tangent Variable to hold the transformed tangent. -/// @param bitangent Variable to hold the transformed bitangent. -void Transform( - inout vec4 vertex, - inout vec3 normal, - inout vec3 tangent, - inout vec3 bitangent) -{ - - // Source: - // https://www.cs.utah.edu/~ladislav/kavan07skinning/kavan07skinning.pdf - // https://www.cs.utah.edu/~ladislav/dq/dqs.cg - ivec4 i = ivec4(in_BoneIndex) * 2; - ivec4 j = i + 1; - - vec4 real0 = bbmod_Bones[i.x]; - vec4 real1 = bbmod_Bones[i.y]; - vec4 real2 = bbmod_Bones[i.z]; - vec4 real3 = bbmod_Bones[i.w]; - - vec4 dual0 = bbmod_Bones[j.x]; - vec4 dual1 = bbmod_Bones[j.y]; - vec4 dual2 = bbmod_Bones[j.z]; - vec4 dual3 = bbmod_Bones[j.w]; - - if (dot(real0, real1) < 0.0) { real1 *= -1.0; dual1 *= -1.0; } - if (dot(real0, real2) < 0.0) { real2 *= -1.0; dual2 *= -1.0; } - if (dot(real0, real3) < 0.0) { real3 *= -1.0; dual3 *= -1.0; } - - vec4 blendReal = - real0 * in_BoneWeight.x - + real1 * in_BoneWeight.y - + real2 * in_BoneWeight.z - + real3 * in_BoneWeight.w; - - vec4 blendDual = - dual0 * in_BoneWeight.x - + dual1 * in_BoneWeight.y - + dual2 * in_BoneWeight.z - + dual3 * in_BoneWeight.w; - - float len = length(blendReal); - blendReal /= len; - blendDual /= len; - - vertex = vec4(DualQuaternionTransform(blendReal, blendDual, vertex.xyz), 1.0); - normal = QuaternionRotate(blendReal, normal); - tangent = QuaternionRotate(blendReal, tangent); - bitangent = QuaternionRotate(blendReal, bitangent); - - vertex = gm_Matrices[MATRIX_WORLD] * vertex; - normal = normalize((gm_Matrices[MATRIX_WORLD] * vec4(normal, 0.0)).xyz); - tangent = normalize((gm_Matrices[MATRIX_WORLD] * vec4(tangent, 0.0)).xyz); - bitangent = normalize((gm_Matrices[MATRIX_WORLD] * vec4(bitangent, 0.0)).xyz); -} - -//////////////////////////////////////////////////////////////////////////////// -// -// Main -// -void main() -{ - vec4 position = in_Position; - vec3 normal = in_Normal; - vec3 tangent = in_TangentW.xyz; - vec3 bitangent = cross(normal, tangent) * in_TangentW.w; - - Transform(position, normal, tangent, bitangent); - - vec4 positionWVP = gm_Matrices[MATRIX_PROJECTION] * (gm_Matrices[MATRIX_VIEW] * position); - v_vVertex = position.xyz; - - gl_Position = positionWVP; - v_vPosition = positionWVP; - v_vTexCoord = bbmod_TextureOffset + in_TextureCoord0 * bbmod_TextureScale; - - v_vEye.xyz = normalize(-vec3( - gm_Matrices[MATRIX_VIEW][0][2], - gm_Matrices[MATRIX_VIEW][1][2], - gm_Matrices[MATRIX_VIEW][2][2] - )); - v_vEye.w = (gm_Matrices[MATRIX_PROJECTION][2][3] == 0.0) ? 1.0 : 0.0; - - v_mTBN = mat3(tangent, bitangent, normal); - - //////////////////////////////////////////////////////////////////////////// - // Vertex position in shadowmap - if (bbmod_ShadowmapEnableVS == 1.0) - { - v_vPosShadowmap = bbmod_ShadowmapMatrix - * vec4(v_vVertex + normal * bbmod_ShadowmapNormalOffsetVS, 1.0); - } -} diff --git a/BBMOD_GML/shaders/ShZombieGBuffer/ShZombieGBuffer.yy b/BBMOD_GML/shaders/ShZombieGBuffer/ShZombieGBuffer.yy deleted file mode 100644 index e1fbda82..00000000 --- a/BBMOD_GML/shaders/ShZombieGBuffer/ShZombieGBuffer.yy +++ /dev/null @@ -1,12 +0,0 @@ -{ - "$GMShader":"", - "%Name":"ShZombieGBuffer", - "name":"ShZombieGBuffer", - "parent":{ - "name":"Shaders", - "path":"folders/Demo/Shaders.yy", - }, - "resourceType":"GMShader", - "resourceVersion":"2.0", - "type":1, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndFootstep0/SndFootstep0.ogg b/BBMOD_GML/sounds/SndFootstep0/SndFootstep0.ogg deleted file mode 100644 index a7942f03..00000000 Binary files a/BBMOD_GML/sounds/SndFootstep0/SndFootstep0.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndFootstep0/SndFootstep0.yy b/BBMOD_GML/sounds/SndFootstep0/SndFootstep0.yy deleted file mode 100644 index b6b3ced5..00000000 --- a/BBMOD_GML/sounds/SndFootstep0/SndFootstep0.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndFootstep0", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.476958, - "name":"SndFootstep0", - "parent":{ - "name":"Footstep", - "path":"folders/Demo/Sounds/Footstep.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndFootstep0.ogg", - "type":2, - "volume":0.6, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndFootstep1/SndFootstep1.ogg b/BBMOD_GML/sounds/SndFootstep1/SndFootstep1.ogg deleted file mode 100644 index 0675d029..00000000 Binary files a/BBMOD_GML/sounds/SndFootstep1/SndFootstep1.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndFootstep1/SndFootstep1.yy b/BBMOD_GML/sounds/SndFootstep1/SndFootstep1.yy deleted file mode 100644 index 91171c78..00000000 --- a/BBMOD_GML/sounds/SndFootstep1/SndFootstep1.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndFootstep1", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.601083, - "name":"SndFootstep1", - "parent":{ - "name":"Footstep", - "path":"folders/Demo/Sounds/Footstep.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndFootstep1.ogg", - "type":2, - "volume":0.6, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndFootstep2/SndFootstep2.ogg b/BBMOD_GML/sounds/SndFootstep2/SndFootstep2.ogg deleted file mode 100644 index 7f305e35..00000000 Binary files a/BBMOD_GML/sounds/SndFootstep2/SndFootstep2.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndFootstep2/SndFootstep2.yy b/BBMOD_GML/sounds/SndFootstep2/SndFootstep2.yy deleted file mode 100644 index 3bae7931..00000000 --- a/BBMOD_GML/sounds/SndFootstep2/SndFootstep2.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndFootstep2", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.672979, - "name":"SndFootstep2", - "parent":{ - "name":"Footstep", - "path":"folders/Demo/Sounds/Footstep.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndFootstep2.ogg", - "type":2, - "volume":0.6, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndFootstep3/SndFootstep3.ogg b/BBMOD_GML/sounds/SndFootstep3/SndFootstep3.ogg deleted file mode 100644 index 18dc4498..00000000 Binary files a/BBMOD_GML/sounds/SndFootstep3/SndFootstep3.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndFootstep3/SndFootstep3.yy b/BBMOD_GML/sounds/SndFootstep3/SndFootstep3.yy deleted file mode 100644 index 1f02bab4..00000000 --- a/BBMOD_GML/sounds/SndFootstep3/SndFootstep3.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndFootstep3", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.444271, - "name":"SndFootstep3", - "parent":{ - "name":"Footstep", - "path":"folders/Demo/Sounds/Footstep.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndFootstep3.ogg", - "type":2, - "volume":0.6, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndFootstep4/SndFootstep4.ogg b/BBMOD_GML/sounds/SndFootstep4/SndFootstep4.ogg deleted file mode 100644 index f2fc6d84..00000000 Binary files a/BBMOD_GML/sounds/SndFootstep4/SndFootstep4.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndFootstep4/SndFootstep4.yy b/BBMOD_GML/sounds/SndFootstep4/SndFootstep4.yy deleted file mode 100644 index f8fab7ea..00000000 --- a/BBMOD_GML/sounds/SndFootstep4/SndFootstep4.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndFootstep4", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.522687, - "name":"SndFootstep4", - "parent":{ - "name":"Footstep", - "path":"folders/Demo/Sounds/Footstep.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndFootstep4.ogg", - "type":2, - "volume":0.6, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndFootstep5/SndFootstep5.ogg b/BBMOD_GML/sounds/SndFootstep5/SndFootstep5.ogg deleted file mode 100644 index f2fc6d84..00000000 Binary files a/BBMOD_GML/sounds/SndFootstep5/SndFootstep5.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndFootstep5/SndFootstep5.yy b/BBMOD_GML/sounds/SndFootstep5/SndFootstep5.yy deleted file mode 100644 index b461140d..00000000 --- a/BBMOD_GML/sounds/SndFootstep5/SndFootstep5.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndFootstep5", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.522687, - "name":"SndFootstep5", - "parent":{ - "name":"Footstep", - "path":"folders/Demo/Sounds/Footstep.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndFootstep5.ogg", - "type":2, - "volume":0.6, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndFootstep6/SndFootstep6.ogg b/BBMOD_GML/sounds/SndFootstep6/SndFootstep6.ogg deleted file mode 100644 index 8e34078f..00000000 Binary files a/BBMOD_GML/sounds/SndFootstep6/SndFootstep6.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndFootstep6/SndFootstep6.yy b/BBMOD_GML/sounds/SndFootstep6/SndFootstep6.yy deleted file mode 100644 index 75161bc7..00000000 --- a/BBMOD_GML/sounds/SndFootstep6/SndFootstep6.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndFootstep6", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.516146, - "name":"SndFootstep6", - "parent":{ - "name":"Footstep", - "path":"folders/Demo/Sounds/Footstep.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndFootstep6.ogg", - "type":2, - "volume":0.6, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndFootstep7/SndFootstep7.ogg b/BBMOD_GML/sounds/SndFootstep7/SndFootstep7.ogg deleted file mode 100644 index 7ae2beb8..00000000 Binary files a/BBMOD_GML/sounds/SndFootstep7/SndFootstep7.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndFootstep7/SndFootstep7.yy b/BBMOD_GML/sounds/SndFootstep7/SndFootstep7.yy deleted file mode 100644 index 8dd03790..00000000 --- a/BBMOD_GML/sounds/SndFootstep7/SndFootstep7.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndFootstep7", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.516167, - "name":"SndFootstep7", - "parent":{ - "name":"Footstep", - "path":"folders/Demo/Sounds/Footstep.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndFootstep7.ogg", - "type":2, - "volume":0.6, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndFootstep8/SndFootstep8.ogg b/BBMOD_GML/sounds/SndFootstep8/SndFootstep8.ogg deleted file mode 100644 index 41c94396..00000000 Binary files a/BBMOD_GML/sounds/SndFootstep8/SndFootstep8.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndFootstep8/SndFootstep8.yy b/BBMOD_GML/sounds/SndFootstep8/SndFootstep8.yy deleted file mode 100644 index dd794967..00000000 --- a/BBMOD_GML/sounds/SndFootstep8/SndFootstep8.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndFootstep8", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.490021, - "name":"SndFootstep8", - "parent":{ - "name":"Footstep", - "path":"folders/Demo/Sounds/Footstep.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndFootstep8.ogg", - "type":2, - "volume":0.6, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndFootstep9/SndFootstep9.ogg b/BBMOD_GML/sounds/SndFootstep9/SndFootstep9.ogg deleted file mode 100644 index b49c75da..00000000 Binary files a/BBMOD_GML/sounds/SndFootstep9/SndFootstep9.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndFootstep9/SndFootstep9.yy b/BBMOD_GML/sounds/SndFootstep9/SndFootstep9.yy deleted file mode 100644 index d09fbd9c..00000000 --- a/BBMOD_GML/sounds/SndFootstep9/SndFootstep9.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndFootstep9", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.516146, - "name":"SndFootstep9", - "parent":{ - "name":"Footstep", - "path":"folders/Demo/Sounds/Footstep.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndFootstep9.ogg", - "type":2, - "volume":0.6, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndGunshot0/SndGunshot0.ogg b/BBMOD_GML/sounds/SndGunshot0/SndGunshot0.ogg deleted file mode 100644 index af7bfcc1..00000000 Binary files a/BBMOD_GML/sounds/SndGunshot0/SndGunshot0.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndGunshot0/SndGunshot0.yy b/BBMOD_GML/sounds/SndGunshot0/SndGunshot0.yy deleted file mode 100644 index 740a7aa6..00000000 --- a/BBMOD_GML/sounds/SndGunshot0/SndGunshot0.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndGunshot0", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":2.237208, - "name":"SndGunshot0", - "parent":{ - "name":"Gunshot", - "path":"folders/Demo/Sounds/Gunshot.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndGunshot0.ogg", - "type":2, - "volume":1.0, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndGunshot1/SndGunshot1.ogg b/BBMOD_GML/sounds/SndGunshot1/SndGunshot1.ogg deleted file mode 100644 index b7a97fa6..00000000 Binary files a/BBMOD_GML/sounds/SndGunshot1/SndGunshot1.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndGunshot1/SndGunshot1.yy b/BBMOD_GML/sounds/SndGunshot1/SndGunshot1.yy deleted file mode 100644 index 1585e5db..00000000 --- a/BBMOD_GML/sounds/SndGunshot1/SndGunshot1.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndGunshot1", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":2.724333, - "name":"SndGunshot1", - "parent":{ - "name":"Gunshot", - "path":"folders/Demo/Sounds/Gunshot.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndGunshot1.ogg", - "type":2, - "volume":1.0, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndGunshot2/SndGunshot2.ogg b/BBMOD_GML/sounds/SndGunshot2/SndGunshot2.ogg deleted file mode 100644 index dcb98580..00000000 Binary files a/BBMOD_GML/sounds/SndGunshot2/SndGunshot2.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndGunshot2/SndGunshot2.yy b/BBMOD_GML/sounds/SndGunshot2/SndGunshot2.yy deleted file mode 100644 index a7b61c8a..00000000 --- a/BBMOD_GML/sounds/SndGunshot2/SndGunshot2.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndGunshot2", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":2.417604, - "name":"SndGunshot2", - "parent":{ - "name":"Gunshot", - "path":"folders/Demo/Sounds/Gunshot.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndGunshot2.ogg", - "type":2, - "volume":1.0, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndGunshot3/SndGunshot3.ogg b/BBMOD_GML/sounds/SndGunshot3/SndGunshot3.ogg deleted file mode 100644 index 2da744bd..00000000 Binary files a/BBMOD_GML/sounds/SndGunshot3/SndGunshot3.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndGunshot3/SndGunshot3.yy b/BBMOD_GML/sounds/SndGunshot3/SndGunshot3.yy deleted file mode 100644 index 5aae5ed9..00000000 --- a/BBMOD_GML/sounds/SndGunshot3/SndGunshot3.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndGunshot3", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":2.255229, - "name":"SndGunshot3", - "parent":{ - "name":"Gunshot", - "path":"folders/Demo/Sounds/Gunshot.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndGunshot3.ogg", - "type":2, - "volume":1.0, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndGunshot4/SndGunshot4.ogg b/BBMOD_GML/sounds/SndGunshot4/SndGunshot4.ogg deleted file mode 100644 index 47cbba42..00000000 Binary files a/BBMOD_GML/sounds/SndGunshot4/SndGunshot4.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndGunshot4/SndGunshot4.yy b/BBMOD_GML/sounds/SndGunshot4/SndGunshot4.yy deleted file mode 100644 index 678341ee..00000000 --- a/BBMOD_GML/sounds/SndGunshot4/SndGunshot4.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndGunshot4", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":2.850625, - "name":"SndGunshot4", - "parent":{ - "name":"Gunshot", - "path":"folders/Demo/Sounds/Gunshot.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndGunshot4.ogg", - "type":2, - "volume":1.0, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndPunch/SndPunch.ogg b/BBMOD_GML/sounds/SndPunch/SndPunch.ogg deleted file mode 100644 index fa7c0ced..00000000 Binary files a/BBMOD_GML/sounds/SndPunch/SndPunch.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndPunch/SndPunch.yy b/BBMOD_GML/sounds/SndPunch/SndPunch.yy deleted file mode 100644 index acdb4e79..00000000 --- a/BBMOD_GML/sounds/SndPunch/SndPunch.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndPunch", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.373696, - "name":"SndPunch", - "parent":{ - "name":"Sounds", - "path":"folders/Demo/Sounds.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndPunch.ogg", - "type":2, - "volume":0.62, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndShell0/SndShell0.ogg b/BBMOD_GML/sounds/SndShell0/SndShell0.ogg deleted file mode 100644 index 66592a54..00000000 Binary files a/BBMOD_GML/sounds/SndShell0/SndShell0.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndShell0/SndShell0.yy b/BBMOD_GML/sounds/SndShell0/SndShell0.yy deleted file mode 100644 index 68210f9e..00000000 --- a/BBMOD_GML/sounds/SndShell0/SndShell0.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndShell0", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.883447, - "name":"SndShell0", - "parent":{ - "name":"Shell", - "path":"folders/Demo/Sounds/Shell.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndShell0.ogg", - "type":2, - "volume":1.0, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndShell1/SndShell1.ogg b/BBMOD_GML/sounds/SndShell1/SndShell1.ogg deleted file mode 100644 index 8fe77b10..00000000 Binary files a/BBMOD_GML/sounds/SndShell1/SndShell1.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndShell1/SndShell1.yy b/BBMOD_GML/sounds/SndShell1/SndShell1.yy deleted file mode 100644 index ed3cb086..00000000 --- a/BBMOD_GML/sounds/SndShell1/SndShell1.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndShell1", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.84771, - "name":"SndShell1", - "parent":{ - "name":"Shell", - "path":"folders/Demo/Sounds/Shell.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndShell1.ogg", - "type":2, - "volume":1.0, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndShell2/SndShell2.ogg b/BBMOD_GML/sounds/SndShell2/SndShell2.ogg deleted file mode 100644 index 190390ff..00000000 Binary files a/BBMOD_GML/sounds/SndShell2/SndShell2.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndShell2/SndShell2.yy b/BBMOD_GML/sounds/SndShell2/SndShell2.yy deleted file mode 100644 index 3ab3307c..00000000 --- a/BBMOD_GML/sounds/SndShell2/SndShell2.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndShell2", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.798005, - "name":"SndShell2", - "parent":{ - "name":"Shell", - "path":"folders/Demo/Sounds/Shell.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndShell2.ogg", - "type":2, - "volume":1.0, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndShell3/SndShell3.ogg b/BBMOD_GML/sounds/SndShell3/SndShell3.ogg deleted file mode 100644 index 2aaf1e0e..00000000 Binary files a/BBMOD_GML/sounds/SndShell3/SndShell3.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndShell3/SndShell3.yy b/BBMOD_GML/sounds/SndShell3/SndShell3.yy deleted file mode 100644 index e6a62d5d..00000000 --- a/BBMOD_GML/sounds/SndShell3/SndShell3.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndShell3", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.804263, - "name":"SndShell3", - "parent":{ - "name":"Shell", - "path":"folders/Demo/Sounds/Shell.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndShell3.ogg", - "type":2, - "volume":1.0, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndShell4/SndShell4.ogg b/BBMOD_GML/sounds/SndShell4/SndShell4.ogg deleted file mode 100644 index 6dea766b..00000000 Binary files a/BBMOD_GML/sounds/SndShell4/SndShell4.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndShell4/SndShell4.yy b/BBMOD_GML/sounds/SndShell4/SndShell4.yy deleted file mode 100644 index 98a331c3..00000000 --- a/BBMOD_GML/sounds/SndShell4/SndShell4.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndShell4", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.855261, - "name":"SndShell4", - "parent":{ - "name":"Shell", - "path":"folders/Demo/Sounds/Shell.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndShell4.ogg", - "type":2, - "volume":1.0, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndShell5/SndShell5.ogg b/BBMOD_GML/sounds/SndShell5/SndShell5.ogg deleted file mode 100644 index 6e244efb..00000000 Binary files a/BBMOD_GML/sounds/SndShell5/SndShell5.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndShell5/SndShell5.yy b/BBMOD_GML/sounds/SndShell5/SndShell5.yy deleted file mode 100644 index 17511992..00000000 --- a/BBMOD_GML/sounds/SndShell5/SndShell5.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndShell5", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.900385, - "name":"SndShell5", - "parent":{ - "name":"Shell", - "path":"folders/Demo/Sounds/Shell.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndShell5.ogg", - "type":2, - "volume":1.0, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndShell6/SndFootstep0.yy b/BBMOD_GML/sounds/SndShell6/SndFootstep0.yy deleted file mode 100644 index 1e5a02ab..00000000 --- a/BBMOD_GML/sounds/SndShell6/SndFootstep0.yy +++ /dev/null @@ -1,23 +0,0 @@ -{ - "compression": 3, - "volume": 0.53, - "preload": false, - "bitRate": 128, - "sampleRate": 44100, - "type": 2, - "bitDepth": 1, - "audioGroupId": { - "name": "audiogroup_default", - "path": "audiogroups/audiogroup_default", - }, - "soundFile": "SndFootstep0.ogg", - "duration": 0.478855, - "parent": { - "name": "Sounds", - "path": "folders/Sounds.yy", - }, - "resourceVersion": "1.0", - "name": "SndFootstep0", - "tags": [], - "resourceType": "GMSound", -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndShell6/SndPickaxe0.yy b/BBMOD_GML/sounds/SndShell6/SndPickaxe0.yy deleted file mode 100644 index 2b8857e0..00000000 --- a/BBMOD_GML/sounds/SndShell6/SndPickaxe0.yy +++ /dev/null @@ -1,23 +0,0 @@ -{ - "compression": 3, - "volume": 1.0, - "preload": false, - "bitRate": 128, - "sampleRate": 44100, - "type": 0, - "bitDepth": 1, - "audioGroupId": { - "name": "audiogroup_default", - "path": "audiogroups/audiogroup_default", - }, - "soundFile": "SndPickaxe0.ogg", - "duration": 0.129583, - "parent": { - "name": "Sounds", - "path": "folders/Sounds.yy", - }, - "resourceVersion": "1.0", - "name": "SndPickaxe0", - "tags": [], - "resourceType": "GMSound", -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndShell6/SndPickaxe1.yy b/BBMOD_GML/sounds/SndShell6/SndPickaxe1.yy deleted file mode 100644 index 1bbf4d86..00000000 --- a/BBMOD_GML/sounds/SndShell6/SndPickaxe1.yy +++ /dev/null @@ -1,23 +0,0 @@ -{ - "compression": 3, - "volume": 1.0, - "preload": false, - "bitRate": 128, - "sampleRate": 44100, - "type": 0, - "bitDepth": 1, - "audioGroupId": { - "name": "audiogroup_default", - "path": "audiogroups/audiogroup_default", - }, - "soundFile": "SndPickaxe1.ogg", - "duration": 0.234125, - "parent": { - "name": "Sounds", - "path": "folders/Sounds.yy", - }, - "resourceVersion": "1.0", - "name": "SndPickaxe1", - "tags": [], - "resourceType": "GMSound", -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndShell6/SndShell6.ogg b/BBMOD_GML/sounds/SndShell6/SndShell6.ogg deleted file mode 100644 index 225a29bf..00000000 Binary files a/BBMOD_GML/sounds/SndShell6/SndShell6.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndShell6/SndShell6.yy b/BBMOD_GML/sounds/SndShell6/SndShell6.yy deleted file mode 100644 index 2d9208f4..00000000 --- a/BBMOD_GML/sounds/SndShell6/SndShell6.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndShell6", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.73966, - "name":"SndShell6", - "parent":{ - "name":"Shell", - "path":"folders/Demo/Sounds/Shell.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndShell6.ogg", - "type":2, - "volume":1.0, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndShell6/SndStab0.yy b/BBMOD_GML/sounds/SndShell6/SndStab0.yy deleted file mode 100644 index 6b1bb0fc..00000000 --- a/BBMOD_GML/sounds/SndShell6/SndStab0.yy +++ /dev/null @@ -1,23 +0,0 @@ -{ - "compression": 3, - "volume": 1.0, - "preload": false, - "bitRate": 128, - "sampleRate": 44100, - "type": 0, - "bitDepth": 1, - "audioGroupId": { - "name": "audiogroup_default", - "path": "audiogroups/audiogroup_default", - }, - "soundFile": "SndStab0.ogg", - "duration": 0.880374, - "parent": { - "name": "Sounds", - "path": "folders/Sounds.yy", - }, - "resourceVersion": "1.0", - "name": "SndStab0", - "tags": [], - "resourceType": "GMSound", -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndShell6/SndSword0.yy b/BBMOD_GML/sounds/SndShell6/SndSword0.yy deleted file mode 100644 index b5566dc1..00000000 --- a/BBMOD_GML/sounds/SndShell6/SndSword0.yy +++ /dev/null @@ -1,23 +0,0 @@ -{ - "compression": 3, - "volume": 1.0, - "preload": false, - "bitRate": 128, - "sampleRate": 44100, - "type": 2, - "bitDepth": 1, - "audioGroupId": { - "name": "audiogroup_default", - "path": "audiogroups/audiogroup_default", - }, - "soundFile": "SndSword0.ogg", - "duration": 0.195854, - "parent": { - "name": "Sounds", - "path": "folders/Sounds.yy", - }, - "resourceVersion": "1.0", - "name": "SndSword0", - "tags": [], - "resourceType": "GMSound", -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndShell6/SndSword1.yy b/BBMOD_GML/sounds/SndShell6/SndSword1.yy deleted file mode 100644 index c4880a7c..00000000 --- a/BBMOD_GML/sounds/SndShell6/SndSword1.yy +++ /dev/null @@ -1,23 +0,0 @@ -{ - "compression": 3, - "volume": 1.0, - "preload": false, - "bitRate": 128, - "sampleRate": 44100, - "type": 2, - "bitDepth": 1, - "audioGroupId": { - "name": "audiogroup_default", - "path": "audiogroups/audiogroup_default", - }, - "soundFile": "SndSword1.ogg", - "duration": 0.445438, - "parent": { - "name": "Sounds", - "path": "folders/Sounds.yy", - }, - "resourceVersion": "1.0", - "name": "SndSword1", - "tags": [], - "resourceType": "GMSound", -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndShell6/SndSword2.yy b/BBMOD_GML/sounds/SndShell6/SndSword2.yy deleted file mode 100644 index 6a41a0a7..00000000 --- a/BBMOD_GML/sounds/SndShell6/SndSword2.yy +++ /dev/null @@ -1,23 +0,0 @@ -{ - "compression": 3, - "volume": 1.0, - "preload": false, - "bitRate": 128, - "sampleRate": 44100, - "type": 2, - "bitDepth": 1, - "audioGroupId": { - "name": "audiogroup_default", - "path": "audiogroups/audiogroup_default", - }, - "soundFile": "SndSword2.ogg", - "duration": 0.471792, - "parent": { - "name": "Sounds", - "path": "folders/Sounds.yy", - }, - "resourceVersion": "1.0", - "name": "SndSword2", - "tags": [], - "resourceType": "GMSound", -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndShell6/SndThump.yy b/BBMOD_GML/sounds/SndShell6/SndThump.yy deleted file mode 100644 index 9a4b261e..00000000 --- a/BBMOD_GML/sounds/SndShell6/SndThump.yy +++ /dev/null @@ -1,23 +0,0 @@ -{ - "compression": 3, - "volume": 1.0, - "preload": false, - "bitRate": 128, - "sampleRate": 44100, - "type": 2, - "bitDepth": 1, - "audioGroupId": { - "name": "audiogroup_default", - "path": "audiogroups/audiogroup_default", - }, - "soundFile": "SndThump.ogg", - "duration": 0.195854, - "parent": { - "name": "Sounds", - "path": "folders/Sounds.yy", - }, - "resourceVersion": "1.0", - "name": "SndThump", - "tags": [], - "resourceType": "GMSound", -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndShell6/SndWoodChop0.yy b/BBMOD_GML/sounds/SndShell6/SndWoodChop0.yy deleted file mode 100644 index 24aa135a..00000000 --- a/BBMOD_GML/sounds/SndShell6/SndWoodChop0.yy +++ /dev/null @@ -1,23 +0,0 @@ -{ - "compression": 3, - "volume": 1.0, - "preload": false, - "bitRate": 128, - "sampleRate": 44100, - "type": 2, - "bitDepth": 1, - "audioGroupId": { - "name": "audiogroup_default", - "path": "audiogroups/audiogroup_default", - }, - "soundFile": "SndWoodChop0.ogg", - "duration": 0.278719, - "parent": { - "name": "Sounds", - "path": "folders/Sounds.yy", - }, - "resourceVersion": "1.0", - "name": "SndWoodChop0", - "tags": [], - "resourceType": "GMSound", -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndShell6/SndWoodChop1.yy b/BBMOD_GML/sounds/SndShell6/SndWoodChop1.yy deleted file mode 100644 index d0a1f363..00000000 --- a/BBMOD_GML/sounds/SndShell6/SndWoodChop1.yy +++ /dev/null @@ -1,23 +0,0 @@ -{ - "compression": 3, - "volume": 0.63, - "preload": false, - "bitRate": 128, - "sampleRate": 44100, - "type": 2, - "bitDepth": 1, - "audioGroupId": { - "name": "audiogroup_default", - "path": "audiogroups/audiogroup_default", - }, - "soundFile": "SndWoodChop1.ogg", - "duration": 0.254977, - "parent": { - "name": "Sounds", - "path": "folders/Sounds.yy", - }, - "resourceVersion": "1.0", - "name": "SndWoodChop1", - "tags": [], - "resourceType": "GMSound", -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndShell7/SndShell7.ogg b/BBMOD_GML/sounds/SndShell7/SndShell7.ogg deleted file mode 100644 index 1cfa526d..00000000 Binary files a/BBMOD_GML/sounds/SndShell7/SndShell7.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndShell7/SndShell7.yy b/BBMOD_GML/sounds/SndShell7/SndShell7.yy deleted file mode 100644 index d0c03caa..00000000 --- a/BBMOD_GML/sounds/SndShell7/SndShell7.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndShell7", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":1.026871, - "name":"SndShell7", - "parent":{ - "name":"Shell", - "path":"folders/Demo/Sounds/Shell.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndShell7.ogg", - "type":2, - "volume":1.0, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndWhoosh/SndWhoosh.ogg b/BBMOD_GML/sounds/SndWhoosh/SndWhoosh.ogg deleted file mode 100644 index 268ef93e..00000000 Binary files a/BBMOD_GML/sounds/SndWhoosh/SndWhoosh.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndWhoosh/SndWhoosh.yy b/BBMOD_GML/sounds/SndWhoosh/SndWhoosh.yy deleted file mode 100644 index b98ef443..00000000 --- a/BBMOD_GML/sounds/SndWhoosh/SndWhoosh.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndWhoosh", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.134172, - "name":"SndWhoosh", - "parent":{ - "name":"Sounds", - "path":"folders/Demo/Sounds.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndWhoosh.ogg", - "type":2, - "volume":0.66, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndZombie0/SndZombie0.ogg b/BBMOD_GML/sounds/SndZombie0/SndZombie0.ogg deleted file mode 100644 index a2bf1ed5..00000000 Binary files a/BBMOD_GML/sounds/SndZombie0/SndZombie0.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndZombie0/SndZombie0.yy b/BBMOD_GML/sounds/SndZombie0/SndZombie0.yy deleted file mode 100644 index dc8b208f..00000000 --- a/BBMOD_GML/sounds/SndZombie0/SndZombie0.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndZombie0", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.60712, - "name":"SndZombie0", - "parent":{ - "name":"Zombie", - "path":"folders/Demo/Sounds/Zombie.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndZombie0.ogg", - "type":2, - "volume":1.0, -} \ No newline at end of file diff --git a/BBMOD_GML/sounds/SndZombie1/SndZombie1.ogg b/BBMOD_GML/sounds/SndZombie1/SndZombie1.ogg deleted file mode 100644 index c6e33841..00000000 Binary files a/BBMOD_GML/sounds/SndZombie1/SndZombie1.ogg and /dev/null differ diff --git a/BBMOD_GML/sounds/SndZombie1/SndZombie1.yy b/BBMOD_GML/sounds/SndZombie1/SndZombie1.yy deleted file mode 100644 index ad47bf2d..00000000 --- a/BBMOD_GML/sounds/SndZombie1/SndZombie1.yy +++ /dev/null @@ -1,25 +0,0 @@ -{ - "$GMSound":"", - "%Name":"SndZombie1", - "audioGroupId":{ - "name":"audiogroup_default", - "path":"audiogroups/audiogroup_default", - }, - "bitDepth":1, - "bitRate":128, - "compression":1, - "conversionMode":0, - "duration":0.459048, - "name":"SndZombie1", - "parent":{ - "name":"Zombie", - "path":"folders/Demo/Sounds/Zombie.yy", - }, - "preload":false, - "resourceType":"GMSound", - "resourceVersion":"2.0", - "sampleRate":44100, - "soundFile":"SndZombie1.ogg", - "type":2, - "volume":1.0, -} \ No newline at end of file diff --git a/BBMOD_GML/sprites/SprCharacterCollisionMask/SprCharacterCollisionMask.yy b/BBMOD_GML/sprites/SprCharacterCollisionMask/SprCharacterCollisionMask.yy deleted file mode 100644 index ab5cbd7f..00000000 --- a/BBMOD_GML/sprites/SprCharacterCollisionMask/SprCharacterCollisionMask.yy +++ /dev/null @@ -1,90 +0,0 @@ -{ - "$GMSprite":"", - "%Name":"SprCharacterCollisionMask", - "bboxMode":0, - "bbox_bottom":14, - "bbox_left":0, - "bbox_right":14, - "bbox_top":0, - "collisionKind":1, - "collisionTolerance":0, - "DynamicTexturePage":false, - "edgeFiltering":false, - "For3D":false, - "frames":[ - {"$GMSpriteFrame":"","%Name":"f91f71e7-c843-4367-b6c6-f66c219c4504","name":"f91f71e7-c843-4367-b6c6-f66c219c4504","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - ], - "gridX":0, - "gridY":0, - "height":15, - "HTile":false, - "layers":[ - {"$GMImageLayer":"","%Name":"f43462d7-62ef-40dc-af8b-02dc0987e567","blendMode":0,"displayName":"default","isLocked":false,"name":"f43462d7-62ef-40dc-af8b-02dc0987e567","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, - ], - "name":"SprCharacterCollisionMask", - "nineSlice":null, - "origin":4, - "parent":{ - "name":"Sprites", - "path":"folders/Demo/Sprites.yy", - }, - "preMultiplyAlpha":false, - "resourceType":"GMSprite", - "resourceVersion":"2.0", - "sequence":{ - "$GMSequence":"", - "%Name":"SprCharacterCollisionMask", - "autoRecord":true, - "backdropHeight":768, - "backdropImageOpacity":0.5, - "backdropImagePath":"", - "backdropWidth":1366, - "backdropXOffset":0.0, - "backdropYOffset":0.0, - "events":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "eventStubScript":null, - "eventToFunction":{}, - "length":1.0, - "lockOrigin":false, - "moments":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "name":"SprCharacterCollisionMask", - "playback":1, - "playbackSpeed":30.0, - "playbackSpeedType":0, - "resourceType":"GMSequence", - "resourceVersion":"2.0", - "showBackdrop":true, - "showBackdropImage":false, - "timeUnits":1, - "tracks":[ - {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"f91f71e7-c843-4367-b6c6-f66c219c4504","path":"sprites/SprCharacterCollisionMask/SprCharacterCollisionMask.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"23a441bc-4705-46e5-926d-1e92e095790d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange":null, - "volume":1.0, - "xorigin":7, - "yorigin":7, - }, - "swatchColours":null, - "swfPrecision":2.525, - "textureGroupId":{ - "name":"Default", - "path":"texturegroups/Default", - }, - "type":0, - "VTile":false, - "width":15, -} \ No newline at end of file diff --git a/BBMOD_GML/sprites/SprCharacterCollisionMask/f91f71e7-c843-4367-b6c6-f66c219c4504.png b/BBMOD_GML/sprites/SprCharacterCollisionMask/f91f71e7-c843-4367-b6c6-f66c219c4504.png deleted file mode 100644 index df64ba90..00000000 Binary files a/BBMOD_GML/sprites/SprCharacterCollisionMask/f91f71e7-c843-4367-b6c6-f66c219c4504.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprCharacterCollisionMask/layers/f91f71e7-c843-4367-b6c6-f66c219c4504/f43462d7-62ef-40dc-af8b-02dc0987e567.png b/BBMOD_GML/sprites/SprCharacterCollisionMask/layers/f91f71e7-c843-4367-b6c6-f66c219c4504/f43462d7-62ef-40dc-af8b-02dc0987e567.png deleted file mode 100644 index df64ba90..00000000 Binary files a/BBMOD_GML/sprites/SprCharacterCollisionMask/layers/f91f71e7-c843-4367-b6c6-f66c219c4504/f43462d7-62ef-40dc-af8b-02dc0987e567.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprColorGrading/9c1088e4-4abf-42a7-ba51-7768972da5f4.png b/BBMOD_GML/sprites/SprColorGrading/9c1088e4-4abf-42a7-ba51-7768972da5f4.png deleted file mode 100644 index 0e1bff93..00000000 Binary files a/BBMOD_GML/sprites/SprColorGrading/9c1088e4-4abf-42a7-ba51-7768972da5f4.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprColorGrading/SprColorGrading.yy b/BBMOD_GML/sprites/SprColorGrading/SprColorGrading.yy deleted file mode 100644 index da4a1a8d..00000000 --- a/BBMOD_GML/sprites/SprColorGrading/SprColorGrading.yy +++ /dev/null @@ -1,109 +0,0 @@ -{ - "$GMSprite":"", - "%Name":"SprColorGrading", - "bboxMode":0, - "bbox_bottom":15, - "bbox_left":0, - "bbox_right":255, - "bbox_top":0, - "collisionKind":1, - "collisionTolerance":0, - "DynamicTexturePage":false, - "edgeFiltering":false, - "For3D":true, - "frames":[ - {"$GMSpriteFrame":"","%Name":"9c1088e4-4abf-42a7-ba51-7768972da5f4","name":"9c1088e4-4abf-42a7-ba51-7768972da5f4","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - ], - "gridX":0, - "gridY":0, - "height":16, - "HTile":false, - "layers":[ - {"$GMImageLayer":"","%Name":"609ab95a-bc6f-4dd9-8bd2-12e84733b60c","blendMode":0,"displayName":"default","isLocked":false,"name":"609ab95a-bc6f-4dd9-8bd2-12e84733b60c","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, - ], - "name":"SprColorGrading", - "nineSlice":{ - "$GMNineSliceData":"", - "bottom":0, - "enabled":false, - "guideColour":[4294902015,4294902015,4294902015,4294902015,], - "highlightColour":1728023040, - "highlightStyle":0, - "left":0, - "resourceType":"GMNineSliceData", - "resourceVersion":"2.0", - "right":0, - "tileMode":[ - 0, - 0, - 0, - 0, - 0, - ], - "top":0, - }, - "origin":0, - "parent":{ - "name":"Sprites", - "path":"folders/Demo/Sprites.yy", - }, - "preMultiplyAlpha":false, - "resourceType":"GMSprite", - "resourceVersion":"2.0", - "sequence":{ - "$GMSequence":"", - "%Name":"SprColorGrading", - "autoRecord":true, - "backdropHeight":768, - "backdropImageOpacity":0.5, - "backdropImagePath":"", - "backdropWidth":1366, - "backdropXOffset":0.0, - "backdropYOffset":0.0, - "events":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "eventStubScript":null, - "eventToFunction":{}, - "length":1.0, - "lockOrigin":false, - "moments":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "name":"SprColorGrading", - "playback":1, - "playbackSpeed":30.0, - "playbackSpeedType":0, - "resourceType":"GMSequence", - "resourceVersion":"2.0", - "showBackdrop":true, - "showBackdropImage":false, - "timeUnits":1, - "tracks":[ - {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"9c1088e4-4abf-42a7-ba51-7768972da5f4","path":"sprites/SprColorGrading/SprColorGrading.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"83265a59-f70e-4c73-a24a-433914f1fb69","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange":null, - "volume":1.0, - "xorigin":0, - "yorigin":0, - }, - "swatchColours":null, - "swfPrecision":2.525, - "textureGroupId":{ - "name":"Default", - "path":"texturegroups/Default", - }, - "type":0, - "VTile":false, - "width":256, -} \ No newline at end of file diff --git a/BBMOD_GML/sprites/SprColorGrading/layers/9c1088e4-4abf-42a7-ba51-7768972da5f4/609ab95a-bc6f-4dd9-8bd2-12e84733b60c.png b/BBMOD_GML/sprites/SprColorGrading/layers/9c1088e4-4abf-42a7-ba51-7768972da5f4/609ab95a-bc6f-4dd9-8bd2-12e84733b60c.png deleted file mode 100644 index 0e1bff93..00000000 Binary files a/BBMOD_GML/sprites/SprColorGrading/layers/9c1088e4-4abf-42a7-ba51-7768972da5f4/609ab95a-bc6f-4dd9-8bd2-12e84733b60c.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprCrosshair/3542279d-f897-4687-9f67-cede99a28e52.png b/BBMOD_GML/sprites/SprCrosshair/3542279d-f897-4687-9f67-cede99a28e52.png deleted file mode 100644 index 585564cd..00000000 Binary files a/BBMOD_GML/sprites/SprCrosshair/3542279d-f897-4687-9f67-cede99a28e52.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprCrosshair/SprCrosshair.yy b/BBMOD_GML/sprites/SprCrosshair/SprCrosshair.yy deleted file mode 100644 index 5502448e..00000000 --- a/BBMOD_GML/sprites/SprCrosshair/SprCrosshair.yy +++ /dev/null @@ -1,90 +0,0 @@ -{ - "$GMSprite":"", - "%Name":"SprCrosshair", - "bboxMode":0, - "bbox_bottom":4, - "bbox_left":0, - "bbox_right":4, - "bbox_top":0, - "collisionKind":1, - "collisionTolerance":0, - "DynamicTexturePage":false, - "edgeFiltering":false, - "For3D":false, - "frames":[ - {"$GMSpriteFrame":"","%Name":"3542279d-f897-4687-9f67-cede99a28e52","name":"3542279d-f897-4687-9f67-cede99a28e52","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - ], - "gridX":0, - "gridY":0, - "height":5, - "HTile":false, - "layers":[ - {"$GMImageLayer":"","%Name":"c6e0c7ff-ec50-4b1f-a050-4a9978a13b3e","blendMode":0,"displayName":"default","isLocked":false,"name":"c6e0c7ff-ec50-4b1f-a050-4a9978a13b3e","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, - ], - "name":"SprCrosshair", - "nineSlice":null, - "origin":4, - "parent":{ - "name":"Sprites", - "path":"folders/Demo/Sprites.yy", - }, - "preMultiplyAlpha":false, - "resourceType":"GMSprite", - "resourceVersion":"2.0", - "sequence":{ - "$GMSequence":"", - "%Name":"SprCrosshair", - "autoRecord":true, - "backdropHeight":768, - "backdropImageOpacity":0.5, - "backdropImagePath":"", - "backdropWidth":1366, - "backdropXOffset":0.0, - "backdropYOffset":0.0, - "events":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "eventStubScript":null, - "eventToFunction":{}, - "length":1.0, - "lockOrigin":true, - "moments":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "name":"SprCrosshair", - "playback":1, - "playbackSpeed":30.0, - "playbackSpeedType":0, - "resourceType":"GMSequence", - "resourceVersion":"2.0", - "showBackdrop":true, - "showBackdropImage":false, - "timeUnits":1, - "tracks":[ - {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"3542279d-f897-4687-9f67-cede99a28e52","path":"sprites/SprCrosshair/SprCrosshair.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"f3df3948-65c3-46b6-a8e5-b1809cf920b2","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange":null, - "volume":1.0, - "xorigin":2, - "yorigin":2, - }, - "swatchColours":null, - "swfPrecision":2.525, - "textureGroupId":{ - "name":"Default", - "path":"texturegroups/Default", - }, - "type":0, - "VTile":false, - "width":5, -} \ No newline at end of file diff --git a/BBMOD_GML/sprites/SprCrosshair/layers/3542279d-f897-4687-9f67-cede99a28e52/c6e0c7ff-ec50-4b1f-a050-4a9978a13b3e.png b/BBMOD_GML/sprites/SprCrosshair/layers/3542279d-f897-4687-9f67-cede99a28e52/c6e0c7ff-ec50-4b1f-a050-4a9978a13b3e.png deleted file mode 100644 index 585564cd..00000000 Binary files a/BBMOD_GML/sprites/SprCrosshair/layers/3542279d-f897-4687-9f67-cede99a28e52/c6e0c7ff-ec50-4b1f-a050-4a9978a13b3e.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprDirt/70bcc5eb-3a02-41ac-91cc-41ba3d880f0f.png b/BBMOD_GML/sprites/SprDirt/70bcc5eb-3a02-41ac-91cc-41ba3d880f0f.png deleted file mode 100644 index 3493f1bc..00000000 Binary files a/BBMOD_GML/sprites/SprDirt/70bcc5eb-3a02-41ac-91cc-41ba3d880f0f.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprDirt/7832f9a6-da46-41d3-92bb-2759c7ab7dac.png b/BBMOD_GML/sprites/SprDirt/7832f9a6-da46-41d3-92bb-2759c7ab7dac.png deleted file mode 100644 index b3e3143b..00000000 Binary files a/BBMOD_GML/sprites/SprDirt/7832f9a6-da46-41d3-92bb-2759c7ab7dac.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprDirt/SprDirt.yy b/BBMOD_GML/sprites/SprDirt/SprDirt.yy deleted file mode 100644 index f52d399d..00000000 --- a/BBMOD_GML/sprites/SprDirt/SprDirt.yy +++ /dev/null @@ -1,94 +0,0 @@ -{ - "$GMSprite":"", - "%Name":"SprDirt", - "bboxMode":0, - "bbox_bottom":1023, - "bbox_left":0, - "bbox_right":1023, - "bbox_top":0, - "collisionKind":1, - "collisionTolerance":0, - "DynamicTexturePage":false, - "edgeFiltering":false, - "For3D":true, - "frames":[ - {"$GMSpriteFrame":"","%Name":"7832f9a6-da46-41d3-92bb-2759c7ab7dac","name":"7832f9a6-da46-41d3-92bb-2759c7ab7dac","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"70bcc5eb-3a02-41ac-91cc-41ba3d880f0f","name":"70bcc5eb-3a02-41ac-91cc-41ba3d880f0f","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - ], - "gridX":0, - "gridY":0, - "height":1024, - "HTile":false, - "layers":[ - {"$GMImageLayer":"","%Name":"0f6306e5-4cf1-4599-a7af-cdd206d67422","blendMode":0,"displayName":"default","isLocked":false,"name":"0f6306e5-4cf1-4599-a7af-cdd206d67422","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, - ], - "name":"SprDirt", - "nineSlice":null, - "origin":0, - "parent":{ - "name":"Terrain", - "path":"folders/Demo/Sprites/Terrain.yy", - }, - "preMultiplyAlpha":false, - "resourceType":"GMSprite", - "resourceVersion":"2.0", - "sequence":{ - "$GMSequence":"", - "%Name":"SprDirt", - "autoRecord":true, - "backdropHeight":768, - "backdropImageOpacity":0.5, - "backdropImagePath":"", - "backdropWidth":1366, - "backdropXOffset":0.0, - "backdropYOffset":0.0, - "events":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "eventStubScript":null, - "eventToFunction":{}, - "length":2.0, - "lockOrigin":false, - "moments":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "name":"SprDirt", - "playback":1, - "playbackSpeed":30.0, - "playbackSpeedType":0, - "resourceType":"GMSequence", - "resourceVersion":"2.0", - "showBackdrop":true, - "showBackdropImage":false, - "timeUnits":1, - "tracks":[ - {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7832f9a6-da46-41d3-92bb-2759c7ab7dac","path":"sprites/SprDirt/SprDirt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"757db2b2-85c0-475e-82de-7084c303dd6e","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"70bcc5eb-3a02-41ac-91cc-41ba3d880f0f","path":"sprites/SprDirt/SprDirt.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"2927489f-2411-43b5-afca-5e2419bb3538","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange":null, - "volume":1.0, - "xorigin":0, - "yorigin":0, - }, - "swatchColours":null, - "swfPrecision":2.525, - "textureGroupId":{ - "name":"Default", - "path":"texturegroups/Default", - }, - "type":0, - "VTile":false, - "width":1024, -} \ No newline at end of file diff --git a/BBMOD_GML/sprites/SprDirt/layers/70bcc5eb-3a02-41ac-91cc-41ba3d880f0f/0f6306e5-4cf1-4599-a7af-cdd206d67422.png b/BBMOD_GML/sprites/SprDirt/layers/70bcc5eb-3a02-41ac-91cc-41ba3d880f0f/0f6306e5-4cf1-4599-a7af-cdd206d67422.png deleted file mode 100644 index 06f92765..00000000 Binary files a/BBMOD_GML/sprites/SprDirt/layers/70bcc5eb-3a02-41ac-91cc-41ba3d880f0f/0f6306e5-4cf1-4599-a7af-cdd206d67422.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprDirt/layers/7832f9a6-da46-41d3-92bb-2759c7ab7dac/0f6306e5-4cf1-4599-a7af-cdd206d67422.png b/BBMOD_GML/sprites/SprDirt/layers/7832f9a6-da46-41d3-92bb-2759c7ab7dac/0f6306e5-4cf1-4599-a7af-cdd206d67422.png deleted file mode 100644 index b94cbc39..00000000 Binary files a/BBMOD_GML/sprites/SprDirt/layers/7832f9a6-da46-41d3-92bb-2759c7ab7dac/0f6306e5-4cf1-4599-a7af-cdd206d67422.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprHeightmap/0ae2c012-592e-4548-9203-3763c1e64e34.png b/BBMOD_GML/sprites/SprHeightmap/0ae2c012-592e-4548-9203-3763c1e64e34.png deleted file mode 100644 index e6577652..00000000 Binary files a/BBMOD_GML/sprites/SprHeightmap/0ae2c012-592e-4548-9203-3763c1e64e34.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprHeightmap/SprHeightmap.yy b/BBMOD_GML/sprites/SprHeightmap/SprHeightmap.yy deleted file mode 100644 index a43928b7..00000000 --- a/BBMOD_GML/sprites/SprHeightmap/SprHeightmap.yy +++ /dev/null @@ -1,90 +0,0 @@ -{ - "$GMSprite":"", - "%Name":"SprHeightmap", - "bboxMode":0, - "bbox_bottom":511, - "bbox_left":0, - "bbox_right":511, - "bbox_top":0, - "collisionKind":1, - "collisionTolerance":0, - "DynamicTexturePage":false, - "edgeFiltering":false, - "For3D":false, - "frames":[ - {"$GMSpriteFrame":"","%Name":"0ae2c012-592e-4548-9203-3763c1e64e34","name":"0ae2c012-592e-4548-9203-3763c1e64e34","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - ], - "gridX":0, - "gridY":0, - "height":512, - "HTile":false, - "layers":[ - {"$GMImageLayer":"","%Name":"1c3fd94a-f426-443d-8808-7afba0fa8dae","blendMode":0,"displayName":"default","isLocked":false,"name":"1c3fd94a-f426-443d-8808-7afba0fa8dae","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, - ], - "name":"SprHeightmap", - "nineSlice":null, - "origin":0, - "parent":{ - "name":"Terrain", - "path":"folders/Demo/Sprites/Terrain.yy", - }, - "preMultiplyAlpha":false, - "resourceType":"GMSprite", - "resourceVersion":"2.0", - "sequence":{ - "$GMSequence":"", - "%Name":"SprHeightmap", - "autoRecord":true, - "backdropHeight":768, - "backdropImageOpacity":0.5, - "backdropImagePath":"", - "backdropWidth":1366, - "backdropXOffset":0.0, - "backdropYOffset":0.0, - "events":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "eventStubScript":null, - "eventToFunction":{}, - "length":1.0, - "lockOrigin":false, - "moments":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "name":"SprHeightmap", - "playback":1, - "playbackSpeed":30.0, - "playbackSpeedType":0, - "resourceType":"GMSequence", - "resourceVersion":"2.0", - "showBackdrop":true, - "showBackdropImage":false, - "timeUnits":1, - "tracks":[ - {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0ae2c012-592e-4548-9203-3763c1e64e34","path":"sprites/SprHeightmap/SprHeightmap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"28e9a5a1-0cc9-4836-984d-0a48908abce5","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange":null, - "volume":1.0, - "xorigin":0, - "yorigin":0, - }, - "swatchColours":null, - "swfPrecision":2.525, - "textureGroupId":{ - "name":"Default", - "path":"texturegroups/Default", - }, - "type":0, - "VTile":false, - "width":512, -} \ No newline at end of file diff --git a/BBMOD_GML/sprites/SprHeightmap/layers/0ae2c012-592e-4548-9203-3763c1e64e34/1c3fd94a-f426-443d-8808-7afba0fa8dae.png b/BBMOD_GML/sprites/SprHeightmap/layers/0ae2c012-592e-4548-9203-3763c1e64e34/1c3fd94a-f426-443d-8808-7afba0fa8dae.png deleted file mode 100644 index e2cae589..00000000 Binary files a/BBMOD_GML/sprites/SprHeightmap/layers/0ae2c012-592e-4548-9203-3763c1e64e34/1c3fd94a-f426-443d-8808-7afba0fa8dae.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprPlayer/2cff67e1-9e43-494d-83ee-2be03c37c9d0.png b/BBMOD_GML/sprites/SprPlayer/2cff67e1-9e43-494d-83ee-2be03c37c9d0.png deleted file mode 100644 index c3a15a9c..00000000 Binary files a/BBMOD_GML/sprites/SprPlayer/2cff67e1-9e43-494d-83ee-2be03c37c9d0.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprPlayer/SprPlayer.yy b/BBMOD_GML/sprites/SprPlayer/SprPlayer.yy deleted file mode 100644 index 65b6e3b4..00000000 --- a/BBMOD_GML/sprites/SprPlayer/SprPlayer.yy +++ /dev/null @@ -1,94 +0,0 @@ -{ - "$GMSprite":"", - "%Name":"SprPlayer", - "bboxMode":0, - "bbox_bottom":1023, - "bbox_left":0, - "bbox_right":1023, - "bbox_top":0, - "collisionKind":1, - "collisionTolerance":0, - "DynamicTexturePage":false, - "edgeFiltering":false, - "For3D":true, - "frames":[ - {"$GMSpriteFrame":"","%Name":"2cff67e1-9e43-494d-83ee-2be03c37c9d0","name":"2cff67e1-9e43-494d-83ee-2be03c37c9d0","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"cc225a53-5ecd-473d-b955-d0d280608d24","name":"cc225a53-5ecd-473d-b955-d0d280608d24","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - ], - "gridX":0, - "gridY":0, - "height":1024, - "HTile":false, - "layers":[ - {"$GMImageLayer":"","%Name":"d133c376-e8c9-4324-ae1e-4e8f28bdf9c4","blendMode":0,"displayName":"default","isLocked":false,"name":"d133c376-e8c9-4324-ae1e-4e8f28bdf9c4","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, - ], - "name":"SprPlayer", - "nineSlice":null, - "origin":0, - "parent":{ - "name":"Sprites", - "path":"folders/Demo/Sprites.yy", - }, - "preMultiplyAlpha":false, - "resourceType":"GMSprite", - "resourceVersion":"2.0", - "sequence":{ - "$GMSequence":"", - "%Name":"SprPlayer", - "autoRecord":true, - "backdropHeight":768, - "backdropImageOpacity":0.5, - "backdropImagePath":"", - "backdropWidth":1366, - "backdropXOffset":0.0, - "backdropYOffset":0.0, - "events":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "eventStubScript":null, - "eventToFunction":{}, - "length":2.0, - "lockOrigin":false, - "moments":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "name":"SprPlayer", - "playback":1, - "playbackSpeed":30.0, - "playbackSpeedType":0, - "resourceType":"GMSequence", - "resourceVersion":"2.0", - "showBackdrop":true, - "showBackdropImage":false, - "timeUnits":1, - "tracks":[ - {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"2cff67e1-9e43-494d-83ee-2be03c37c9d0","path":"sprites/SprPlayer/SprPlayer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"5f8d9952-7dde-4d28-ae52-98e589d3755d","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"cc225a53-5ecd-473d-b955-d0d280608d24","path":"sprites/SprPlayer/SprPlayer.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"04871986-ea12-457f-9035-5ed59ec1da22","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange":null, - "volume":1.0, - "xorigin":0, - "yorigin":0, - }, - "swatchColours":null, - "swfPrecision":2.525, - "textureGroupId":{ - "name":"Default", - "path":"texturegroups/Default", - }, - "type":0, - "VTile":false, - "width":1024, -} \ No newline at end of file diff --git a/BBMOD_GML/sprites/SprPlayer/cc225a53-5ecd-473d-b955-d0d280608d24.png b/BBMOD_GML/sprites/SprPlayer/cc225a53-5ecd-473d-b955-d0d280608d24.png deleted file mode 100644 index 1aa409cf..00000000 Binary files a/BBMOD_GML/sprites/SprPlayer/cc225a53-5ecd-473d-b955-d0d280608d24.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprPlayer/layers/2cff67e1-9e43-494d-83ee-2be03c37c9d0/d133c376-e8c9-4324-ae1e-4e8f28bdf9c4.png b/BBMOD_GML/sprites/SprPlayer/layers/2cff67e1-9e43-494d-83ee-2be03c37c9d0/d133c376-e8c9-4324-ae1e-4e8f28bdf9c4.png deleted file mode 100644 index c3a15a9c..00000000 Binary files a/BBMOD_GML/sprites/SprPlayer/layers/2cff67e1-9e43-494d-83ee-2be03c37c9d0/d133c376-e8c9-4324-ae1e-4e8f28bdf9c4.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprPlayer/layers/cc225a53-5ecd-473d-b955-d0d280608d24/d133c376-e8c9-4324-ae1e-4e8f28bdf9c4.png b/BBMOD_GML/sprites/SprPlayer/layers/cc225a53-5ecd-473d-b955-d0d280608d24/d133c376-e8c9-4324-ae1e-4e8f28bdf9c4.png deleted file mode 100644 index c9403bec..00000000 Binary files a/BBMOD_GML/sprites/SprPlayer/layers/cc225a53-5ecd-473d-b955-d0d280608d24/d133c376-e8c9-4324-ae1e-4e8f28bdf9c4.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprSand/7f20920c-2e3a-4a24-a7f7-5e9e380f40dc.png b/BBMOD_GML/sprites/SprSand/7f20920c-2e3a-4a24-a7f7-5e9e380f40dc.png deleted file mode 100644 index a5e0abe1..00000000 Binary files a/BBMOD_GML/sprites/SprSand/7f20920c-2e3a-4a24-a7f7-5e9e380f40dc.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprSand/SprSand.yy b/BBMOD_GML/sprites/SprSand/SprSand.yy deleted file mode 100644 index befeae81..00000000 --- a/BBMOD_GML/sprites/SprSand/SprSand.yy +++ /dev/null @@ -1,94 +0,0 @@ -{ - "$GMSprite":"", - "%Name":"SprSand", - "bboxMode":0, - "bbox_bottom":1023, - "bbox_left":0, - "bbox_right":1023, - "bbox_top":0, - "collisionKind":1, - "collisionTolerance":0, - "DynamicTexturePage":false, - "edgeFiltering":false, - "For3D":true, - "frames":[ - {"$GMSpriteFrame":"","%Name":"7f20920c-2e3a-4a24-a7f7-5e9e380f40dc","name":"7f20920c-2e3a-4a24-a7f7-5e9e380f40dc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"de268c0f-9c6c-4b8c-86a6-b47048d92627","name":"de268c0f-9c6c-4b8c-86a6-b47048d92627","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - ], - "gridX":0, - "gridY":0, - "height":1024, - "HTile":false, - "layers":[ - {"$GMImageLayer":"","%Name":"6082c6bb-4cd9-4aa4-a0fb-366b9fc9934c","blendMode":0,"displayName":"default","isLocked":false,"name":"6082c6bb-4cd9-4aa4-a0fb-366b9fc9934c","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, - ], - "name":"SprSand", - "nineSlice":null, - "origin":0, - "parent":{ - "name":"Terrain", - "path":"folders/Demo/Sprites/Terrain.yy", - }, - "preMultiplyAlpha":false, - "resourceType":"GMSprite", - "resourceVersion":"2.0", - "sequence":{ - "$GMSequence":"", - "%Name":"SprSand", - "autoRecord":true, - "backdropHeight":768, - "backdropImageOpacity":0.5, - "backdropImagePath":"", - "backdropWidth":1366, - "backdropXOffset":0.0, - "backdropYOffset":0.0, - "events":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "eventStubScript":null, - "eventToFunction":{}, - "length":2.0, - "lockOrigin":false, - "moments":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "name":"SprSand", - "playback":1, - "playbackSpeed":30.0, - "playbackSpeedType":0, - "resourceType":"GMSequence", - "resourceVersion":"2.0", - "showBackdrop":true, - "showBackdropImage":false, - "timeUnits":1, - "tracks":[ - {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"7f20920c-2e3a-4a24-a7f7-5e9e380f40dc","path":"sprites/SprSand/SprSand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"adf59eb0-bc5a-4e21-ba44-24b970387b53","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"de268c0f-9c6c-4b8c-86a6-b47048d92627","path":"sprites/SprSand/SprSand.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"e4652d02-539b-4ba2-a843-e80811834ef5","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange":null, - "volume":1.0, - "xorigin":0, - "yorigin":0, - }, - "swatchColours":null, - "swfPrecision":2.525, - "textureGroupId":{ - "name":"Default", - "path":"texturegroups/Default", - }, - "type":0, - "VTile":false, - "width":1024, -} \ No newline at end of file diff --git a/BBMOD_GML/sprites/SprSand/de268c0f-9c6c-4b8c-86a6-b47048d92627.png b/BBMOD_GML/sprites/SprSand/de268c0f-9c6c-4b8c-86a6-b47048d92627.png deleted file mode 100644 index e94ff8b9..00000000 Binary files a/BBMOD_GML/sprites/SprSand/de268c0f-9c6c-4b8c-86a6-b47048d92627.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprSand/layers/7f20920c-2e3a-4a24-a7f7-5e9e380f40dc/6082c6bb-4cd9-4aa4-a0fb-366b9fc9934c.png b/BBMOD_GML/sprites/SprSand/layers/7f20920c-2e3a-4a24-a7f7-5e9e380f40dc/6082c6bb-4cd9-4aa4-a0fb-366b9fc9934c.png deleted file mode 100644 index a5e0abe1..00000000 Binary files a/BBMOD_GML/sprites/SprSand/layers/7f20920c-2e3a-4a24-a7f7-5e9e380f40dc/6082c6bb-4cd9-4aa4-a0fb-366b9fc9934c.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprSand/layers/de268c0f-9c6c-4b8c-86a6-b47048d92627/6082c6bb-4cd9-4aa4-a0fb-366b9fc9934c.png b/BBMOD_GML/sprites/SprSand/layers/de268c0f-9c6c-4b8c-86a6-b47048d92627/6082c6bb-4cd9-4aa4-a0fb-366b9fc9934c.png deleted file mode 100644 index ecbf903e..00000000 Binary files a/BBMOD_GML/sprites/SprSand/layers/de268c0f-9c6c-4b8c-86a6-b47048d92627/6082c6bb-4cd9-4aa4-a0fb-366b9fc9934c.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprSplatmap/SprSplatmap.yy b/BBMOD_GML/sprites/SprSplatmap/SprSplatmap.yy deleted file mode 100644 index 138ec831..00000000 --- a/BBMOD_GML/sprites/SprSplatmap/SprSplatmap.yy +++ /dev/null @@ -1,90 +0,0 @@ -{ - "$GMSprite":"", - "%Name":"SprSplatmap", - "bboxMode":0, - "bbox_bottom":511, - "bbox_left":0, - "bbox_right":511, - "bbox_top":0, - "collisionKind":1, - "collisionTolerance":0, - "DynamicTexturePage":false, - "edgeFiltering":false, - "For3D":true, - "frames":[ - {"$GMSpriteFrame":"","%Name":"a41fbc4d-2ecc-493c-baa6-1ccdb84e3ccc","name":"a41fbc4d-2ecc-493c-baa6-1ccdb84e3ccc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - ], - "gridX":0, - "gridY":0, - "height":512, - "HTile":false, - "layers":[ - {"$GMImageLayer":"","%Name":"a674a1e6-4f13-4a66-8f4b-df15dee586fa","blendMode":0,"displayName":"default","isLocked":false,"name":"a674a1e6-4f13-4a66-8f4b-df15dee586fa","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, - ], - "name":"SprSplatmap", - "nineSlice":null, - "origin":0, - "parent":{ - "name":"Terrain", - "path":"folders/Demo/Sprites/Terrain.yy", - }, - "preMultiplyAlpha":false, - "resourceType":"GMSprite", - "resourceVersion":"2.0", - "sequence":{ - "$GMSequence":"", - "%Name":"SprSplatmap", - "autoRecord":true, - "backdropHeight":768, - "backdropImageOpacity":0.5, - "backdropImagePath":"", - "backdropWidth":1366, - "backdropXOffset":0.0, - "backdropYOffset":0.0, - "events":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "eventStubScript":null, - "eventToFunction":{}, - "length":1.0, - "lockOrigin":false, - "moments":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "name":"SprSplatmap", - "playback":1, - "playbackSpeed":30.0, - "playbackSpeedType":0, - "resourceType":"GMSequence", - "resourceVersion":"2.0", - "showBackdrop":true, - "showBackdropImage":false, - "timeUnits":1, - "tracks":[ - {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"a41fbc4d-2ecc-493c-baa6-1ccdb84e3ccc","path":"sprites/SprSplatmap/SprSplatmap.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"19356f88-fc72-4345-b70f-3bff34f6db3c","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange":null, - "volume":1.0, - "xorigin":0, - "yorigin":0, - }, - "swatchColours":null, - "swfPrecision":2.525, - "textureGroupId":{ - "name":"Default", - "path":"texturegroups/Default", - }, - "type":0, - "VTile":false, - "width":512, -} \ No newline at end of file diff --git a/BBMOD_GML/sprites/SprSplatmap/a41fbc4d-2ecc-493c-baa6-1ccdb84e3ccc.png b/BBMOD_GML/sprites/SprSplatmap/a41fbc4d-2ecc-493c-baa6-1ccdb84e3ccc.png deleted file mode 100644 index 717914a6..00000000 Binary files a/BBMOD_GML/sprites/SprSplatmap/a41fbc4d-2ecc-493c-baa6-1ccdb84e3ccc.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprSplatmap/layers/a41fbc4d-2ecc-493c-baa6-1ccdb84e3ccc/a674a1e6-4f13-4a66-8f4b-df15dee586fa.png b/BBMOD_GML/sprites/SprSplatmap/layers/a41fbc4d-2ecc-493c-baa6-1ccdb84e3ccc/a674a1e6-4f13-4a66-8f4b-df15dee586fa.png deleted file mode 100644 index 717914a6..00000000 Binary files a/BBMOD_GML/sprites/SprSplatmap/layers/a41fbc4d-2ecc-493c-baa6-1ccdb84e3ccc/a674a1e6-4f13-4a66-8f4b-df15dee586fa.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprZombie/0b54b5e6-f9a7-496e-8b38-8ba328d52bfc.png b/BBMOD_GML/sprites/SprZombie/0b54b5e6-f9a7-496e-8b38-8ba328d52bfc.png deleted file mode 100644 index cfa7243a..00000000 Binary files a/BBMOD_GML/sprites/SprZombie/0b54b5e6-f9a7-496e-8b38-8ba328d52bfc.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprZombie/1d1d27db-57cb-4fc9-ad3f-a6e0d9a1f7c3.png b/BBMOD_GML/sprites/SprZombie/1d1d27db-57cb-4fc9-ad3f-a6e0d9a1f7c3.png deleted file mode 100644 index 7728cf0f..00000000 Binary files a/BBMOD_GML/sprites/SprZombie/1d1d27db-57cb-4fc9-ad3f-a6e0d9a1f7c3.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprZombie/SprZombie.yy b/BBMOD_GML/sprites/SprZombie/SprZombie.yy deleted file mode 100644 index 8a93aad5..00000000 --- a/BBMOD_GML/sprites/SprZombie/SprZombie.yy +++ /dev/null @@ -1,94 +0,0 @@ -{ - "$GMSprite":"", - "%Name":"SprZombie", - "bboxMode":0, - "bbox_bottom":1023, - "bbox_left":0, - "bbox_right":1023, - "bbox_top":0, - "collisionKind":1, - "collisionTolerance":0, - "DynamicTexturePage":false, - "edgeFiltering":false, - "For3D":true, - "frames":[ - {"$GMSpriteFrame":"","%Name":"0b54b5e6-f9a7-496e-8b38-8ba328d52bfc","name":"0b54b5e6-f9a7-496e-8b38-8ba328d52bfc","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"1d1d27db-57cb-4fc9-ad3f-a6e0d9a1f7c3","name":"1d1d27db-57cb-4fc9-ad3f-a6e0d9a1f7c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - ], - "gridX":0, - "gridY":0, - "height":1024, - "HTile":false, - "layers":[ - {"$GMImageLayer":"","%Name":"1ccc60df-b00d-4d4e-b737-2e39d9c75f59","blendMode":0,"displayName":"default","isLocked":false,"name":"1ccc60df-b00d-4d4e-b737-2e39d9c75f59","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, - ], - "name":"SprZombie", - "nineSlice":null, - "origin":0, - "parent":{ - "name":"Sprites", - "path":"folders/Demo/Sprites.yy", - }, - "preMultiplyAlpha":false, - "resourceType":"GMSprite", - "resourceVersion":"2.0", - "sequence":{ - "$GMSequence":"", - "%Name":"SprZombie", - "autoRecord":true, - "backdropHeight":768, - "backdropImageOpacity":0.5, - "backdropImagePath":"", - "backdropWidth":1366, - "backdropXOffset":0.0, - "backdropYOffset":0.0, - "events":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "eventStubScript":null, - "eventToFunction":{}, - "length":2.0, - "lockOrigin":false, - "moments":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "name":"SprZombie", - "playback":1, - "playbackSpeed":30.0, - "playbackSpeedType":0, - "resourceType":"GMSequence", - "resourceVersion":"2.0", - "showBackdrop":true, - "showBackdropImage":false, - "timeUnits":1, - "tracks":[ - {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"0b54b5e6-f9a7-496e-8b38-8ba328d52bfc","path":"sprites/SprZombie/SprZombie.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"cec3ff7a-607a-4bcf-a732-014462343726","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"1d1d27db-57cb-4fc9-ad3f-a6e0d9a1f7c3","path":"sprites/SprZombie/SprZombie.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"3516ee53-ec7d-4d5e-a3c3-c7665aae044c","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange":null, - "volume":1.0, - "xorigin":0, - "yorigin":0, - }, - "swatchColours":null, - "swfPrecision":2.525, - "textureGroupId":{ - "name":"Default", - "path":"texturegroups/Default", - }, - "type":0, - "VTile":false, - "width":1024, -} \ No newline at end of file diff --git a/BBMOD_GML/sprites/SprZombie/layers/0b54b5e6-f9a7-496e-8b38-8ba328d52bfc/1ccc60df-b00d-4d4e-b737-2e39d9c75f59.png b/BBMOD_GML/sprites/SprZombie/layers/0b54b5e6-f9a7-496e-8b38-8ba328d52bfc/1ccc60df-b00d-4d4e-b737-2e39d9c75f59.png deleted file mode 100644 index cfa7243a..00000000 Binary files a/BBMOD_GML/sprites/SprZombie/layers/0b54b5e6-f9a7-496e-8b38-8ba328d52bfc/1ccc60df-b00d-4d4e-b737-2e39d9c75f59.png and /dev/null differ diff --git a/BBMOD_GML/sprites/SprZombie/layers/1d1d27db-57cb-4fc9-ad3f-a6e0d9a1f7c3/1ccc60df-b00d-4d4e-b737-2e39d9c75f59.png b/BBMOD_GML/sprites/SprZombie/layers/1d1d27db-57cb-4fc9-ad3f-a6e0d9a1f7c3/1ccc60df-b00d-4d4e-b737-2e39d9c75f59.png deleted file mode 100644 index fa1e654d..00000000 Binary files a/BBMOD_GML/sprites/SprZombie/layers/1d1d27db-57cb-4fc9-ad3f-a6e0d9a1f7c3/1ccc60df-b00d-4d4e-b737-2e39d9c75f59.png and /dev/null differ diff --git a/BBMOD_GML/sprites/sprdirtparticle/772bbeda-1005-4f7f-a938-a0f8f40e4fde.png b/BBMOD_GML/sprites/sprdirtparticle/772bbeda-1005-4f7f-a938-a0f8f40e4fde.png deleted file mode 100644 index d7737856..00000000 Binary files a/BBMOD_GML/sprites/sprdirtparticle/772bbeda-1005-4f7f-a938-a0f8f40e4fde.png and /dev/null differ diff --git a/BBMOD_GML/sprites/sprdirtparticle/96a0044e-3ed5-4b57-8ac7-35f32b7eb5c3.png b/BBMOD_GML/sprites/sprdirtparticle/96a0044e-3ed5-4b57-8ac7-35f32b7eb5c3.png deleted file mode 100644 index 8337a87e..00000000 Binary files a/BBMOD_GML/sprites/sprdirtparticle/96a0044e-3ed5-4b57-8ac7-35f32b7eb5c3.png and /dev/null differ diff --git a/BBMOD_GML/sprites/sprdirtparticle/SprDirtParticle.yy b/BBMOD_GML/sprites/sprdirtparticle/SprDirtParticle.yy deleted file mode 100644 index d9999073..00000000 --- a/BBMOD_GML/sprites/sprdirtparticle/SprDirtParticle.yy +++ /dev/null @@ -1,94 +0,0 @@ -{ - "$GMSprite":"", - "%Name":"SprDirtParticle", - "bboxMode":0, - "bbox_bottom":511, - "bbox_left":0, - "bbox_right":511, - "bbox_top":0, - "collisionKind":1, - "collisionTolerance":0, - "DynamicTexturePage":false, - "edgeFiltering":false, - "For3D":true, - "frames":[ - {"$GMSpriteFrame":"","%Name":"772bbeda-1005-4f7f-a938-a0f8f40e4fde","name":"772bbeda-1005-4f7f-a938-a0f8f40e4fde","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - {"$GMSpriteFrame":"","%Name":"96a0044e-3ed5-4b57-8ac7-35f32b7eb5c3","name":"96a0044e-3ed5-4b57-8ac7-35f32b7eb5c3","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - ], - "gridX":0, - "gridY":0, - "height":512, - "HTile":false, - "layers":[ - {"$GMImageLayer":"","%Name":"e005ac90-41e9-4a3d-b7b6-b12094be6deb","blendMode":0,"displayName":"default","isLocked":false,"name":"e005ac90-41e9-4a3d-b7b6-b12094be6deb","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, - ], - "name":"SprDirtParticle", - "nineSlice":null, - "origin":0, - "parent":{ - "name":"Sprites", - "path":"folders/Demo/Sprites.yy", - }, - "preMultiplyAlpha":false, - "resourceType":"GMSprite", - "resourceVersion":"2.0", - "sequence":{ - "$GMSequence":"", - "%Name":"SprDirtParticle", - "autoRecord":true, - "backdropHeight":768, - "backdropImageOpacity":0.5, - "backdropImagePath":"", - "backdropWidth":1366, - "backdropXOffset":0.0, - "backdropYOffset":0.0, - "events":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "eventStubScript":null, - "eventToFunction":{}, - "length":2.0, - "lockOrigin":false, - "moments":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "name":"SprDirtParticle", - "playback":1, - "playbackSpeed":30.0, - "playbackSpeedType":0, - "resourceType":"GMSequence", - "resourceVersion":"2.0", - "showBackdrop":true, - "showBackdropImage":false, - "timeUnits":1, - "tracks":[ - {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"772bbeda-1005-4f7f-a938-a0f8f40e4fde","path":"sprites/SprDirtParticle/SprDirtParticle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"abc0549a-8c68-4db5-9b3c-42ab65692a53","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"96a0044e-3ed5-4b57-8ac7-35f32b7eb5c3","path":"sprites/SprDirtParticle/SprDirtParticle.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"616e2759-bf27-481c-bf62-1c650f915009","IsCreationKey":false,"Key":1.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange":null, - "volume":1.0, - "xorigin":0, - "yorigin":0, - }, - "swatchColours":null, - "swfPrecision":2.525, - "textureGroupId":{ - "name":"Default", - "path":"texturegroups/Default", - }, - "type":0, - "VTile":false, - "width":512, -} \ No newline at end of file diff --git a/BBMOD_GML/sprites/sprdirtparticle/layers/772bbeda-1005-4f7f-a938-a0f8f40e4fde/e005ac90-41e9-4a3d-b7b6-b12094be6deb.png b/BBMOD_GML/sprites/sprdirtparticle/layers/772bbeda-1005-4f7f-a938-a0f8f40e4fde/e005ac90-41e9-4a3d-b7b6-b12094be6deb.png deleted file mode 100644 index d7737856..00000000 Binary files a/BBMOD_GML/sprites/sprdirtparticle/layers/772bbeda-1005-4f7f-a938-a0f8f40e4fde/e005ac90-41e9-4a3d-b7b6-b12094be6deb.png and /dev/null differ diff --git a/BBMOD_GML/sprites/sprdirtparticle/layers/96a0044e-3ed5-4b57-8ac7-35f32b7eb5c3/e005ac90-41e9-4a3d-b7b6-b12094be6deb.png b/BBMOD_GML/sprites/sprdirtparticle/layers/96a0044e-3ed5-4b57-8ac7-35f32b7eb5c3/e005ac90-41e9-4a3d-b7b6-b12094be6deb.png deleted file mode 100644 index b022d035..00000000 Binary files a/BBMOD_GML/sprites/sprdirtparticle/layers/96a0044e-3ed5-4b57-8ac7-35f32b7eb5c3/e005ac90-41e9-4a3d-b7b6-b12094be6deb.png and /dev/null differ diff --git a/BBMOD_GML/sprites/sprgunfire/002866d5-c1a4-4a7e-aa16-9092ac81deef.png b/BBMOD_GML/sprites/sprgunfire/002866d5-c1a4-4a7e-aa16-9092ac81deef.png deleted file mode 100644 index 51c589e2..00000000 Binary files a/BBMOD_GML/sprites/sprgunfire/002866d5-c1a4-4a7e-aa16-9092ac81deef.png and /dev/null differ diff --git a/BBMOD_GML/sprites/sprgunfire/SprGunfire.yy b/BBMOD_GML/sprites/sprgunfire/SprGunfire.yy deleted file mode 100644 index db0a3095..00000000 --- a/BBMOD_GML/sprites/sprgunfire/SprGunfire.yy +++ /dev/null @@ -1,90 +0,0 @@ -{ - "$GMSprite":"", - "%Name":"SprGunfire", - "bboxMode":0, - "bbox_bottom":511, - "bbox_left":0, - "bbox_right":511, - "bbox_top":0, - "collisionKind":1, - "collisionTolerance":0, - "DynamicTexturePage":false, - "edgeFiltering":false, - "For3D":true, - "frames":[ - {"$GMSpriteFrame":"","%Name":"002866d5-c1a4-4a7e-aa16-9092ac81deef","name":"002866d5-c1a4-4a7e-aa16-9092ac81deef","resourceType":"GMSpriteFrame","resourceVersion":"2.0",}, - ], - "gridX":0, - "gridY":0, - "height":512, - "HTile":false, - "layers":[ - {"$GMImageLayer":"","%Name":"be78a4b5-ecb9-4cdb-ac3c-609d7967931d","blendMode":0,"displayName":"default","isLocked":false,"name":"be78a4b5-ecb9-4cdb-ac3c-609d7967931d","opacity":100.0,"resourceType":"GMImageLayer","resourceVersion":"2.0","visible":true,}, - ], - "name":"SprGunfire", - "nineSlice":null, - "origin":0, - "parent":{ - "name":"Sprites", - "path":"folders/Demo/Sprites.yy", - }, - "preMultiplyAlpha":false, - "resourceType":"GMSprite", - "resourceVersion":"2.0", - "sequence":{ - "$GMSequence":"", - "%Name":"SprGunfire", - "autoRecord":true, - "backdropHeight":768, - "backdropImageOpacity":0.5, - "backdropImagePath":"", - "backdropWidth":1366, - "backdropXOffset":0.0, - "backdropYOffset":0.0, - "events":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "eventStubScript":null, - "eventToFunction":{}, - "length":1.0, - "lockOrigin":false, - "moments":{ - "$KeyframeStore":"", - "Keyframes":[], - "resourceType":"KeyframeStore", - "resourceVersion":"2.0", - }, - "name":"SprGunfire", - "playback":1, - "playbackSpeed":30.0, - "playbackSpeedType":0, - "resourceType":"GMSequence", - "resourceVersion":"2.0", - "showBackdrop":true, - "showBackdropImage":false, - "timeUnits":1, - "tracks":[ - {"$GMSpriteFramesTrack":"","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"$KeyframeStore":"","Keyframes":[ - {"$Keyframe":"","Channels":{ - "0":{"$SpriteFrameKeyframe":"","Id":{"name":"002866d5-c1a4-4a7e-aa16-9092ac81deef","path":"sprites/SprGunfire/SprGunfire.yy",},"resourceType":"SpriteFrameKeyframe","resourceVersion":"2.0",}, - },"Disabled":false,"id":"eed609ff-68f3-4002-9288-e7c5a4f9a1bd","IsCreationKey":false,"Key":0.0,"Length":1.0,"resourceType":"Keyframe","resourceVersion":"2.0","Stretch":false,}, - ],"resourceType":"KeyframeStore","resourceVersion":"2.0",},"modifiers":[],"name":"frames","resourceType":"GMSpriteFramesTrack","resourceVersion":"2.0","spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, - ], - "visibleRange":null, - "volume":1.0, - "xorigin":0, - "yorigin":0, - }, - "swatchColours":null, - "swfPrecision":2.525, - "textureGroupId":{ - "name":"Default", - "path":"texturegroups/Default", - }, - "type":0, - "VTile":false, - "width":512, -} \ No newline at end of file diff --git a/BBMOD_GML/sprites/sprgunfire/layers/002866d5-c1a4-4a7e-aa16-9092ac81deef/be78a4b5-ecb9-4cdb-ac3c-609d7967931d.png b/BBMOD_GML/sprites/sprgunfire/layers/002866d5-c1a4-4a7e-aa16-9092ac81deef/be78a4b5-ecb9-4cdb-ac3c-609d7967931d.png deleted file mode 100644 index 51c589e2..00000000 Binary files a/BBMOD_GML/sprites/sprgunfire/layers/002866d5-c1a4-4a7e-aa16-9092ac81deef/be78a4b5-ecb9-4cdb-ac3c-609d7967931d.png and /dev/null differ diff --git a/README.md b/README.md index 9f411b67..95a79b81 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,7 @@ # Table of Contents * [About](#about) -* [Tutorials, documentation and help](#tutorials-documentation-and-help) -* [Demo project](#demo-project) +* [Documentation, tutorials, samples and help](#documentation-tutorials-samples-and-help) * [Support the development](#support-the-development) * [Links](Links) * [Special thanks](#special-thanks) @@ -15,17 +14,8 @@ # About BBMOD is the most powerful 3D rendering solution for GameMaker! For more info, please see its official website https://blueburn.cz/bbmod/. -# Tutorials, documentation and help -Tutorials for BBMOD can be found on its homepage at https://blueburn.cz/bbmod/tutorials. An online documentation for the latest release of BBMOD is always available at https://blueburn.cz/bbmod/docs/3. If you need any additional help, you can join our [Discord server](https://discord.gg/ep2BGPm) or contact us on [GMC forums](https://forum.yoyogames.com/index.php?threads/60628). - -# Demo project -![Day](screenshots/Day.png) -![Night](screenshots/Night.png) -![Vignette and grayscale](screenshots/VignetteAndGrayscale.png) - -To help you get started, BBMOD comes with a little demo project for you to explore, modify and maybe turn into your first complete 3D game! You can play it right now in your browser at https://blueburn.cz/bbmod/demo. - -*Assets used in the demo project are created by [Kenney.nl](https://www.kenney.nl/) and [Poly Haven](https://polyhaven.com/).* +# Documentation, tutorials, samples and help +An online documentation for the latest release of BBMOD is always available at https://blueburn.cz/bbmod/docs/3. Tutorials for BBMOD can be found on its homepage at https://blueburn.cz/bbmod/tutorials and sample projects at https://blueburn.cz/bbmod/samples. If you need any additional help, you can join our [Discord server](https://discord.gg/ep2BGPm). # Support the development Support us in developing BBMOD, get priority assistance and more of our amazing tools as a reward! [Become our Patron](https://www.patreon.com/blueburn). @@ -41,10 +31,9 @@ Support us in developing BBMOD, get priority assistance and more of our amazing * [Discord](https://discord.gg/ep2BGPm) * [Documentation](https://blueburn.cz/bbmod/docs/3) * [Tutorials](https://blueburn.cz/bbmod/tutorials) -* [GameMaker Community](https://forum.yoyogames.com/index.php?threads/60628) +* [Samples](https://blueburn.cz/bbmod/samples) * [Official website](https://blueburn.cz/index.php?menu=bbmod) * [Patreon](https://www.patreon.com/blueburn) -* [Play demo](https://blueburn.cz/bbmod/demo) * [PushEd 2](https://blueburn.cz/index.php?menu=pushed2) * [YoYo Games Marketplace](https://marketplace.yoyogames.com/assets/10210/bbmod-3) @@ -52,5 +41,3 @@ Support us in developing BBMOD, get priority assistance and more of our amazing * To [Assimp](https://github.com/assimp/assimp) for making BBMOD CLI possible! * To [Bane-Me Please](https://vk.com/banemeplease) for extensive testing of BBMOD on Android devices. * To Gabor Szauer and their [Game Physics Cookbook](https://github.com/gszauer/GamePhysicsCookbook) for making the Raycasting module possible! -* To [Kenney.nl](https://www.kenney.nl/) for CC0 assets used in the demo project! -* To [Poly Haven](https://polyhaven.com/) for CC0 textures used in the demo project! diff --git a/screenshots/Day.png b/screenshots/Day.png deleted file mode 100644 index fd2a6641..00000000 Binary files a/screenshots/Day.png and /dev/null differ diff --git a/screenshots/Night.png b/screenshots/Night.png deleted file mode 100644 index c79ec601..00000000 Binary files a/screenshots/Night.png and /dev/null differ diff --git a/screenshots/VignetteAndGrayscale.png b/screenshots/VignetteAndGrayscale.png deleted file mode 100644 index ce9b7780..00000000 Binary files a/screenshots/VignetteAndGrayscale.png and /dev/null differ