Merge branch '60_release' into stage

vvvv · Mar 25, 2024 · d31a6e5 · d31a6e5
2 parents 0874302 + c71f799
commit d31a6e5
Show file tree

Hide file tree

Showing 68 changed files with 763 additions and 362 deletions.
diff --git a/assets/css/creative.css b/assets/css/creative.css
@@ -9,7 +9,7 @@ body {
     width: 100%;
     height: 100%;
     font-size: 16px;
-    font-family: Merriweather,'Helvetica Neue',Arial,sans-serif;
+    font-family: 'Open Sans','Helvetica Neue', Arial, sans-serif;
     line-height: 1.42857143;
     color: #333;
 }
@@ -160,108 +160,6 @@ li {
   font-size: 14px;
 }
 
-.temporary {
-  width: 12.1em;
-  height: 12.1em;
-  position: absolute;
-  overflow: hidden;
-  top: 0;
-  right: 0;
-  z-index: 9999;
-  pointer-events: none;
-  font-size: 13px;
-  text-decoration: none;
-  text-indent: -999999px;
-}
-
-.temporary.fixed {
-  position:fixed;
-  top: 0;
-  z-index: 999;
-}
-
-.temporary:before, .temporary:after {
-  /* The right and left classes determine the side we attach our banner to */
-  position: absolute;
-  display: block;
-  width: 15.38em;
-  height: 1.54em;
-
-  top: 3.23em;
-  right: -3.23em;
-
-  -webkit-box-sizing: content-box;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-
-  -webkit-transform: rotate(45deg);
-  -moz-transform: rotate(45deg);
-  -ms-transform: rotate(45deg);
-  -o-transform: rotate(45deg);
-  transform: rotate(45deg);
-}
-
-.temporary:before {
-  content: "";
-
-  /* Add a bit of padding to give some substance outside the "stitching" */
-  padding: .38em 0;
-
-  /* Set the base colour */
-  background-color: #a00;
-
-  /* Set a gradient: transparent black at the top to almost-transparent black at the bottom */
-  background-image: -webkit-gradient(linear, left top, left bottom, from(rgba(0, 0, 0, 0)), to(rgba(0, 0, 0, 0.15)));
-  background-image: -webkit-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15));
-  background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15));
-  background-image: -ms-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15));
-  background-image: -o-linear-gradient(top, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15));
-  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15));
-
-  /* Add a drop shadow */
-  -webkit-box-shadow: 0 .15em .23em 0 rgba(0, 0, 0, 0.5);
-  -moz-box-shadow: 0 .15em .23em 0 rgba(0, 0, 0, 0.5);
-  box-shadow: 0 .15em .23em 0 rgba(0, 0, 0, 0.5);
-
-  pointer-events: auto;
-}
-
-.temporary:after {
-  /* Set the text from the data-ribbon attribute */
-  content: attr(text);
-
-  /* Set the text properties */
-  color: #fff;
-  font: 700 1em "Helvetica Neue", Helvetica, Arial, sans-serif;
-  line-height: 1.54em;
-  text-decoration: none;
-  text-shadow: 0 -.08em rgba(0, 0, 0, 0.5);
-  text-align: center;
-  text-indent: 0;
-
-  /* Set the layout properties */
-  padding: .15em 0;
-  margin: .15em 0;
-}
-
-.temporary .lefttop {
-  right: auto;
-  left: 0;
-}
-
-.temporary.lefttop:before, .temporary.lefttop:after {
-  right: auto;
-  left: -3.23em;
-}
-
-.github-fork-ribbon.left-top:before, .github-fork-ribbon.left-top:after {
-  -webkit-transform: rotate(-45deg);
-  -moz-transform: rotate(-45deg);
-  -ms-transform: rotate(-45deg);
-  -o-transform: rotate(-45deg);
-  transform: rotate(-45deg);
-}
-
 .bg-primary {
     background-color: #e89900;
 }
@@ -297,7 +195,7 @@ aside {
 }
 
 .navbar-default {
-    border-bottom: 1px #eee solid;
+    border-bottom: 1px #222 solid;
     font-family: 'Open Sans','Helvetica Neue',Arial,sans-serif;
     transition: all .35s;
     min-height: 60px;
@@ -410,7 +308,7 @@ header {
     width: 100%;
     text-align: center;
     color: #fff;
-    background-image: url(../img/header_5.0.jpg);
+    background-image: url(../img/header_6.0.jpg);
     background-position: top;
     -webkit-background-size: cover;
     -moz-background-size: cover;
@@ -470,6 +368,7 @@ header .header-content {
     position: relative;
     width: 100%;
     padding: 100px 15px;
+    min-height: 220px;
     text-align: center;
 }
 
@@ -535,6 +434,7 @@ header .header-content .header-content-inner p {
 
     header .header-content {
         padding: 70px 50px;
+        min-height: 520px;
     }
 
     header .header-content .header-content-inner {
@@ -631,74 +531,6 @@ header .header-content .header-content-inner p {
   background-color: #666;
 }
 
-.service-box {
-    margin: 50px auto 0;
-    max-width: 400px;
-}
-
-@media(min-width:992px) {
-    .service-box {
-        margin: 20px auto 0;
-    }
-}
-
-.service-box p {
-    margin-bottom: 0;
-}
-
-.portfolio-box {
-    display: block;
-    position: relative;
-    margin: 0 auto;
-    max-width: 650px;
-}
-
-.portfolio-box .portfolio-box-caption {
-    display: block;
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-    height: 100%;
-    text-align: center;
-    color: #fff;
-    opacity: 0;
-    background: #ffa800ef;
-    -webkit-transition: all .35s;
-    -moz-transition: all .35s;
-    transition: all .35s;
-}
-
-.portfolio-box .portfolio-box-caption .portfolio-box-caption-content {
-    position: absolute;
-    top: 50%;
-    width: 100%;
-    text-align: center;
-    transform: translateY(-50%);
-}
-
-.portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-category,
-.portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-name {
-    padding: 0 15px;
-    font-family: 'Open Sans','Helvetica Neue',Arial,sans-serif;
-}
-
-.portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-category {
-    text-transform: uppercase;
-    font-size: 14px;
-    font-weight: 600;
-}
-
-.portfolio-box .portfolio-box-caption .portfolio-box-caption-content .project-name {
-    font-size: 18px;
-}
-
-.portfolio-box:hover .portfolio-box-caption {
-    opacity: 1;
-}
-
-.call-to-action h2 {
-    margin: 0 auto 20px;
-}
 
 .text-primary {
     color: #666666;

diff --git a/assets/js/creative.js b/assets/js/creative.js
@@ -4,7 +4,9 @@
  * For details, see http://www.apache.org/licenses/LICENSE-2.0.
  */
 
+
 (function($) {
+
     "use strict"; // Start of use strict
     var topOffset = 0;
 
@@ -45,14 +47,6 @@
       $('#navbar-links').collapse('hide')
     });
 
-    // // Fit Text Plugin for Main Header
-    // $("h1").fitText(
-    //     1.2, {
-    //         minFontSize: '35px',
-    //         maxFontSize: '65px'
-    //     }
-    // );
-
     //Animate scroll to FeaturesMenu when switching sticky menu
     $('a[data-toggle="pill"]').on('show.bs.tab', function (e) {
 

diff --git a/assets/scss/_blog.scss b/assets/scss/_blog.scss
@@ -1,6 +1,3 @@
-$sans: "Open-Sans", sans-serif;
-$serif: "Roboto Slab", serif;
-
 .prev-next-top
 {
     top: 60px;
@@ -20,6 +17,12 @@ hr.thin{
     padding: 1em 0em;
     z-index: 1;
 
+    &.dark
+    {
+        background-color: $header-dark;
+        color: #fff;
+    }
+
     a
     {
         text-decoration: none;

diff --git a/assets/scss/_default.scss b/assets/scss/_default.scss
@@ -1,6 +1,11 @@
 $orange: #ffa800;
 $orange-link-hover: #ff8800;
 $orange-hover: #ee4b28;
+$header-dark: #282828;
+
+$sans: "Open Sans", sans-serif;
+$serif: "Roboto Slab", serif;
+
 
 .btn-xl
 {

diff --git a/assets/scss/_hero.scss b/assets/scss/_hero.scss
@@ -0,0 +1,35 @@
+#hero-text
+{
+    top: 60px;
+    border-top: 1px solid #fff;
+    border-bottom: 1px solid #fff;
+    width: 450px;
+    padding: 1em 0em;
+    margin: 0px;
+    font-family: $sans;
+    text-align: left;
+    padding: auto 0;
+
+    p
+    {
+        font-size: 1.3em; //1.5em when not caps
+        font-weight: 100;
+        text-transform: uppercase;
+    }
+
+    .vvvv
+    {
+        padding: 0px;
+        margin: 0 0 0.3em 0;
+        font-weight: 400;
+        font-size: 7rem;
+        line-height: 0.7em;
+    }
+
+    b
+    {
+        font-weight: 700;
+    }
+
+
+}
diff --git a/assets/scss/_nav.scss b/assets/scss/_nav.scss
@@ -1,13 +1,15 @@
 #mainNav
 {
+    background-color: $header-dark;
 
     .navbar-toggler {
         border: none;
+        color: #fff;
     }
 
     .nav-link
     {
-        color: #000;
+        color: #fff;
     }
 
     .nav-link:hover

diff --git a/assets/scss/main.scss b/assets/scss/main.scss
@@ -1,4 +1,5 @@
 @import '_default.scss';
+@import '_hero.scss';
 @import '_features.scss';
 @import '_newsletterForm.scss';
 @import '_showcase.scss';

diff --git a/config.toml b/config.toml
@@ -76,15 +76,10 @@ blog = '/blog/:sections[1]/:slug'
 		support = "Support"
 		contact   = "contact"
 
-		# Ribbon
-		# [params.Ribbon]
-		# text 			= "PRELIMINARY"
-		# tooltip 	= "A unified website for both vvvv beta and vvvv gamma is still to come. For now find everything about vvvv gamma on this page and go to vvvv.org to learn about vvvv beta."
-
 		# Hero section
 		[params.Hero]
-		slogan     = "vvvv"
-		subtitle   = "A visual live-programming environment that takes you from rapid prototyping to final production."
+		vvvv     = "vvvv"
+		subtitle   = "A visual live-programming environment that takes you from <b>rapid prototyping</b> to <b>final production.</b>"
 		tryitButton = "Download"
 		tryitButtonLink = "Download"
 		requestADemoButton = "Request a tour"
@@ -109,7 +104,7 @@ blog = '/blog/:sections[1]/:slug'
 
 		StableText  = "Download: Stable"
 		StableLink = "https://teamcity.vvvv.org/guestAuth/app/rest/builds/id:37342/artifacts/content/vvvv_gamma_5.2_setup.exe"
-		StableVersion = "Version: 5.2"
+		StableVersion = "Version: 6.0"
 
 		PreviewText = "Download: Preview"
 		PreviewLink = "PreviewDownloads"

diff --git a/content/Features/Libraries/3D.md b/content/Features/Libraries/3D.md
@@ -6,5 +6,6 @@ img: img/Lib_Stride.png
 
 * High-level scenegraph based workflow with lights, shadows, an extensive material pipeline and various PostFX (ambient occlusion, depth of field, ...)
 * Low-level shader based workflow with full access to the engine
-* VR output
-* Based on the <a href="https://stride3d.net/" target="_blank">Stride</a> 3d Engine
+* OpenXR support
+* Based on the <a href="https://stride3d.net/" target="_blank">Stride</a> 3d Engine
+* WebRenderer based on <a href="https://bitbucket.org/chromiumembedded/cef/src/master/" target="_blank">CEF</a>
diff --git a/content/Features/Libraries/Core.md b/content/Features/Libraries/Core.md
@@ -5,5 +5,6 @@ img: img/Lib_CoreLib.png
 ---
 
 * 2d drawing (GPU accelerated) with SVG and PDF export based on <a href="https://github.com/mono/SkiaSharp" target="_blank">SkiaSharp</a>
+* <a href="https://github.com/ocornut/imgui" target="_blank">Dear ImGui</a> based rapid UI creation
 * Serialization, async File IO, XML and JSON parsing and generation
 * 2d and 3d math library with collision detection operations
diff --git a/content/Features/Libraries/Devices.md b/content/Features/Libraries/Devices.md
@@ -5,7 +5,7 @@ img: img/Lib_Devices.png
 ---
 
 * Kinect v1, v2, Azure
-* Intel RealSense, Orbbec Astra, Nuitrack
+* Intel RealSense, Orbbec Astra, ZED, Nuitrack
 * IDS-Imaging uEye cameras
 * Leap Motion
 * SerialPort