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
E
edge-of-space
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
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
Dario Seyb
edge-of-space
Commits
c952dd04
Commit
c952dd04
authored
Feb 25, 2016
by
Dario Seyb
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
small fixes
parent
3deec03d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
data/shader/TerrainTransformFeedback.tcsh
data/shader/TerrainTransformFeedback.tcsh
+2
-2
src/game/src/engine/core/SettingsSystem.cpp
src/game/src/engine/core/SettingsSystem.cpp
+8
-8
No files found.
data/shader/TerrainTransformFeedback.tcsh
View file @
c952dd04
...
...
@@ -29,10 +29,10 @@ float getTessLevel(float d0, float d1){
if(avg >= 2000 * factor){
return 1;
}
if(avg >= 1
0
00 * factor){
if(avg >= 1
8
00 * factor){
return 2;
}
if(avg >=
7
00 * factor){
if(avg >=
10
00 * factor){
return 4;
}
if(avg >= 400 * factor){
...
...
src/game/src/engine/core/SettingsSystem.cpp
View file @
c952dd04
...
...
@@ -78,25 +78,25 @@ bool SettingsSystem::startup() {
const
picojson
::
object
&
planetObj
=
planetVal
.
get
<
picojson
::
object
>
();
PlanetMetaData
planet
;
planet
.
name
=
planetName
;
PlanetMetaData
planet
Data
;
planet
Data
.
name
=
planetName
;
for
(
auto
&
prop
:
planetObj
)
{
if
(
prop
.
first
==
"shaders"
)
{
VALIDATE_TYPE
(
prop
,
std
::
string
);
planet
.
shaders
=
prop
.
second
.
get
<
std
::
string
>
();
planet
Data
.
shaders
=
prop
.
second
.
get
<
std
::
string
>
();
}
else
if
(
prop
.
first
==
"atmosphere"
)
{
VALIDATE_TYPE
(
prop
,
bool
);
planet
.
hasAtmosphere
=
prop
.
second
.
get
<
bool
>
();
planet
Data
.
hasAtmosphere
=
prop
.
second
.
get
<
bool
>
();
}
else
if
(
prop
.
first
==
"water"
)
{
VALIDATE_TYPE
(
prop
,
bool
);
planet
.
hasWater
=
prop
.
second
.
get
<
bool
>
();
planet
Data
.
hasWater
=
prop
.
second
.
get
<
bool
>
();
}
else
if
(
prop
.
first
==
"moons"
)
{
VALIDATE_TYPE
(
prop
,
int64_t
);
planet
.
moonCount
=
prop
.
second
.
get
<
int64_t
>
();
planet
Data
.
moonCount
=
prop
.
second
.
get
<
int64_t
>
();
}
}
m_availablePlanets
.
push_back
(
planet
);
m_availablePlanets
.
push_back
(
planet
Data
);
}
}
else
if
(
i
.
first
==
"resolution"
)
{
VALIDATE_TYPE
(
i
,
picojson
::
array
);
...
...
@@ -140,4 +140,4 @@ bool SettingsSystem::startup() {
void
SettingsSystem
::
shutdown
()
{
}
\ No newline at end of file
}
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