0
0
mirror of https://github.com/Doodle3D/doodle3d-client.git synced 2024-07-02 22:51:23 +02:00
Commit Graph

16 Commits

Author SHA1 Message Date
Adriaan Wormgoor
dd2ca8a1cb commit of current state of this branch. It's a work-in-progress (comitting because I need to change to other branch) 2013-09-27 18:15:33 +02:00
Adriaan Wormgoor
6e32a36e12 a lot of changes -> almost there but the drawing is not consistent yet across devices.
Drawing on the draw canvas is going OK but the preview is not drawing well now.
Giving up for now.
2013-09-18 19:08:58 +02:00
Adriaan Wormgoor
c51107a275 changes (sry) 2013-09-18 17:45:02 +02:00
Adriaan Wormgoor
aee5fecb88 Merge branch 'master' of https://github.com/Doodle3D/doodle3d-client into new_layouting_approach
# By Adriaan Wormgoor (6) and peteruithoven (4)
# Via Adriaan Wormgoor (2) and peteruithoven (2)
* 'master' of https://github.com/Doodle3D/doodle3d-client:
  objectHeight and twist fix and temp display fix
  minor repositioning of temp-guage so that it doesn't overlap with the info-button
  gcode generated twist now complies with the doodle preview
  made the 'ok' button have a mouseover 'hand' cursor
  commented out call to missing setPrintprogress()
  removed wrong unit in settings
  Removed unused draw logic
  additions to Thermometer to allow the general Update function to show() and hide() the Thermometer's container DIV
  new favicon (for Firefox)
  a few new favicons and homescreen icons

Conflicts:
	js/Thermometer.js
	js/gcodeGenerating_v01.js
2013-09-18 17:44:26 +02:00
Adriaan Wormgoor
5a45d1f3b5 minor repositioning of temp-guage so that it doesn't overlap with the info-button 2013-09-18 16:19:06 +02:00
Adriaan Wormgoor
066eb182f0 intermediary progress 2013-09-18 16:02:51 +02:00
Adriaan Wormgoor
bd83fc42f8 commented out part of the css (not final solution) 2013-09-18 12:04:53 +02:00
Adriaan Wormgoor
6eddb1835c first implementation of different layouting. Doesn't work well yet.. 2013-09-18 10:46:36 +02:00
Adriaan Wormgoor
95bedd09f1 Thermometer class plus the changes necessary to implement it 2013-09-17 13:08:52 +02:00
Adriaan Wormgoor
76946d724e minor css changes 2013-08-30 09:51:05 +02:00
Adriaan Wormgoor
69df58c054 Updated preview rendering. onMouseUp / onTouchEnd the preview is now cached to an Image() object (image/png) (via a proxy Canvas element (id='preview_tmp') and used to draw the preview. This allows for much faster move up/down and twist left/right behavior. 2013-08-21 17:37:20 +02:00
Adriaan Wormgoor
39157ab392 Added a div 'preview_tmp' as a precursor to a more efficient way of showing the doodle preview 2013-08-16 22:26:00 +02:00
Adriaan Wormgoor
f439592faf adjusted css and htmls 2013-07-28 02:46:32 +02:00
Adriaan Wormgoor
6990cf37ab lower text wasn't always showing (put it higher) and the text was iPad specific. It's generic now. 2013-07-27 18:19:50 +02:00
Adriaan Wormgoor
ceebebbb69 updated css 2013-07-26 23:54:21 +02:00
Adriaan Wormgoor
ae4e8e080b - interfaces scales vertically
- on tablets and smartphones it automatically fills the width
- doesn't *do* much yet
- drawing doesn't scale to the viewport of the draw area yet
- preview on the right doesn't either.
2013-07-05 19:23:28 +02:00