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

Support #include in shader. #11

Merged
merged 9 commits into from
Apr 26, 2012
Merged

Support #include in shader. #11

merged 9 commits into from
Apr 26, 2012

Conversation

beizhang
Copy link

Thus become the first webgl framework supporting #include in the world!

The PR also includes:

  1. Supporting arguments in texture config of PhiloGL
  2. Supporting a pseudo-macro HAS_EXTENSION.
  3. Fix water demo to work on Opera. Polyfill for integer textures.

@philogb
Copy link
Owner

philogb commented Apr 25, 2012

So awesome, will package this into a new release this week!

On Tue, Apr 24, 2012 at 6:03 PM, ZHANG Bei
reply@reply.github.com
wrote:

Thus become the first webgl framework supporting #include in the world!

The PR also includes:

  1. Supporting arguments in texture config of PhiloGL
  2. Supporting a pseudo-macro HAS_EXTENSION.
  3. Fix water demo to work on Opera. Polyfill for integer textures.

You can merge this Pull Request by running:

 git pull https://github.com/zhangbei/philogl water

Or you can view, comment on it, or merge it online at:

 #11

-- Commit Summary --

  • Support preprocessor #include and HAS_EXTENSION
  • Bug fixes
  • Wave demo update
  • Build

-- File Changes --

M build/PhiloGL.cls.js (216)
M build/PhiloGL.js (149)
A examples/wave/CameraControl.js (40)
A examples/wave/StepSky/Normal.jpg (0)
D examples/wave/StepSky/Normal.png (0)
A examples/wave/SwapTexture.js (77)
M examples/wave/index.html (28)
M examples/wave/index.js (634)
M examples/wave/shaders/back.fs.glsl (16)
M examples/wave/shaders/calc.fs.glsl (27)
M examples/wave/shaders/drop.fs.glsl (10)
A examples/wave/shaders/env.glsl (10)
A examples/wave/shaders/packing.glsl (68)
A examples/wave/shaders/raytrace.glsl (7)
M examples/wave/shaders/shore.fs.glsl (2)
M examples/wave/shaders/wave.fs.glsl (84)
M examples/wave/shaders/wave.vs.glsl (22)
M examples/wave/style.css (5)
M src/core.js (2)
M src/io.js (4)
M src/program.js (119)
M src/webgl.js (24)

-- Patch Links --

 https://github.com/philogb/philogl/pull/11.patch
 https://github.com/philogb/philogl/pull/11.diff


Reply to this email directly or view it on GitHub:
#11

Nicolas Garcia Belmonte - http://philogb.github.com/

@philogb
Copy link
Owner

philogb commented Apr 26, 2012

I've been testing and /examples/lessons/5/ is broken in your branch. Could you have a look at that please?

Thanks

@beizhang
Copy link
Author

@philogb Fixed :)

@philogb philogb merged commit 2e27bdd into philogb:master Apr 26, 2012
@philogb
Copy link
Owner

philogb commented Apr 26, 2012

Just fixed with another commit all framebuffer problems. Your demo now works in FF too :)

@beizhang
Copy link
Author

Wow cool!

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.

2 participants