Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
ced0d8ad
Commit
ced0d8ad
authored
Apr 23, 2013
by
Maciej Suminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Modified shaders' source path.
parent
f24048e8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
drawpanel_gal.cpp
common/drawpanel_gal.cpp
+5
-2
opengl_gal.cpp
common/gal/opengl/opengl_gal.cpp
+1
-1
No files found.
common/drawpanel_gal.cpp
View file @
ced0d8ad
...
@@ -27,7 +27,8 @@
...
@@ -27,7 +27,8 @@
#include <wx/window.h>
#include <wx/window.h>
#include <wx/event.h>
#include <wx/event.h>
#include <wx/colour.h>
#include <wx/colour.h>
#include <wx/filefn.h>
#include <wx/stdpaths.h>
#include <wx/filename.h>
#include <class_drawpanel_gal.h>
#include <class_drawpanel_gal.h>
#include <view/view.h>
#include <view/view.h>
...
@@ -50,7 +51,9 @@ EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWin
...
@@ -50,7 +51,9 @@ EDA_DRAW_PANEL_GAL::EDA_DRAW_PANEL_GAL( wxWindow* aParentWindow, wxWindowID aWin
m_view
=
NULL
;
m_view
=
NULL
;
m_painter
=
NULL
;
m_painter
=
NULL
;
m_galShaderPath
=
std
::
string
(
::
wxGetCwd
().
mb_str
()
)
+
"/../../gal/opengl/shader/"
;
wxStandardPaths
paths
;
wxFileName
executableFile
(
paths
.
GetExecutablePath
()
);
m_galShaderPath
=
std
::
string
(
executableFile
.
GetPath
()
+
"/../../common/gal/opengl/shader/"
);
SwitchBackend
(
aGalType
,
false
);
SwitchBackend
(
aGalType
,
false
);
SetBackgroundStyle
(
wxBG_STYLE_CUSTOM
);
SetBackgroundStyle
(
wxBG_STYLE_CUSTOM
);
...
...
common/gal/opengl/opengl_gal.cpp
View file @
ced0d8ad
...
@@ -65,7 +65,7 @@ OPENGL_GAL::OPENGL_GAL( wxWindow* aParent, wxEvtHandler* aMouseListener,
...
@@ -65,7 +65,7 @@ OPENGL_GAL::OPENGL_GAL( wxWindow* aParent, wxEvtHandler* aMouseListener,
isUseShader
=
isUseShaders
;
isUseShader
=
isUseShaders
;
isShaderInitialized
=
false
;
isShaderInitialized
=
false
;
isGroupStarted
=
false
;
isGroupStarted
=
false
;
shaderPath
=
"../../
..
/gal/opengl/shader/"
;
shaderPath
=
"../../
common
/gal/opengl/shader/"
;
wxSize
parentSize
=
aParent
->
GetSize
();
wxSize
parentSize
=
aParent
->
GetSize
();
SetSize
(
parentSize
);
SetSize
(
parentSize
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment