Commit graph

3981 commits

Author SHA1 Message Date
Pavle Goloskokovic
1cdebc80c3 Updating previousTime when picking and playing audio for sound 2018-01-12 16:00:37 +01:00
Pavle Goloskokovic
1180d82c27 Updating previousTime when starting sound with delayed playback 2018-01-12 15:59:40 +01:00
Pavle Goloskokovic
398b337da9 Resetting previousTime property when stopping sound or hijacking audio from another sound 2018-01-12 15:58:43 +01:00
Pavle Goloskokovic
de9e5a0d1f Updating currentTime to new audio currentTime value while handling looping before assigning that value to previousTime property 2018-01-12 15:57:55 +01:00
Pavle Goloskokovic
a51a0bd543 Setting previousTime property to currentTime value at the end of update method
Using condition when current time is less then previous time to indicate sound looping and dispatch an event
2018-01-12 15:39:58 +01:00
Pavle Goloskokovic
1ec66f644f Added previousTime property to keep track of audio tag's playback position recorded on previous update method call 2018-01-12 15:32:30 +01:00
Pavle Goloskokovic
9ec4d9a829 Fixing sound position if sound loops and starts from the beginning between two update calls 2018-01-12 15:30:11 +01:00
Pavle Goloskokovic
735cf10a3f Dispatching SOUND_ENDED event when sound ends, obviously :) 2018-01-12 15:28:06 +01:00
Pavle Goloskokovic
72955bfe30 Handling sound ending in update method 2018-01-12 15:27:25 +01:00
Pavle Goloskokovic
0d0df1900b Added logic for handling looping in update method 2018-01-12 15:23:39 +01:00
Pavle Goloskokovic
81d794b4c6 Setting audio to correct state when starting it since it might be playing already when hijacked form another sound 2018-01-12 15:18:31 +01:00
Richard Davey
d554d61319
Merge pull request #3158 from Flet/KeyComboMatchEvent-fix
set data to KeyCombo for KeyComboMatchEvent
2018-01-12 10:31:51 +00:00
yp
242471beb9 Renamed no longer existing Vector2/3 .sub and .len to .subtract and .length where still used 2018-01-12 02:18:36 +02:00
Dan Flettre
16b672e291 set data to KeyCombo for KeyComboMatchEvent 2018-01-11 18:14:45 -06:00
Michael Hadley
bab399a02e Made CollideHandler consistent by returning value from logic branches
Each branch should return true/false based on whether a collision happened
2018-01-11 14:13:42 -06:00
Michael Hadley
00cebf8eae CollideGroupVsTilemapLayer implementation 2018-01-11 14:03:34 -06:00
Pavle Goloskokovic
e68ff2b18a Saving current position of the sound and stopping and releasing audio tag when calling pause method 2018-01-11 18:55:42 +01:00
Pavle Goloskokovic
f6de613fd0 Added stopAndReleaseAudioTag method to stop sound playback and mark audio tag as unused and release it for other sounds to use 2018-01-11 18:53:54 +01:00
Pavle Goloskokovic
8578319171 requiring SoundEvent class 2018-01-11 18:51:02 +01:00
Pavle Goloskokovic
40b2bf79b7 Calling pickAndPlayAudioTag from resume method 2018-01-11 18:50:25 +01:00
Pavle Goloskokovic
9e7ccb1503 Added helpful flags comment 2018-01-11 18:49:44 +01:00
Pavle Goloskokovic
a6b4066468 Moved logic for setting up and playing audio tag so it can be reused 2018-01-11 18:45:34 +01:00
Pavle Goloskokovic
f9093a2d7e Disabling setting seek property on a delayed sound 2018-01-11 18:41:43 +01:00
Pavle Goloskokovic
81e8542af7 Resetting startTime property of a hijacked sound 2018-01-11 18:40:36 +01:00
Pavle Goloskokovic
fb29afedae Preventing resume calls on delayed sounds 2018-01-11 18:39:45 +01:00
Pavle Goloskokovic
c1b24c4adb Preventing pause calls on delayed sounds 2018-01-11 18:39:19 +01:00
Pavle Goloskokovic
fb6b989035 Handling delayed playback in update method 2018-01-11 18:31:36 +01:00
Pavle Goloskokovic
3388fd018f Setting startTime based on delay config when calling play method 2018-01-11 18:30:16 +01:00
Pavle Goloskokovic
d6256c47c5 Defined startTime property 2018-01-11 18:23:28 +01:00
Pavle Goloskokovic
82819ec782 Setting sound position, applying config and starting playback if delay is set to 0 when calling play method 2018-01-11 18:20:18 +01:00
Pavle Goloskokovic
11923621ad Finding available audio tag when calling play method and resetting and returning false if it was not successful 2018-01-11 18:17:50 +01:00
Pavle Goloskokovic
af8666f611 Added reset method that calls super stop method in order to reset sounds state
Calling reset method and setting audio to null after hijacking audio tag from another sound
2018-01-11 18:15:42 +01:00
Pavle Goloskokovic
106e32499f Sorting sounds to hijack audio from by loop and seek properties values 2018-01-11 18:12:52 +01:00
Pavle Goloskokovic
f377b4fa85 Finding another sound to hijack audio tag from if there are no free audio tags and override setting is set to true 2018-01-11 18:11:10 +01:00
Pavle Goloskokovic
fc19a05f0b Returning false if override setting of sound manager is set to false 2018-01-11 18:05:12 +01:00
Pavle Goloskokovic
935ef78102 Added method for finding unused audio tag for playing sound 2018-01-11 18:04:17 +01:00
Pavle Goloskokovic
6730b3b314 Defined seek property for HTML5AudioSound class 2018-01-11 18:00:42 +01:00
Pavle Goloskokovic
d6b11e2fdb Defined seek property's setter for HTML5AudioSound class 2018-01-11 17:59:36 +01:00
Pavle Goloskokovic
afb8075379 Defined seek property's setter for HTML5AudioSound class 2018-01-11 17:58:26 +01:00
Pavle Goloskokovic
110c6891dd Defined volume property for HTML5AudioSound class 2018-01-11 17:57:04 +01:00
Pavle Goloskokovic
8f9eafd315 Defined mute property for HTML5AudioSound class 2018-01-11 17:55:05 +01:00
Pavle Goloskokovic
495a79d4bf Implemented setRate method 2018-01-11 17:51:58 +01:00
Pavle Goloskokovic
91f9629ed2 Implemented setVolume method 2018-01-11 17:50:20 +01:00
Pavle Goloskokovic
162a063f03 Implemented setMute method 2018-01-11 17:49:40 +01:00
Pavle Goloskokovic
ede81f2a03 Added destroy method 2018-01-11 17:48:23 +01:00
Pavle Goloskokovic
0223019290 Added blank update method 2018-01-11 17:47:01 +01:00
Pavle Goloskokovic
d51156fe94 Added stop method implementation that calls super method and dispatches stop event 2018-01-11 17:45:02 +01:00
Pavle Goloskokovic
196258b8ac Added resume method implementation that calls super method and dispatches resume event 2018-01-11 17:43:56 +01:00
Pavle Goloskokovic
5e8d0dcaee Added pause method implementation that calls super method and dispatches pause event 2018-01-11 17:42:18 +01:00
Pavle Goloskokovic
d3c034e5cc Added play method implementation that calls super method and dispatches play event 2018-01-11 17:40:59 +01:00
Pavle Goloskokovic
b452859b78 Assigning duration and totalDuration values to audio tag duration 2018-01-11 17:38:47 +01:00
Pavle Goloskokovic
1d925105bd Audio property docs update 2018-01-11 17:37:28 +01:00
Pavle Goloskokovic
ad858d1475 Throwing an error if no sound with given key was loaded 2018-01-11 17:36:51 +01:00
Pavle Goloskokovic
cf83880fb0 Defined tags property that holds reference to audio tags array 2018-01-11 17:35:25 +01:00
Pavle Goloskokovic
b22116e1f8 Updated override property docs 2018-01-11 17:32:49 +01:00
Pavle Goloskokovic
2372fdd812 Completed a TODO to return HTML5AudioSoundManager instance when necessary 2018-01-11 17:29:57 +01:00
Pavle Goloskokovic
7c715f1ba0 Removed detune property since it is already implemented in BaseSound class 2018-01-11 17:28:52 +01:00
Pavle Goloskokovic
be713af155 Removed rate property since it is already implemented in BaseSound class 2018-01-11 17:28:25 +01:00
Pavle Goloskokovic
98700ffff2 Updating play method to return boolean indicating if play call was done successfully 2018-01-11 17:27:19 +01:00
Pavle Goloskokovic
15562a70e3 Updated override property docs 2018-01-11 17:25:55 +01:00
Pavle Goloskokovic
ef60c16551 Marking audio tags as unused when creating them 2018-01-11 17:25:27 +01:00
Pavle Goloskokovic
2903417798 Defining detune property on a BaseSound class since it's the shared behaviour between subclasses 2018-01-11 17:24:53 +01:00
Pavle Goloskokovic
15f2717e9b Defining rate property on a BaseSound class since it's the shared behaviour between subclasses 2018-01-11 17:24:26 +01:00
Pavle Goloskokovic
c0c6e39ccd Updating play method to return boolean indicating if play call was done successfully 2018-01-11 17:22:57 +01:00
Pavle Goloskokovic
5aec2e45e4 Merge remote-tracking branch 'origin/master' 2018-01-11 16:51:11 +01:00
Pavle Goloskokovic
e75871adec Added override property to HTML5AudioSoundManager 2018-01-11 16:50:50 +01:00
Richard Davey
829747370c Merge branch 'master' of https://github.com/photonstorm/phaser 2018-01-11 14:48:46 +00:00
Richard Davey
e601f4060a Exposed SoundManager via Scene Systems 2018-01-11 14:48:43 +00:00
Michael Hadley
5241798ab3 Pass TILE_BIAS from arcade world into tile colliding functions 2018-01-11 08:32:07 -06:00
Richard Davey
718859b02e Moved the depth sorting functions into the DisplayList class, as it's really the one responsible for it, not System. 2018-01-11 13:59:06 +00:00
Michael Hadley
98ae8009e0 Arcade rect vs tilemap layer collision handling 2018-01-10 20:47:25 -06:00
Michael Hadley
fdc1af0cd2 Install isTilemap prop used by physics system for fast type checking 2018-01-10 20:45:28 -06:00
Michael Hadley
32788d6eb6 Stub arcade collide vs tilemap methods 2018-01-10 20:43:11 -06:00
Michael Hadley
e3699aaea0 Remove unnecessary Arcade Body#tilePadding 2018-01-10 19:34:22 -06:00
Richard Davey
04b8f4203e Started moving plugins to their own folders. 2018-01-10 16:29:46 +00:00
Pavle Goloskokovic
9fc3aaa0da Moved HTML5AudioSoundManager.js 2018-01-10 16:50:21 +01:00
Pavle Goloskokovic
081908fd7b Moved HTML5AudioSound.js 2018-01-10 16:50:11 +01:00
Pavle Goloskokovic
0a10240c61 Moved HTML5AudioFile 2018-01-10 16:49:56 +01:00
Pavle Goloskokovic
d0d3a6473d Merge remote-tracking branch 'origin/master' 2018-01-10 16:20:13 +01:00
Richard Davey
4da410117f
Merge pull request #3152 from halgorithm/fix-normalize
Fix geom/point/Normalize.js
2018-01-10 13:25:25 +00:00
Hal Helms
89e4289c9d
Fix WeightedRandomize.js 2018-01-09 22:26:02 -08:00
Hal Helms
42ad0ac399
Add semicolons to WeightedRandomize 2018-01-09 22:24:56 -08:00
Hal Helms
302eba15d9
Update WeightedRandomize docs for index arrays 2018-01-09 22:09:28 -08:00
Hal Helms
e128733f02
Update WeightedRandomize() to support index arrays 2018-01-09 22:05:34 -08:00
Hal Helms
4fd10f437c
Fix geom/point/Normalize.js 2018-01-09 21:58:13 -08:00
Felipe Alfonso
15c45bda0e BlitterBatch2 base rendering. Still missing Texture binding 2018-01-09 19:51:22 -03:00
Richard Davey
d8f1ba03e9 Moved repository location 2018-01-09 21:43:56 +00:00
Richard Davey
0d90f75b5f Splitting the dev branch up into versions. 2016-11-22 01:36:56 +00:00
Richard Davey
7a155f66fe Added Tilemap back in and tested with Blitter object, and it works really fast. 2016-11-15 03:11:21 +00:00
Richard Davey
346fbc2cbd Blitter + Bob now rendering and updating fully. 2016-11-15 01:57:42 +00:00
Richard Davey
6866e8303a Added immediate option, to skip the Update Manager. 2016-11-15 01:57:29 +00:00
Richard Davey
e150efea1f Added Blitter Game Object, for fast drawing of texture frames, with single level transforms. 2016-11-14 23:38:41 +00:00
Richard Davey
67eb8753e8 Added default values. 2016-11-14 23:38:20 +00:00
Richard Davey
4d4344bf03 Arcade Physics updated to use new Transform system. 2016-11-11 02:20:31 +00:00
photonstorm
aac31f6858 FBOs are bound to parents. 2016-11-10 17:05:04 +00:00
photonstorm
e66c1514e0 Transforms update vertex data on parent changes. 2016-11-10 17:04:55 +00:00
photonstorm
49c57089b3 Quick test. 2016-11-10 17:04:37 +00:00
photonstorm
fa3905c8c7 Containers added themselves to States properly. 2016-11-10 17:04:29 +00:00
Richard Davey
d0eab7a4e7 Added Ellipse.circumferencePoint 2016-11-10 03:00:41 +00:00
Richard Davey
f621f4aa81 Added ref to State Manager. 2016-11-10 02:01:02 +00:00
Richard Davey
13d8f332f4 Drag events. 2016-11-10 00:53:29 +00:00
Richard Davey
fb8da7ac08 Fixed transform look-up. 2016-11-10 00:41:15 +00:00
Richard Davey
8d8ca49f5e Fixed UpdateManager call. 2016-11-10 00:10:48 +00:00
Richard Davey
89885dcb7c Refactored the Input Manager. 2016-11-10 00:10:39 +00:00
photonstorm
be13ededee Panic stations. 2016-11-09 15:33:47 +00:00
photonstorm
38868d6ecf Fixed Pixel Field. 2016-11-09 15:33:42 +00:00
photonstorm
519c121a52 Updated the way the State Config works. 2016-11-09 14:52:53 +00:00
photonstorm
9064727b41 Added performance.now polyfill. 2016-11-09 14:52:44 +00:00
photonstorm
c0a98c467f Removed the console debug. 2016-11-09 14:52:34 +00:00
photonstorm
0c14b261d5 Removed all the _old properties. 2016-11-09 14:52:23 +00:00
photonstorm
7a35f68ddc MainLoop rendering interpolation done. 2016-11-09 12:25:26 +00:00
Richard Davey
961997ac5c Debugging the loop. 2016-11-09 09:05:50 +00:00
Richard Davey
48f90fec34 Implemented a State based MainLoop system, with fully split logic / render cycles and frame rate. Each State can now set its own frame rate. Added in more Camera commands, moved the Tween Manager into the State Systems, and started work on the new heavily reduced Game object. 2016-11-08 01:50:57 +00:00
photonstorm
b3c2ddb420 Pre-crash salvage. 2016-11-07 17:05:14 +00:00
Richard Davey
c683ae2e1f Tidying up. 2016-11-07 01:01:09 +00:00
Richard Davey
d34a5062c0 New Frame Crop function. 2016-11-07 00:33:53 +00:00
Richard Davey
4b42972a9b Comment out some parts that don't work yet. 2016-11-07 00:33:42 +00:00
Richard Davey
2e4e4be68d Added Frame.clone. 2016-11-07 00:33:18 +00:00
Richard Davey
efebd79e30 Added State.pause. 2016-11-06 16:50:45 +00:00
Richard Davey
f2cb384da0 State indexing added. 2016-11-06 13:59:48 +00:00
Richard Davey
967bb6cc02 Don't move to active until init / preload / create is over. 2016-11-06 13:04:45 +00:00
Richard Davey
d568d2bede Moved _sys to a StateSystems class to keep things much cleaner, and avoid setter inheritance mess. 2016-11-06 12:18:08 +00:00
Richard Davey
21937a1106 States can once again be defined from pure functions now. 2016-11-04 06:25:07 +00:00
Richard Davey
89a737a620 State Manager holds all given states until booted before creating them. 2016-11-04 05:41:00 +00:00
Richard Davey
a5736f10e3 Phaser.State now takes a config object. Can be used to set managers, position, name, etc. 2016-11-04 04:12:18 +00:00
Richard Davey
c60eae4ee1 Fixed vert dimensions, texture still needs to be based on renderer size. 2016-11-04 04:11:47 +00:00
Richard Davey
f9745bbce3 States now own a Loader instance, rather than it being a Phaser global. 2016-11-04 03:21:04 +00:00
Richard Davey
893d35ea89 Multiple States now rendering together, with their own systems and managers :) 2016-11-04 03:09:48 +00:00
Richard Davey
2326b331f1 States now have their own FBO (under WebGL) which the renderer uses. 2016-11-04 02:24:49 +00:00
Richard Davey
a366ef8f3c New State Manager up and running. 2016-11-04 02:08:17 +00:00
Richard Davey
dd34e4033a Brand new State class. 2016-11-03 22:26:52 +00:00
Richard Davey
268e40ea7e Add to 'state' by default now. 2016-11-03 22:26:39 +00:00
Richard Davey
2dd7e68707 Extends the Factory. 2016-11-03 22:26:28 +00:00
Richard Davey
a15747203e Moved boot into Game, and added State property. 2016-11-03 22:26:16 +00:00
Richard Davey
89ece19c78 Disabled twirl. 2016-11-03 22:25:55 +00:00
Richard Davey
16e687cb2a Fixed issue with FBO leaving no bound texture on unit zero. 2016-11-03 21:50:14 +00:00
Richard Davey
181e08a1f9 Testing fix. 2016-11-03 21:32:06 +00:00
Richard Davey
8971d8eaf4 Updated comments 2016-11-03 21:13:48 +00:00
Richard Davey
b65a9bec42 Tidying up. 2016-11-03 21:10:53 +00:00
Richard Davey
e0c6a0c470 Using createEmptyTexture again. 2016-11-03 21:06:14 +00:00
photonstorm
57e12415cc Removing test code. 2016-11-03 17:25:14 +00:00
photonstorm
a86b02d55a Finally! Fixed the multi texture + FBO pipeline. 2016-11-03 17:19:16 +00:00
photonstorm
a3d9cf9b6d Tiny Batch! 2016-11-03 13:47:37 +00:00
Richard Davey
def3a93b5f Trying to debug fbo + multi-texture 'cannot draw to same texture' issue. 2016-11-03 05:10:50 +00:00
Richard Davey
106a55e642 Lots of tidying up. Renamed properties, removed loads of stuff no longer needed in the main class. 2016-11-03 04:22:07 +00:00
Richard Davey
8439cf0c15 Added QuadFBO class, which encapsulates the whole frame buffer + quad + shader flow. Exposed quad dimensions and position via setters, allowing you to place the FBO anywhere when it renders. 2016-11-03 04:04:34 +00:00
Richard Davey
6e70669e28 Added getVerticesFromRect so the fbo is calculated from pixel values. 2016-11-03 02:50:52 +00:00
Richard Davey
8603374316 More docs. 2016-11-03 02:07:15 +00:00
Richard Davey
0b070822d3 Updated the FBO quad to use a vec2 for position instead, cutting down on vert data a little. Also removed array length look-ups and hard coded values in. 2016-11-03 01:51:31 +00:00
Richard Davey
9600ed038d Updated destroy method. 2016-11-03 01:49:55 +00:00