Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Dario Seyb
edge-of-space
Commits
dee8acff
Commit
dee8acff
authored
Jan 11, 2016
by
Dario Seyb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added normal calculation back in
parent
118bfc52
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
6 deletions
+10
-6
data/geometry_src/cockpit_applied.blend
data/geometry_src/cockpit_applied.blend
+0
-0
data/geometry_src/cockpit_applied.blend1
data/geometry_src/cockpit_applied.blend1
+0
-0
data/shader/DispMapping.gsh
data/shader/DispMapping.gsh
+7
-3
src/game/src/engine/scene/scenes/AtmosphereTestScene.cpp
src/game/src/engine/scene/scenes/AtmosphereTestScene.cpp
+3
-3
No files found.
data/geometry_src/cockpit_applied.blend
View file @
dee8acff
No preview for this file type
data/geometry_src/cockpit_applied.blend1
0 → 100644
View file @
dee8acff
File added
data/shader/DispMapping.gsh
View file @
dee8acff
...
...
@@ -18,15 +18,19 @@ out vec3 gTriDistance;
void main()
{
vec3 A = tPosition[2] - tPosition[0];
vec3 B = tPosition[1] - tPosition[0];
gNormal = -normalize(cross(A, B));
gPatchDistance = tPatchDistance[0];
gNormal = tNormal[0];
//
gNormal = tNormal[0];
gTexCoord = tTexCoord[0];
gPosition = tPosition[0];
gTriDistance = vec3(1, 0, 0);
gl_Position = gl_in[0].gl_Position; EmitVertex();
gNormal = tNormal[1];
//
gNormal = tNormal[1];
gTexCoord = tTexCoord[1];
gPosition = tPosition[1];
...
...
@@ -34,7 +38,7 @@ void main()
gTriDistance = vec3(0, 1, 0);
gl_Position = gl_in[1].gl_Position; EmitVertex();
gNormal = tNormal[2];
//
gNormal = tNormal[2];
gTexCoord = tTexCoord[2];
gPosition = tPosition[2];
...
...
src/game/src/engine/scene/scenes/AtmosphereTestScene.cpp
View file @
dee8acff
...
...
@@ -92,16 +92,16 @@ bool AtmosphereTestScene::startup() {
cockpitTransform
->
position
=
glm
::
dvec3
(
0
,
0
,
0
);
cockpitDrawable
->
renderPassIndex
=
1
;
cockpitDrawable
->
visible
=
true
;
auto
cockpitLight
=
cockpit
.
assign
<
Light
>
(
glm
::
vec4
(
1
,
1
,
1
,
0.
5
),
glm
::
vec3
(
1
,
0
,
0
),
false
,
LightType
::
POINT
,
1
);
auto
cockpitLight
=
cockpit
.
assign
<
Light
>
(
glm
::
vec4
(
1
,
1
,
1
,
0.
2
),
glm
::
vec3
(
1
,
0
,
0
),
false
,
LightType
::
POINT
,
1
);
auto
blinkButton
=
m_sceneGraph
->
create
();
blinkButton
.
assign
<
Light
>
(
glm
::
vec4
(
1
,
0.2
,
0.2
,
1
),
glm
::
vec3
(
1
,
0
,
0
),
false
,
LightType
::
POINT
,
1
);
blinkButton
.
assign
<
Light
>
(
glm
::
vec4
(
1
,
0.2
,
0.2
,
5
),
glm
::
vec3
(
1
,
0
,
0
),
false
,
LightType
::
POINT
,
1
);
auto
transform
=
blinkButton
.
assign
<
Transform
>
();
transform
->
parent
=
cockpitTransform
;
transform
->
position
=
{
0.7655
,
-
0.4545
,
-
1.643
};
blinkButton
=
m_sceneGraph
->
create
();
blinkButton
.
assign
<
Light
>
(
glm
::
vec4
(
0
,
0.2
,
1.0
,
1
),
glm
::
vec3
(
1
,
0
,
0
),
false
,
LightType
::
POINT
,
1
);
blinkButton
.
assign
<
Light
>
(
glm
::
vec4
(
0
,
0.2
,
1.0
,
5
),
glm
::
vec3
(
1
,
0
,
0
),
false
,
LightType
::
POINT
,
1
);
transform
=
blinkButton
.
assign
<
Transform
>
();
transform
->
parent
=
cockpitTransform
;
transform
->
position
=
{
-
0.7655
,
-
0.4545
,
-
1.643
};
...
...
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