Compare commits

...

13 Commits

Author SHA1 Message Date
Sanjay Bhadra ef40aa99e4 Merge branch 'master' into rewrite-tevx 2020-07-19 22:00:06 -04:00
teverse 6c75e1f150 Merge branch 'master' of https://github.com/teverse/teverse 2020-07-18 12:20:59 +01:00
teverse e21c0d6c29 opengl shader fix 2020-07-18 12:20:53 +01:00
Jay ff7349f77b opengl fix 2020-07-16 22:20:20 +01:00
Jay 603e4e49c2 Merge branch 'master' of https://github.com/teverse/teverse 2020-07-16 22:17:06 +01:00
Jay 8285c56bec updated fragment 2020-07-16 22:17:03 +01:00
Sanjay edd5bce75c
Rewrite TevX - Integration of 3D Environment & Command system (#77)
* Refactor .parent change in teverse.construct

* Redesign to fit dashboard screen

* Fix default side menu registers

* Add Search Bar UI to topbar

* Rename searchBar to commandBar

* Command Bar Trigger Setup

* Commandbar registers

* Command hooks registry

* File cleanup

* Enable 3D viewport & setup env. presets

* Enabled Camera for 3D Environment

* Enabled Callbacks for sidebar options

* Remove testing dump method

* Remove debounce in Camera for more fluid camera movements

* Enabled callbacks for Topbar buttons
2020-07-14 22:49:19 +01:00
teverse a940f65df4 Merge branch 'master' of https://github.com/teverse/teverse 2020-07-13 21:14:26 +01:00
teverse 82cbb27e60 update debug ui for net 2020-07-13 21:14:21 +01:00
Jay f932d61dd5 Use version check 2020-07-13 19:33:23 +01:00
teverse f71dcddd81 Fixed develop tab 2020-07-13 18:21:59 +01:00
Jay 747aad5a7d 0250 api dump 2020-07-13 17:41:20 +01:00
Jay 6550805520 Recents section 2020-07-13 17:34:43 +01:00
5 changed files with 759 additions and 532 deletions

1203
api.json

File diff suppressed because it is too large Load Diff

View File

@ -41,7 +41,79 @@ return {
"Run unpacked app", "Run unpacked app",
"code", "code",
function () function ()
-- backwards compatibility
if _TEV_VERSION_MINOR < 25 then
return teverse.apps:promptAppDirectory()
end
local recents = teverse.apps:recentDirectories()
if #recents == 0 then
teverse.apps:promptAppDirectory() teverse.apps:promptAppDirectory()
else
local backdrop = teverse.construct("guiFrame", {
parent = teverse.interface,
size = guiCoord(1, 100, 1, 100),
position = guiCoord(0, -50, 0, -50),
backgroundColour = colour(0, 0, 0),
backgroundAlpha = 0.0,
zIndex = 10
})
teverse.tween:begin(backdrop, 0.2, {
backgroundAlpha = 0.8
})
local dialog = teverse.construct("guiFrame", {
parent = backdrop,
size = guiCoord(0, 200, 0, 100),
position = guiCoord(0.5, -100, 0.5, -50),
backgroundColour = colour(1, 1, 1),
strokeRadius = 2,
dropShadowAlpha = 0.15,
strokeAlpha = 0.05
})
teverse.tween:begin(dialog, 0.2, {
size = guiCoord(0, 500, 0, 200),
position = guiCoord(0.5, -250, 0.5, -100)
}, "outQuad")
local prompt = teverse.construct("guiIcon", {
parent = dialog,
size = guiCoord(0.3, 0, 1, 0),
position = guiCoord(0.7, 0, 0, 0),
iconMax = 40,
iconColour = colour.rgb(74, 140, 122),
backgroundAlpha = 0.05,
backgroundColour = colour(0, 0, 0),
iconType = "faSolid",
iconId = "folder-open"
})
prompt:on("mouseLeftUp", function()
teverse.apps:promptAppDirectory()
end)
local y = 0
for _,v in pairs(recents) do
local trigger = teverse.construct("guiTextBox", {
parent = dialog,
size = guiCoord(0.7, -20, 0, 18),
position = guiCoord(0, 10, 0, y),
backgroundAlpha = 0.0,
text = v,
textSize = 18
})
trigger:on("mouseLeftUp", function()
teverse.apps:runRecent(v)
end)
y = y + 20
end
end
end end
} }
} }

View File

@ -10,6 +10,14 @@ $output v_normal, v_colour, v_position, v_pbr
*/ */
#include <teverse.sh> #include <teverse.sh>
#define __BUFFER_XX(_name, _type, _reg, _access) \
layout(std430, binding=_reg) _access buffer _name ## Buffer \
{ \
_type _name[]; \
}
#define BUFFER_RO(_name, _type, _reg) __BUFFER_XX(_name, _type, _reg, readonly)
BUFFER_RO(normalData, vec4, 2); BUFFER_RO(normalData, vec4, 2);
void main() void main()
@ -32,8 +40,8 @@ void main()
gl_Position = mul(u_viewProj, vec4(wpos, 1.0) ); gl_Position = mul(u_viewProj, vec4(wpos, 1.0) );
vec3 normal = a_normal.xyz * 2.0 - 1.0; vec3 normal = a_normal.xyz * 2.0 - 1.0;
vec3 wnormal = instMul(normalMatrix, vec4(normal.xyz, 0.0)); vec3 wnormal = instMul(normalMatrix, normal.xyz);
v_normal = encodeNormalUint(normalize(wnormal.xyz)); v_normal = encodeNormalUint(normalize(wnormal.xyz));
v_colour = i_data4; v_colour = i_data4;
v_position = gl_Position; v_position = gl_Position.xyz;
} }

View File

@ -89,7 +89,7 @@ void main()
vec3 V = normalize(uniformCameraPosition.xyz - wpos); vec3 V = normalize(uniformCameraPosition.xyz - wpos);
vec3 F0 = vec3(0.04, 0.04, 0.04); vec3 F0 = vec3(0.04, 0.04, 0.04);
F0 = mix(F0, colour, metallic); F0 = mix(F0, colour.xyz, metallic);
vec3 L = lightDir; vec3 L = lightDir;
vec3 H = normalize(V + L); vec3 H = normalize(V + L);
@ -110,5 +110,5 @@ void main()
// add to outgoing radiance Lo // add to outgoing radiance Lo
float NdotL = max(dot(normal.xyz, L), 0.0); float NdotL = max(dot(normal.xyz, L), 0.0);
gl_FragColor = vec4(((kD * colour / PI + specular) * lightColour * NdotL), colour.w); gl_FragColor = vec4(((kD * colour.xyz / PI + specular) * lightColour * NdotL), colour.w);
} }

View File

@ -1,6 +1,6 @@
local pingScale = 300 local pingScale = 300
local downloadScale = 1024 * 1 local downloadScale = 1024 * 5
local uploadScale = 1024 * 1 local uploadScale = 1024 * 5
return function() return function()
local main = teverse.construct("guiFrame", { local main = teverse.construct("guiFrame", {