Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
Type-Camera
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenFlipper-Free
Type-Camera
Compare Revisions
d1d385ecb57dd6fb2f8962ede88cfb5e8b04ea8e...d1132c64286e92c307876ed44eda6fd2b3070b29
Source
d1132c64286e92c307876ed44eda6fd2b3070b29
Select Git revision
...
Target
d1d385ecb57dd6fb2f8962ede88cfb5e8b04ea8e
Select Git revision
Compare
Commits (2)
use the shadergenerator for picking sahder
· 6d244e58
Martin Schultz
authored
May 04, 2018
6d244e58
Merge branch 'featurePickingShderGenerator' into 'master'
· d1132c64
Jan Möbius
authored
May 07, 2018
use the shadergenerator for picking sahder See merge request
!2
d1132c64
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
ObjectTypes/Camera/CameraNode.cc
ObjectTypes/Camera/CameraNode.cc
+4
-1
No files found.
ObjectTypes/Camera/CameraNode.cc
View file @
d1132c64
...
...
@@ -406,7 +406,10 @@ void CameraNode::pick(GLState& _state, PickTarget /*_target*/)
ibo_
.
bind
();
GLSL
::
Program
*
pickShader
=
ShaderCache
::
getInstance
()
->
getProgram
(
"Picking/vertex.glsl"
,
"Picking/single_color_fs.glsl"
);
static
ShaderGenDesc
desc
;
desc
.
vertexTemplateFile
=
"Picking/vertex.glsl"
;
desc
.
fragmentTemplateFile
=
"Picking/single_color_fs.glsl"
;
GLSL
::
Program
*
pickShader
=
ACG
::
ShaderCache
::
getInstance
()
->
getProgram
(
&
desc
,
nullptr
);
if
(
pickShader
&&
pickShader
->
isLinked
())
{
...
...