Skip to content

Commit 0e98652

Browse files
ProcStackProcStack
committed
Cleaned & Split Style, Env Asset Updated
1 parent d00dfd7 commit 0e98652

25 files changed

+950
-705
lines changed

‎Build/pxlNav.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Build/pxlNavStyle.min.css‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Public/style/ProcStackStyle.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
@import 'gitPage_pxlNavStyle.css';
66
@import 'gitPage_reposStyle.css';
77
@import 'gitPage_projectsStyle.css';
8+
@import 'gitPage_aboutMeStyle.css';
89

910

1011

‎Public/style/gitPage_aboutMeStyle.css‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
pointer-events: auto;
1313
position: fixed;
1414
top: 6vh;
15+
left: calc(min(max(2vh,(100vw - 1000px) / 10), max(50vw - 400px, 2vh)));
16+
max-width: calc(100vw - 6vh);
17+
width: calc(max(1000px, 45vw));
18+
max-height: 85vh;
1519
z-index: 5;
1620
}
1721

@@ -44,7 +48,18 @@
4448
color: #999999;
4549
}
4650

47-
51+
.aboutMePage_footerBar a {
52+
color: #999999;
53+
}
54+
.aboutMePage_footerBar a:hover {
55+
color: #e5e5e5;
56+
font-weight: 600;
57+
text-shadow: 1px 1.5px 4px rgba(50,50,50,.5);
58+
}
59+
.aboutMePage_footerBar a:active {
60+
color: #cccccc;
61+
text-shadow: 1px 1.5px 4px rgba(50,50,50,.75);
62+
}
4863

4964
/* -- -- -- */
5065

‎Public/style/gitPage_projectsStyle.css‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22
/* -- -- -- */
33

44
.gitProjectsPageStyle{
5-
background: linear-gradient(123deg, rgba(48, 77, 126, 0.40), rgba(28, 53, 94, 0.65), rgba(52, 83, 135, 0.40));
5+
background: linear-gradient(123deg, rgba(62, 95, 117, 0.65), rgba(32, 82, 117, 0.71), rgba(59, 81, 107, 0.65));
66
text-shadow: 2px 2px 3px rgba(0, 0, 0, .75);
77
border: 1px solid rgba(44, 69, 109, 0.6);
88
pointer-events: auto;
99
position: fixed;
1010
bottom: 4.5vh;
1111
max-height: 55vh;
12+
max-width: calc(100vw - 5vh);
1213
z-index: 4;
1314
}
1415

@@ -17,17 +18,17 @@
1718
}
1819

1920
.gitProjectsPageStyle::-webkit-scrollbar-track {
20-
background: rgba(51, 76, 161, 0.308);
21+
background: rgba(32, 95, 143, 0.25);
2122
}
2223

2324
.gitProjectsPageStyle::-webkit-scrollbar-thumb {
2425
cursor: grab;
25-
background-color: rgba(33, 53, 117, 0.75);
26-
border: 2px solid rgba(44, 69, 109, 0.6);
26+
background-color: rgba(44, 96, 155, 0.75);
27+
border: 2px solid rgba(51, 86, 139, 0.6);
2728
}
2829
.gitProjectsPageStyle::-webkit-scrollbar-thumb:hover {
29-
background-color: rgba(34, 61, 151, 0.811);
30-
border: 2px solid rgba(38, 66, 112, 0.684);
30+
background-color: rgba(30, 59, 93, 0.834);
31+
border: 2px solid rgba(30, 65, 113, 0.685);
3132
}
3233

3334
/* -- -- -- */
@@ -56,17 +57,18 @@
5657
/* -- -- -- */
5758

5859
.projectsPage_footerBar{
59-
background: linear-gradient(90deg, rgba(0, 81, 221, 0.25), rgba(5, 61, 158, 0.1), rgba(4, 43, 109, 0.0), rgba(4, 43, 109, 0), rgba(5, 61, 158, 0.1), rgba(0, 81, 221, 0.25));
60-
color: #000f47;
60+
background: linear-gradient(90deg, rgba(27, 88, 141, 0.25), rgba(5, 83, 158, 0.1), rgba(4, 43, 109, 0.0), rgba(4, 43, 109, 0), rgba(5, 83, 158, 0.1), rgba(27, 88, 141, 0.25));
61+
color: #001f47;
6162
}
6263
.projectsPage_footerBar a {
63-
color: #000f47;
64+
color: #001b47;
6465
}
6566

6667
.projectsPage_footerBar a:hover {
67-
color: #0a268b;
68+
color: #0a3b8b;
69+
font-weight: 600;
6870
}
6971

7072
.projectsPage_footerBar a:active {
71-
color: #091439;
73+
color: #092039;
7274
}

‎Public/style/gitPage_pxlNavStyle.css‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11

22

33
.gitPxlNavPageStyle{
4-
background-color: rgba(100, 100, 100, 0.35);
4+
background-color: rgba(43, 9, 103, 0.45);
55
text-shadow: 2px 2px 3px rgba(0, 0, 0, .75);
6-
border: 1px solid rgba(60, 60, 60, 0.6);
6+
border: 1px solid rgba(45, 14, 125, 0.65);
77
pointer-events: auto;
88
max-height: 65vh;
9+
max-width: calc(100vw - 5vh);
910
position: fixed;
1011
top: 6vh;
1112
z-index: 2;
@@ -16,17 +17,17 @@
1617
}
1718

1819
.gitPxlNavPageStyle::-webkit-scrollbar-track {
19-
background: rgba(51, 76, 161, 0.308);
20+
background: rgba(38, 24, 86, 0.31);
2021
}
2122

2223
.gitPxlNavPageStyle::-webkit-scrollbar-thumb {
2324
cursor: grab;
24-
background-color: rgba(33, 53, 117, 0.75);
25-
border: 2px solid rgba(44, 69, 109, 0.6);
25+
background-color: rgb(49 8 116);
26+
border: 2px solid rgba(45, 9, 75, 0.6);
2627
}
2728
.gitPxlNavPageStyle::-webkit-scrollbar-thumb:hover {
28-
background-color: rgba(34, 61, 151, 0.811);
29-
border: 2px solid rgba(38, 66, 112, 0.684);
29+
background-color: rgba(65, 25, 130, 0.75);
30+
border: 2px solid rgba(69, 11, 119, 0.6);
3031
}
3132

3233

@@ -36,43 +37,46 @@
3637

3738

3839
.gitPageNav_pxlNavStyle {
39-
background: linear-gradient(90deg, rgba(20, 20, 20, 0.0), rgba(80, 80, 80, 0.45), rgba(85, 85, 85, 0.55), rgba(80, 80, 80, 0.45), rgba(20, 20, 20, 0.0) );
40-
border-bottom: 1px solid rgba(120, 120, 120, 0.45);
40+
background: linear-gradient(90deg, rgba(78, 19, 126, 0), rgba(95, 55, 163, 0.45), rgba(93, 50, 133, 0.55), rgba(101, 52, 193, 0.45), rgba(78, 19, 126, 0));
41+
border-bottom: 1px solid rgba(82, 38, 194, 0.45);
4142
}
4243
.gitPageNav_pxlNavStyle a {
43-
border: 1px solid #ffffff;
44-
color: #ffffff;
45-
background-color: rgba(110, 110, 110, .35);
44+
border: 1px solid #6700fff0;
45+
color: #ab8ae7;
46+
background-color: rgba(97, 48, 176, 0.37);
4647
}
4748
.gitPageNav_pxlNavStyle a:hover {
48-
text-shadow: 1px 1.5px 4px #cccccc;
49-
background-color: rgba(180, 180, 180, .85);
49+
color: #b781ff;
50+
text-shadow: 1px 1.5px 4px #4b3e55;
51+
background-color: rgba(134, 60, 252, 0.395);
52+
border: 1px solid #743bc9f0;
5053
}
5154
.gitPageNav_pxlNavStyle a:active {
52-
color: #cccccc;
53-
text-shadow: 1px 1.5px 4px #656565;
54-
background-color: rgba(100, 100, 100, .85);
55+
color: #7b62ab;
56+
text-shadow: 1px 1.5px 4px #51495a;
57+
background-color: rgba(58, 28, 105, 0.37);
58+
border: 1px solid #500fb1f0;
5559
}
5660

5761

5862
/* -- -- -- */
5963

6064

6165
.pxlNavPage_footerBar{
62-
background: linear-gradient(90deg, rgba(80, 80, 80, 0.15), rgba(70, 70, 70, 0.1), rgba(20, 20, 20, 0.0), rgba(20, 20, 20, 0.0), rgba(70, 70, 70, 0.1), rgba(80, 80, 80, 0.15));
63-
color: #999999;
66+
background: linear-gradient(90deg, rgba(71, 13, 174, 0.15), rgba(68, 5, 105, 0.1), rgba(78, 19, 126, 0), rgba(78, 19, 126, 0), rgba(68, 5, 105, 0.1), rgba(71, 13, 174, 0.15));
67+
color: #915aaa;
6468
}
6569
.pxlNavPage_footerBar a {
66-
color: #999999;
70+
color: #915aaa;
6771
}
6872
.pxlNavPage_footerBar a:hover {
69-
color: #e5e5e5;
70-
font-weight: 600;
71-
text-shadow: 1px 1.5px 4px rgba(50,50,50,.5);
73+
color: #a437d6;
74+
font-weight: 600;
75+
text-shadow: 1px 1.5px 4px rgba(50,50,50,.5);
7276
}
7377
.pxlNavPage_footerBar a:active {
74-
color: #cccccc;
75-
text-shadow: 1px 1.5px 4px rgba(50,50,50,.75);
78+
color: #74448b;
79+
text-shadow: 1px 1.5px 4px rgba(50,50,50,.75);
7680
}
7781

7882
/* -- -- -- */

‎Public/style/gitPage_reposStyle.css‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
.gitReposPageStyle{
3-
background: linear-gradient(123deg, rgba(48, 77, 126, 0.40), rgba(28, 53, 94, 0.65), rgba(52, 83, 135, 0.40));
3+
background: linear-gradient(149deg, rgba(28, 76, 178, 0.4), rgba(29, 43, 66, 0.65), rgba(28, 48, 82, 0.4));
4+
border: 1px solid rgba(50, 70, 103, 0.6);
45
text-shadow: 2px 2px 3px rgba(0, 0, 0, .75);
5-
border: 1px solid rgba(44, 69, 109, 0.6);
66
pointer-events: auto;
77
max-height: 65vh;
88
max-width: calc( max(min(100vw - 5vh, 500px), min( 100vw - 5vh, 40vw + ( (1000px - 100vw)*5) )) );
@@ -33,22 +33,23 @@
3333
/* -- -- -- */
3434

3535
.gitPageNav_reposStyle {
36-
background: linear-gradient(90deg, rgba(20, 20, 20, 0.0), rgba(80, 80, 80, 0.45), rgba(85, 85, 85, 0.55), rgba(80, 80, 80, 0.45), rgba(20, 20, 20, 0.0) );
37-
border-bottom: 1px solid rgba(120, 120, 120, 0.45);
36+
background: linear-gradient(90deg, rgba(28, 30, 46, 0), rgba(27, 47, 95, 0.45), rgba(51, 62, 107, 0.55), rgba(27, 47, 95, 0.45), rgba(28, 30, 46, 0));
37+
border-bottom: 1px solid rgb(58 58 153 / 45%);
3838
}
3939
.gitPageNav_reposStyle a {
40-
border: 1px solid #ffffff;
41-
color: #ffffff;
42-
background-color: rgba(110, 110, 110, .35);
40+
border: 1px solid #8086fd;
41+
color: #6e86ff;
42+
background-color: rgba(77, 91, 140, 0.35);
4343
}
4444
.gitPageNav_reposStyle a:hover {
45-
text-shadow: 1px 1.5px 4px #cccccc;
46-
background-color: rgba(180, 180, 180, .85);
45+
text-shadow: 1px 1.5px 4px #2a469b;
46+
background-color: rgba(87, 112, 204, 0.532);
4747
}
4848
.gitPageNav_reposStyle a:active {
49-
color: #cccccc;
50-
text-shadow: 1px 1.5px 4px #656565;
51-
background-color: rgba(100, 100, 100, .85);
49+
color: #3d4297;
50+
border: 1px solid #5156af;
51+
text-shadow: 1px 1.5px 4px #18254f;
52+
background-color: rgba(53, 64, 104, 0.541);
5253
}
5354

5455

@@ -80,18 +81,18 @@
8081
/* -- -- -- */
8182

8283
.repoPage_footerBar{
83-
background: linear-gradient(90deg, rgba(80, 80, 80, 0.15), rgba(70, 70, 70, 0.1), rgba(20, 20, 20, 0.0), rgba(20, 20, 20, 0.0), rgba(70, 70, 70, 0.1), rgba(80, 80, 80, 0.15));
84-
color: #999999;
84+
background: linear-gradient(90deg, rgba(20, 76, 186, 0.3), rgba(27, 63, 149, 0.1), rgba(20, 69, 186, 0), rgba(20, 69, 186, 0), rgba(27, 63, 149, 0.2), rgba(20, 76, 186, 0.3));
85+
color: #4964f1;
8586
}
8687
.repoPage_footerBar a {
87-
color: #999999;
88+
color: #4964f1;
8889
}
8990
.repoPage_footerBar a:hover {
90-
color: #e5e5e5;
91+
color: #5872f7;
9192
font-weight: 600;
9293
text-shadow: 1px 1.5px 4px rgba(50,50,50,.5);
9394
}
9495
.repoPage_footerBar a:active {
95-
color: #cccccc;
96+
color: #324bc9;
9697
text-shadow: 1px 1.5px 4px rgba(50,50,50,.75);
9798
}

‎Source/assets/EnvironmentAssets.fbx‎

48 Bytes
Binary file not shown.

Source/assets/starNoise.jpg renamed to Source/assets/uv_starNoise.jpg

File renamed without changes.

‎Source/js/pxlNav.js‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// Core pxlNav Engine
3-
export const pxlNavVersion = "0.0.9";
3+
export const pxlNavVersion = "0.0.10";
44
// Written by Kevin Edzenga 2020;2024
55

66
// -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
@@ -48,13 +48,6 @@ import { pxlShaders } from './pxlNav/shaders/shaders.js';
4848
import { VERBOSE_LEVEL } from './pxlNav/core/Types.js';
4949

5050

51-
// Bool to load the environment asset fbx file;
52-
// This is the included file with test pick-ups / assets
53-
// ./Public/images/assets/EnvironmentAssets.fbx
54-
// ./Public/images/assets/EnvironmentAssets_mobile.fbx
55-
// For further information of each item & object,
56-
// See pxlNav_docScripts/docs/
57-
const loadEnvAssetFile = true;
5851

5952
const pxlCore = "pxlNav-coreCanvas"; // Name of DIV in Index
6053
var cloud3dTexture = null;
@@ -162,6 +155,17 @@ export class pxlNav{
162155
};
163156
this.validEventsKeys = Object.keys( this.validEvents );
164157

158+
159+
160+
// Bool to load the environment asset fbx file;
161+
// This is the included file with test pick-ups / assets
162+
// ./Source/assets/EnvironmentAssets.fbx
163+
// For further information of each item & object,
164+
// See https://github.com/ProcStack/pxlNav/tree/main/docs
165+
// TODO : Turning this off breaks loading, fix that
166+
this.loadEnvAssetFile = true;
167+
168+
165169
this.pxlTimer = new PxlBase.Timer();
166170
this.pxlShaders = pxlShaders;
167171
this.pxlCookie = new PxlBase.CookieManager( projectTitle, "/" );
@@ -518,8 +522,9 @@ export class pxlNav{
518522
mobileSuffix="_mobile";
519523
}
520524

521-
if( loadEnvAssetFile ){
522-
let sceneFile=this.folderDict["assetRoot"]+"EnvironmentAssets"+mobileSuffix+".fbx";
525+
if( this.loadEnvAssetFile ){
526+
//let sceneFile=this.folderDict["assetRoot"]+"EnvironmentAssets"+mobileSuffix+".fbx";
527+
let sceneFile=this.folderDict["assetRoot"]+"EnvironmentAssets.fbx";
523528
// This is a separate fbx loaded specifically for the Environment Asset FBX
524529
// It opens up the found scene objects to easier global access
525530
this.pxlFile.loadSceneFBX(sceneFile, textureList, transformList, this.verbose,'EnvironmentAssets',[this.pxlEnv.scene]);

0 commit comments

Comments
 (0)