summaryrefslogtreecommitdiffstats
path: root/src/demos/cg/runtime_ogl
diff options
context:
space:
mode:
authorKenneth Russel <[email protected]>2005-05-13 23:57:50 +0000
committerKenneth Russel <[email protected]>2005-05-13 23:57:50 +0000
commit7ac0aeff0fb6208a048588d9c83c941a82c64ed7 (patch)
tree519c460f0b298f7bef8845938535703853989fb2 /src/demos/cg/runtime_ogl
parent4a225f43a1f5f8a2ae95d3e3696c79e9090260e8 (diff)
Added CgGL.cgCreateProgramFromStream and updated JOGL Cg demos to use
it so they can be run with Java Web Start. git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/trunk@74 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4
Diffstat (limited to 'src/demos/cg/runtime_ogl')
-rw-r--r--src/demos/cg/runtime_ogl/cgGL_vertex_example.java14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/demos/cg/runtime_ogl/cgGL_vertex_example.java b/src/demos/cg/runtime_ogl/cgGL_vertex_example.java
index ec2cb9a..f1f41dd 100644
--- a/src/demos/cg/runtime_ogl/cgGL_vertex_example.java
+++ b/src/demos/cg/runtime_ogl/cgGL_vertex_example.java
@@ -31,11 +31,14 @@
*
*/
+package demos.cg.runtime_ogl;
+
import net.java.games.cg.*;
import net.java.games.jogl.*;
import java.awt.*;
import java.awt.event.*;
+import java.io.*;
/**
* cgGL_vertex_example: simple demo of Nvidia CgGL API. Based upon C version
@@ -187,9 +190,14 @@ public class cgGL_vertex_example implements GLEventListener
CheckCgError();
/* Test adding source text to context */
- Program = CgGL.cgCreateProgramFromFile(
- Context, CgGL.CG_SOURCE, "cgGL_vertex_example.cg",
- profile, null, null);
+ try {
+ Program = CgGL.cgCreateProgramFromStream(
+ Context, CgGL.CG_SOURCE,
+ getClass().getClassLoader().getResourceAsStream("demos/cg/runtime_ogl/cgGL_vertex_example.cg"),
+ profile, null, null);
+ } catch (IOException e) {
+ throw new RuntimeException("Error loading Cg vertex program", e);
+ }
CheckCgError();
System.err.println(