Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
PROG2900 Bachelor 2023
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Nora Hansen
PROG2900 Bachelor 2023
Commits
b28f0481
Commit
b28f0481
authored
Feb 23, 2023
by
Nora Hansen
Browse files
Options
Downloads
Patches
Plain Diff
Set clearcolor to blue. Commented out some CSS lines that were not commented out properly
parent
f44b059a
No related branches found
No related tags found
1 merge request
!3
Zoom, design update
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
3Dklient.html
+4
-4
4 additions, 4 deletions
3Dklient.html
src/wxs.three.js
+7
-0
7 additions, 0 deletions
src/wxs.three.js
wxs.three.html
+3
-3
3 additions, 3 deletions
wxs.three.html
with
14 additions
and
7 deletions
3Dklient.html
+
4
−
4
View file @
b28f0481
...
...
@@ -29,16 +29,16 @@
#map
{
width
:
400px
;
height
:
400px
;
/
/
border
:
1px
solid
black
;
/
*
border: 1px solid black;
*/
position
:
fixed
;
right
:
-300px
;
bottom
:
-300px
;
opacity
:
0.2
;
z-index
:
99
;
transition
:
0.5s
;
/
/
box-shadow
:
5px
5px
5px
#888888
;
/
*
box-shadow: 5px 5px 5px #888888;
*/
box-shadow
:
0
4px
8px
0
rgba
(
0
,
0
,
0
,
0.2
),
0
6px
20px
0
rgba
(
0
,
0
,
0
,
0.19
);
/
/
box-shadow
:
-4px
-4px
4px
rgba
(
255
,
0
,
0
,
1
);
//Ekstra
utheving
av
minimert
kart
/
*
box-shadow: -4px -4px 4px rgba(255, 0, 0, 1);//Ekstra utheving av minimert kart
*/
}
#map
:hover
{
width
:
400px
;
...
...
@@ -48,7 +48,7 @@
bottom
:
15px
;
opacity
:
1
;
box-shadow
:
0
4px
8px
0
rgba
(
0
,
0
,
0
,
0.2
),
0
6px
20px
0
rgba
(
0
,
0
,
0
,
0.19
);
/
/
box-shadow
:
0
0
15px
12px
rgba
(
255
,
255
,
0
,
0.3
),
-2px
5px
5px
2px
rgba
(
9
,
9
,
9
,
0.5
);
/
*
box-shadow: 0 0 15px 12px rgba(255, 255, 0, 0.3), -2px 5px 5px 2px rgba(9, 9, 9, 0.5);
*/
}
#knapp
{
/*height: 20px;*/
...
...
This diff is collapsed.
Click to expand it.
src/wxs.three.js
+
7
−
0
View file @
b28f0481
...
...
@@ -91,6 +91,7 @@ var wxs3 = wxs3 || {};
);
this
.
renderer
.
setSize
(
this
.
dim
.
width
,
this
.
dim
.
height
);
this
.
renderer
.
setClearColor
(
0x68e5ff
,
1.0
);
// Set clear color to a light blue
};
ns
.
ThreeDMap
.
prototype
.
createScene
=
function
()
{
...
...
@@ -301,7 +302,13 @@ var wxs3 = wxs3 || {};
tileName
=
this
.
intersects
[
0
].
object
.
tileName
;
this
.
mainTileLoader
(
tileName
);
}
this
.
intersects
=
this
.
raycaster
.
intersectObjects
(
this
.
foregroundGroup
.
children
);
if
(
this
.
intersects
.
length
>
0
)
{
tileName
=
this
.
intersects
[
0
].
object
.
tileName
;
}
};
ns
.
ThreeDMap
.
prototype
.
mainTileLoader
=
function
(
tileName
)
{
var
neighbourCall
;
var
neighbourCalls
=
this
.
backGroundTileNeighbours
(
tileName
);
...
...
This diff is collapsed.
Click to expand it.
wxs.three.html
+
3
−
3
View file @
b28f0481
...
...
@@ -19,9 +19,9 @@
margin-bottom
:
2px
;
display
:
inline-block
;
background-color
:
lightblue
;
height
:
4
0px
;
width
:
8
0px
;
font-size
:
2
0px
;
height
:
5
0px
;
width
:
10
0px
;
font-size
:
3
0px
;
border-radius
:
5px
;
border
:
solid
2px
darkblue
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment