Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

moved index2.html to /v2/index.html #458

Merged
merged 19 commits into from
Sep 11, 2022
Merged

moved index2.html to /v2/index.html #458

merged 19 commits into from
Sep 11, 2022

Conversation

Forchapeatl
Copy link
Collaborator

@Forchapeatl Forchapeatl commented Sep 8, 2022

moved index2.html to /v2/index.html

Fixes #418

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • PR is descriptively titled 📑 and links the original issue above 🔗
  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR
  • code is in uniquely-named feature branch and has no merge conflicts 📁
  • screenshots/GIFs are attached 📎 in case of UI updation
  • ask @publiclab/reviewers for help, in a comment below

@gitpod-io
Copy link

gitpod-io bot commented Sep 8, 2022

@Forchapeatl
Copy link
Collaborator Author

@jywarren , please how may I relate the path of these files after moving index2.html to v2/index.html ?
image

@jywarren
Copy link
Member

@jywarren
Copy link
Member

Ok I think you need to adjust the test paths too now!

@jywarren
Copy link
Member

Good work though!!

@Forchapeatl
Copy link
Collaborator Author

Thank you @jywarren ,Please what should I do about the bootstrap problem? When I includes it shader files(WebGL) do not lot. If I exclude it the UI will get destroyed.

I was thinking of including the shader* files in our v2 directory.

.
├── ...
├── v2
│ ├── index.html
│ │── dist
│ │──── shader.frag
│ └──── shader.vert
└── ...

@jywarren
Copy link
Member

Ah, sorry i missed that question. See how in these examples, we made the path to those files settable using configuration options?

infragram/vr/index.html

Lines 184 to 185 in 5ff8f3f

shaderVertPath: "../dist/shader.vert",
shaderFragPath: "../dist/shader.frag",

That should work! Yes, we encountered this same issue before for those versions!

Added relative path of shader* files
@Forchapeatl
Copy link
Collaborator Author

Thank you @jywarren . May I have permission to merge ?

@@ -509,7 +509,9 @@ <h6 style="text-decoration:underline;">BLUE filters <i class="fa fa-filter" aria
infragram = Infragram({
uploader: false,
processor: 'webgl',
version: 2
version: 2,
shaderVertPath: "../dist/shader.vert",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect!

@jywarren
Copy link
Member

Great. Let's be sure @stephaniequintana knows we've moved the file!

@jywarren
Copy link
Member

I approved so go ahead!!

@Forchapeatl Forchapeatl merged commit 7447c97 into main Sep 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

GSoC Infragram.org full-screen UI and video upload Discussion and Planning
2 participants