Commit graph

345 commits

Author SHA1 Message Date
juliandescottes
ab7d1b4a89 merged from master 2012-09-10 23:46:49 +02:00
juliandescottes
feadca9d1f Added clear method to pskl.model.Frame 2012-09-10 23:34:12 +02:00
juliandescottes
99e9cf8856 Fixed FilmPreview bugs. Simplified piskel.js, removed refernce to drawingController from tools 2012-09-10 23:34:11 +02:00
juliandescottes
e1af86b647 Fixed initialization bug + performance issue with jquery pub sub 2012-09-10 23:34:10 +02:00
juliandescottes
12c9fececb Removed 2 useless instance variables in AnimatedPreviewController 2012-09-10 23:34:09 +02:00
juliandescottes
68c2cae658 Cleaned FrameRenderer.js FrameRenderer should also keep a reference on the frame it is updating - initially I wanted the renderer to be frame independant, but it doesnt bring much 2012-09-10 23:34:08 +02:00
Patrick Brosset
873a10caa2 Fix the duplication in the overlay when grid toggl
When the grid was toggled, the overlay would actually
draw the main drawing frame instead of just redrawing
itself with transparent pixels.
This was due to the drawingcontroller passing the ref
to the same frame object when initialiwing both
renders.

By the way, the overlay should probably be treated a
bit differently as redrawing all its transprent pixels
in that case is useless.
2012-09-10 23:34:06 +02:00
juliandescottes
7b90873324 Fixed initialization bug + performance issue with jquery pub sub 2012-09-10 19:53:34 +02:00
juliandescottes
8982a5b479 Removed 2 useless instance variables in AnimatedPreviewController 2012-09-09 11:37:52 +02:00
Julian Descottes
9484837a32 Merge pull request #63 from juliandescottes/fix-overlayrendering
Cleaned FrameRenderer.js
2012-09-08 17:36:16 -07:00
juliandescottes
d18c3cd5f7 Cleaned FrameRenderer.js FrameRenderer should also keep a reference on the frame it is updating - initially I wanted the renderer to be frame independant, but it doesnt bring much 2012-09-09 02:34:54 +02:00
Julian Descottes
6708bf1ce1 Merge pull request #62 from captainbrosset/fix-grid-duplicate-frame
Fix grid duplicate frame
2012-09-08 17:19:07 -07:00
Patrick Brosset
2c1657f301 Merge branch 'master' of git://github.com/juliandescottes/piskel into fix-grid-duplicate-frame 2012-09-09 01:38:22 +02:00
Vincent
a423bf0e1c Merge pull request #61 from juliandescottes/add-renderingloop
Add renderingloop
2012-09-08 16:35:38 -07:00
Patrick Brosset
809fc8b688 Fix the duplication in the overlay when grid toggl
When the grid was toggled, the overlay would actually
draw the main drawing frame instead of just redrawing
itself with transparent pixels.
This was due to the drawingcontroller passing the ref
to the same frame object when initialiwing both
renders.

By the way, the overlay should probably be treated a
bit differently as redrawing all its transprent pixels
in that case is useless.
2012-09-09 01:35:29 +02:00
juliandescottes
63d8cd7eb7 Slight performance improvement, previewfilmcontroller still buggy 2012-09-09 01:12:54 +02:00
juliandescottes
2fa95fa1bc Added DrawingLoop.js and plugged basic rendering on each controller 2012-09-09 00:40:05 +02:00
juliandescottes
d799221c24 Ignoring stackdump files from git 2012-09-09 00:28:58 +02:00
Julian Descottes
069310677d Merge pull request #60 from captainbrosset/master
gitignoring subl project files
2012-09-08 15:26:40 -07:00
Patrick Brosset
ed177d92e6 Merge branch 'master' of git://github.com/juliandescottes/piskel 2012-09-09 00:09:35 +02:00
Patrick Brosset
0fe9ade870 added subl project artefacts to gitignore 2012-09-09 00:09:18 +02:00
Julian Descottes
0163221ac9 Merge pull request #59 from grosbouddha/add-grid-for-real
Add grid for real
2012-09-08 15:00:21 -07:00
juliandescottes
6e7545a1d2 Added drawing loop, unplugged traditional renderers 2012-09-08 23:59:44 +02:00
Vince
1a99fed64d pull/merge from master 2012-09-08 23:59:13 +02:00
Vince
f169a90644 Checkbox crappy styling and fixing overlayproxy grid 2012-09-08 23:53:59 +02:00
Vince
df945e10dd Add grid checkbox 2012-09-08 23:43:16 +02:00
juliandescottes
e4373ad133 Small updates to FrameRenderer for fun 2012-09-08 23:10:05 +02:00
Vince
6b9904935f Adding grid 2012-09-08 22:26:27 +02:00
Vince
82da78abf1 Adding grid 2012-09-08 22:26:17 +02:00
Vince
2cda69b000 Fixing remove and duplicate actions from previewfilm 2012-09-08 19:00:03 +02:00
Vince
6e8142bb3a Removing commented outdated code 2012-09-08 18:45:18 +02:00
Vince
9dc7afee61 Moving drawing canvas code from piskel.js to drawingController.js 2012-09-08 18:44:06 +02:00
juliandescottes
df405d917f Clone pixels pug 2012-09-08 18:15:53 +02:00
juliandescottes
869f3d2e00 fixed bug when resizing 2012-09-08 17:57:21 +02:00
juliandescottes
ed2e65508a fixed small bug during resize 2012-09-08 17:54:41 +02:00
juliandescottes
4fe72043ab Merge branch 'master' into gh-pages 2012-09-08 17:45:33 +02:00
juliandescottes
07369af9df Fixed bug on clonePixels_ need to stop commiting and pushing without testing ... 2012-09-08 17:44:55 +02:00
juliandescottes
e2960ecdfb Merge branch 'master' into gh-pages 2012-09-08 17:42:17 +02:00
juliandescottes
93e479fa11 Fixed bug with removed _clonePixels method in Frame.js 2012-09-08 17:41:09 +02:00
juliandescottes
914df75faa Merge branch 'master' into gh-pages 2012-09-08 17:35:36 +02:00
juliandescottes
506b54e27b removed commented code 2012-09-08 17:31:48 +02:00
juliandescottes
a9b01cd7c2 Resize is now bound to height and width, and also avoids overlap with preview 2012-09-08 17:31:19 +02:00
juliandescottes
6a822f1299 Merge branch 'master' of https://github.com/juliandescottes/piskel 2012-09-08 17:30:44 +02:00
Vincent
bcd8cf07e6 Merge pull request #57 from grosbouddha/fix-dnd-canvas
Fixing DnD when dragging from canvas elements
2012-09-08 07:58:24 -07:00
Vince
5f451e3cf8 Fixing DnD when dragging from canvas elements 2012-09-08 16:56:07 +02:00
juliandescottes
6bf1c773c8 Fixed undo/redo bug 2012-09-08 16:50:29 +02:00
Julian Descottes
c16eba0eb9 Merge pull request #56 from grosbouddha/add-grid-on-drawing-canvas
FrameRenderer refactoring + dynamic DPI
2012-09-08 07:48:04 -07:00
Vince
ba5500b4b0 Dynamic DPIs ! 2012-09-08 16:32:28 +02:00
juliandescottes
8202528f5a Merge branch 'master' into gh-pages 2012-09-08 16:27:42 +02:00
Vince
bca16a3964 Creating renderingOptions object for FrameRenderer
Contains dpi, grid info, etc
2012-09-08 15:34:13 +02:00