11a2d81738
Made GAL backends settings more consistent. Fixed grid line width in the OpenGL backend.
2013-07-30 17:09:06 +02:00
bb4ea2db67
Merge removal of the shaderless OpenGL backend.
2013-07-30 14:05:32 +02:00
70a2321cc1
Fixed smudging in the Cairo backend.
2013-07-30 13:58:03 +02:00
2331742384
Removed shaderless OpenGL backend.
2013-07-29 16:38:07 +02:00
5a5616f258
Added initialization of variable, preventing unconditional jumps. Fixed typos in comments.
2013-07-29 14:12:27 +02:00
76660ff15b
Fixed high contrast mode in OpenGL. Split display settings loading into more appropriate places.
2013-07-25 18:04:15 +02:00
60471ecc1e
Added a layer compositor for the Cairo backend.
2013-07-25 14:40:04 +02:00
8c74dcde28
Fixed blending function for OpenGL compositing. Corrected documentation, removed unnecessary functions.
2013-07-24 15:06:59 +02:00
e644f5be05
OpenGL multitarget rendering (compositing).
2013-07-23 18:39:07 +02:00
d6628419c9
Changed rendering order of cached & noncached layers.
2013-07-22 13:14:53 +02:00
75eb5491d5
Code refactorization. VBO_CONTAINER is split to [NON]CACHED_MANAGER, GPU_MANAGER and VERTEX_MANAGER.
2013-07-22 10:41:12 +02:00
769bf51359
Headers containing shader program sources are generated using CMake.
2013-07-17 23:55:59 +02:00
c81c316a46
Refactorization of VBO_CONTAINER.
2013-07-17 18:49:38 +02:00
e5192ceddd
Fixed wrong memory freeing.
2013-07-17 14:16:37 +02:00
a4a6064316
Fixed stroked circles width issue with OpenGL shaders.
2013-07-17 10:21:29 +02:00
3cedadd738
Fixed OpenGL tracks transparency & netnames issue.
2013-07-16 15:44:08 +02:00
6dd9cb6fb8
1 pixel wide lines using OpenGL shaders.
2013-07-16 08:49:12 +02:00
6789755b06
Stroked lines in Cairo GAL are always drawn at least 1 pixel wide.
2013-07-16 08:48:21 +02:00
79a4f42ef9
Fixed multiline vertical strings drawing bug.
2013-07-09 10:00:23 +02:00
145ea35ac3
Fixed segmentation fault when there was no board loaded.
2013-07-05 15:48:45 +02:00
1399ed198c
Removed most of deprecated OpenGL calls. Items used to be drawn in immediate mode now are drawn using vertex arrays.
2013-07-05 14:01:33 +02:00
c2fb99ce49
Removed pointers where they were not necessary.
2013-07-05 09:31:04 +02:00
d8e45ef866
Fixed drawing circles and semicircles using display lists.
2013-07-04 16:27:27 +02:00
be415dab1d
Moved STROKE_FONT from PAINTER to GAL.
2013-07-04 11:37:43 +02:00
d0278dad15
Shaders can handle integer parameters (uniforms).
2013-07-03 13:08:43 +02:00
fc7b9029c9
Fixed stroked semicircles Z coordinate in shaderless OpenGL backend.
2013-07-02 18:11:57 +02:00
2061947138
Fixed stroke semicircles drawing using shaderless OpenGL backend.
2013-07-02 09:27:12 +02:00
f38935459b
Headers are regenerated only if shaders' source code was modified.
2013-07-01 15:47:44 +02:00
a6ce907a4f
Faster polylines drawing using OpenGL backend.
...
Fixed drawing of lines' caps.
2013-07-01 15:23:43 +02:00
f1dbfffd82
Removed different styles of line caps and line joins, leaving only round caps & joins.
...
Fixed drawing stroked semicircles using OpenGL backend.
2013-07-01 14:39:27 +02:00
a46d344db2
Mirrored text display bugfix.
2013-07-01 14:06:38 +02:00
5476a03799
Changed std::map to boost::unordered_map for storing memory chunks and groups information.
2013-07-01 13:20:48 +02:00
fa083142a7
Colors are stored as unsigned bytes instead of floats.
2013-06-30 22:45:31 +02:00
a1f81bbe97
Shaders are built-in instead of being loaded from external files.
2013-06-30 19:31:16 +02:00
e9669c6594
More debug information in case of failure compilation of shaders.
2013-06-30 15:37:46 +02:00
690e7144c1
Made shaders compatible with Intel GPUs.
2013-06-30 15:37:35 +02:00
95d5ab706a
VBO_CONTAINER: Changed new[]/delete[] pairs to realloc(), possibly reducing memory fragmentation and the container shrinking time.
2013-06-28 10:47:41 +02:00
009925724e
Minor code cleaning.
2013-06-27 17:31:10 +02:00
96116659be
Faster circles & semicircles drawing for the shaderless OpenGL backend. Removed unnecessary variables and computations.
2013-06-27 16:05:15 +02:00
1e7df3606a
Groups are stored in map instead of deque, so it allows easier adding & removing.
2013-06-27 11:54:49 +02:00
603029b106
High contrast mode with showing the selected layer on the top.
2013-06-26 16:31:52 +02:00
4ca54b2f1d
Small speed up for the color change function (OpenGL_GAL).
2013-06-26 10:43:58 +02:00
258b804941
Added possibility to change cached layer color (for the purpose of high contrast display).
2013-06-25 17:12:54 +02:00
dbb4e67737
Fixed warning about a not initialized variable.
2013-06-25 16:54:30 +02:00
cdab6cfdbe
Draw the origin marker in OpenGL with shaders GAL.
2013-06-24 16:02:18 +02:00
33b3d5edfb
Small improvements to SHADER class.
2013-06-24 15:40:31 +02:00
e1aa6f7e84
Grid settings apply to GAL based rendering.
2013-06-24 14:33:02 +02:00
9e937f8113
Added convertsion from wxColour to COLOR4D.
2013-06-24 10:32:08 +02:00
d114d9e386
Passing COLOR4D parameter using constant reference.
2013-06-24 10:21:34 +02:00
4e8d1366b6
Added conversion from EDA_COLOR_T to COLOR4D.
2013-06-24 10:12:36 +02:00
bf7d383066
Changed atan2() to VECTOR2D::Angle()
2013-06-21 09:01:40 +02:00
fdc52d933a
Fixed some minor rendering issues, mostyl for shaderless OpenGL GAL.
2013-06-20 16:37:21 +02:00
316f7309a1
Bug fixes:
...
- VBO_CONTAINER::allocate() was returning wrong value in case of error
- framelimiter had wrong formula for computing destined period between frames
- removed _padding field from VBO_VERTEX, as it was not speeding up, but wasting memory
2013-06-20 13:16:12 +02:00
585aeb7f91
Moved fields containing information about currently used color, shader and transformation for vertices from VBO_ITEM to VBO_CONTAINER (OPENGL_GAL).
2013-06-19 10:50:46 +02:00
c4e42f46a9
Removed unnecessary functions from VBO_VERTEX.
2013-06-18 17:53:12 +02:00
8a89e160ed
Added VBO_CONTAINER as a faster storage for vertices (OPENGL_GAL), tuned for exchanging data with GPU.
...
Removed a few unnecessary variables and fields from OPENGL_GAL.
Added function GAL::ClearCache() for freeing memory used by cached items.
Fixed a few memory leaks (tesselator, PAINTER's settings & VIEW_ITEM's groups).
Changed a few functions into inlines.
2013-06-18 16:20:29 +02:00
5c405a6f40
Removed some debug messages.
2013-06-06 11:54:37 +02:00
03b5d6125b
Removed indices storing from VBO_ITEM as they are always consecutive numbers. Removed storing pointers to VBO_ITEMs that have to be drawn - instead they are memcpied to mapped GPU memory.
...
Some functions of VBO_ITEM became inline.
2013-06-06 11:52:39 +02:00
7858e6aa7c
Changed data structure in VBO_ITEM.
2013-06-05 10:48:30 +02:00
85a2aee79c
Introducing shaders.
...
Shader's parameters are stored in VBO_ITEM. Changed VBO_ITEM data structure. Added UseShader() function for selecting shader for a given VBO_ITEM.
Added one main vertex & fragment shader program to be used for with all kinds of items (type of shader is selected using attributes that are stored in VBO). Currently available shaders are: at-least-1px-width line, filled circle and stroked circle.
Removed unnecessary param (aDepthOffset) from a few functions (OPENGL_GAL::drawSemiCircle(), OPENGL_GAL::drawLineCap()). Removed function OPENGL_GAL::DrawRoundedSegment(). Changed some asserts to debug info or error log.
2013-06-04 15:58:53 +02:00
2912138ef2
Display linking errors in debug mode for shaders. Added SHADER::GetAttribute() function for getting shaders attribute location.
2013-06-03 10:54:24 +02:00
31b722f9d3
Added tesselation of polygons for VBO based rendering (OpenGL GAL).
2013-05-27 09:37:49 +02:00
7dec942ef7
Different way of rendering groups (with a single DrawElements call) in OpenGL GAL.
2013-05-16 18:43:25 +02:00
b58cc107e6
Changed functions for adding vertices in VBO mode to make code easier to read and understand.
2013-05-16 14:47:34 +02:00
0177590699
Faster way of caching items for OPENGL GAL.
2013-05-16 10:35:16 +02:00
787fe28fd0
Added functionality for transformation of VBO vertices, extended functions like translate, rotate, scale using glm library. Removed D() macro, as it was not used, but in conflict with glm library. Added VBO_ITEMs for circles, semicircles. Now almost everything is drawn using VBO (besides polygons and grid).
2013-05-15 16:48:10 +02:00
5dd7ef6895
Assured that there are no excessive initializations
2013-05-15 16:47:01 +02:00
aec00ab96f
Removed double freeing of some of Cairo paths.
2013-05-14 10:42:56 +02:00
48b288cdc2
Modified SetOffset (VBO_ITEM/OpenGL GAL) function.
2013-05-14 10:41:05 +02:00
66d257f620
Drawing tracks using PushVertices, added some comments, fixed formatting.
2013-05-14 10:38:25 +02:00
918231795b
Added possibility of adding multiple vertices to VBO_ITEM at once
2013-05-13 11:14:35 +02:00
9f71172437
Fixed Cairo issues and some possible memory leaks
2013-05-13 10:55:35 +02:00
7b426e8103
Fixed memleak, removed excessive recaching, still there is a problem with Cairo caching
2013-05-10 16:05:40 +02:00
fb65f5d1ae
Improved recaching (all items when a board is loaded), still needs some fixing (mem leak).
2013-04-30 17:55:24 +02:00
56aabe20bc
Introduction of VBO. Now only tracks are rendered in a very simple way.
2013-04-30 15:59:32 +02:00
af8b256a00
Changed non-shader primitives to GL_TRIANGLES.
2013-04-25 18:30:53 +02:00
857b02706e
Fixed tracks drawing using Cairo backend with caching turned on.
2013-04-25 10:26:32 +02:00
1e0f1b39b0
Fixed color issue for stroked fonts with OpenGL backend and caching turned on.
2013-04-25 10:00:25 +02:00
b6ec124ceb
Removed BeginLayer and EndLayer functions. Resolved Cairo layers drawing problem in a different way.
2013-04-24 09:48:34 +02:00
d9b489d471
Changed view control settings to KiCad default (panning, zooming, etc.)
2013-04-23 12:07:14 +02:00
3289c6c305
Modified shaders' source path.
2013-04-23 09:52:51 +02:00
07545ba49c
Fixed wheel scroll event on Windows
2013-04-22 11:08:02 +02:00
55f7a99d1b
Cairo now renders layers properly (colors are not saturated after layer composition), but slower.
2013-04-19 18:19:50 +02:00
98addf78b4
Some cleanup.
2013-04-19 18:19:20 +02:00
ec9e283d34
Fixed resize issue (moved GAL panel into pane).
...
Tidied up event handlers.
2013-04-18 11:20:19 +02:00
f9e5881b45
Removed unnecessary calls to cairo drawing functions.
2013-04-17 12:50:38 +02:00
869505a659
Added const(..)& in GAL methods' parameters and change iterators to constant iterators.
2013-04-17 12:48:37 +02:00
895d265603
Added GAL::DrawSegment for drawing rounded segments (used for drawing tracks).
2013-04-17 12:38:00 +02:00
e5e60c6bed
Fixed drawing arcs in Cairo GAL.
2013-04-17 12:33:11 +02:00
cf01f1a264
Fixed drawing polygons using Cairo-based GAL.
2013-04-16 14:55:21 +02:00
698bc0cdac
Cleanup
2013-04-16 11:16:27 +02:00
48a7a863ae
Inverted Y display axis while using Cairo-based rendering backend.
2013-04-15 17:59:38 +02:00
0fef63956f
Fixed text display using Cairo.
2013-04-12 16:41:31 +02:00
63c2af4fa4
Tesselation error fix.
...
Added missing callback function (combine callback).
2013-04-12 10:37:06 +02:00
3ff7ddbea7
wxWidgets 2.8.12 build fix
2013-04-12 09:30:18 +02:00
ebbd7c48d3
Added multiline strings and text overbars rendering using GAL.
2013-04-11 14:21:59 +02:00
10d8275962
Fixed line style used for displaying texts.
2013-04-09 16:12:17 +02:00
157cbc2f68
Fixed drawing of circles in certain circumstances using OpenGL.
2013-04-09 16:12:16 +02:00
221cb6d5b2
Fixed bug of displaying stroked rectangles on wrong layer depth.
2013-04-05 15:10:58 +02:00
c20de314cc
Introduction of Graphics Abstraction Layer based rendering for pcbnew.
...
New classes:
- VIEW - represents view that is seen by user, takes care of layer ordering & visibility and how it is displayed (which location, how much zoomed, etc.)
- VIEW_ITEM - Base class for every item that can be displayed on VIEW (the biggest change is that now it may be necessary to override ViewBBox & ViewGetLayers method for derived classes).
- EDA_DRAW_PANEL_GAL - Inherits after EDA_DRAW_PANEL, displays VIEW output, right now it is not editable (in opposite to usual EDA_DRAW_PANEL).
- GAL/OPENGL_GAL/CAIRO_GAL - Base Graphics Abstraction Layer class + two different flavours (Cairo is not fully supported yet), that offers methods to draw primitives using different libraries.
- WX_VIEW_CONTROLS - Controller for VIEW, handles user events, allows zooming, panning, etc.
- PAINTER/PCB_PAINTER - Classes that uses GAL interface to draw items (as you may have already guessed - PCB_PAINTER is a class for drawing PCB specific object, PAINTER is an abstract class). Its methods are invoked by VIEW, when an item has to be drawn. To display a new type of item - you need to implement draw(ITEM_TYPE*) method that draws it using GAL methods.
- STROKE_FONT - Implements stroke font drawing using GAL methods.
Most important changes to Kicad original code:
* EDA_ITEM now inherits from VIEW_ITEM, which is a base class for all drawable objects.
* EDA_DRAW_FRAME contains both usual EDA_DRAW_PANEL and new EDA_DRAW_PANEL_GAL, that can be switched anytime.
* There are some new layers for displaying multilayer pads, vias & pads holes (these are not shown yet on the right sidebar in pcbnew)
* Display order of layers is different than in previous versions (if you are curious - you may check m_galLayerOrder@pcbnew/basepcbframe.cpp). Preserving usual order would result in not very natural display, such as showing silkscreen texts on the bottom.
* Introduced new hotkey (Alt+F12) and new menu option (View->Switch canvas) for switching canvas during runtime.
* Some of classes (mostly derived from BOARD_ITEM) now includes ViewBBox & ViewGetLayers methods.
* Removed tools/class_painter.h, as now it is extended and included in source code.
Build changes:
* GAL-based rendering option is turned on by a new compilation CMake option KICAD_GAL.
* When compiling with CMake option KICAD_GAL=ON, GLEW and Cairo libraries are required.
* GAL-related code is compiled into a static library (common/libgal).
* Build with KICAD_GAL=OFF should not need any new libraries and should come out as a standard version of Kicad
Currently most of items in pcbnew can be displayed using OpenGL (to be done are DIMENSIONS and MARKERS).
More details about GAL can be found in: http://www.ohwr.org/attachments/1884/view-spec.pdf
2013-04-02 08:54:03 +02:00
Maciej Suminski
unknown
Wayne Stambaugh