Permalink
Browse files

party version

  • Loading branch information...
1 parent a36efde commit d375c2ab593582ad147b3f068ba295da209fbfb3 @kusma committed Nov 24, 2009
Showing with 536 additions and 154 deletions.
  1. +1 −1 very_last_engine_ever/configdialog.cpp
  2. +1 −1 very_last_engine_ever/data/color_map.fx
  3. BIN very_last_engine_ever/data/greetings/0135.jpg
  4. BIN very_last_engine_ever/data/greetings/0136.jpg
  5. BIN very_last_engine_ever/data/greetings/0137.jpg
  6. BIN very_last_engine_ever/data/greetings/0138.jpg
  7. BIN very_last_engine_ever/data/greetings/0139.jpg
  8. BIN very_last_engine_ever/data/greetings/0140.jpg
  9. BIN very_last_engine_ever/data/greetings/0141.jpg
  10. BIN very_last_engine_ever/data/greetings/0142.jpg
  11. BIN very_last_engine_ever/data/greetings/0143.jpg
  12. BIN very_last_engine_ever/data/greetings/0144.jpg
  13. BIN very_last_engine_ever/data/greetings/0145.jpg
  14. BIN very_last_engine_ever/data/greetings/0146.jpg
  15. BIN very_last_engine_ever/data/greetings/0147.jpg
  16. BIN very_last_engine_ever/data/greetings/0148.jpg
  17. BIN very_last_engine_ever/data/greetings/0149.jpg
  18. BIN very_last_engine_ever/data/greetings/0150.jpg
  19. BIN very_last_engine_ever/data/greetings/0151.jpg
  20. BIN very_last_engine_ever/data/greetings/0152.jpg
  21. BIN very_last_engine_ever/data/greetings/0153.JPG
  22. BIN very_last_engine_ever/data/invmaps/0006.jpg
  23. +3 −6 very_last_engine_ever/data/smile.fx
  24. BIN very_last_engine_ever/data/sync__part.track
  25. BIN very_last_engine_ever/data/sync_beat.image.track
  26. BIN very_last_engine_ever/data/sync_cam.dist.track
  27. BIN very_last_engine_ever/data/sync_cam.fov.track
  28. BIN very_last_engine_ever/data/sync_cam.roll.track
  29. BIN very_last_engine_ever/data/sync_cam.shake.tempo.track
  30. BIN very_last_engine_ever/data/sync_cam.up.track
  31. BIN very_last_engine_ever/data/sync_cam.x-rot.track
  32. BIN very_last_engine_ever/data/sync_cam.y-rot.track
  33. BIN very_last_engine_ever/data/sync_cam.z-rot.track
  34. BIN very_last_engine_ever/data/sync_cm.blend.track
  35. BIN very_last_engine_ever/data/sync_cm.fade.track
  36. BIN very_last_engine_ever/data/sync_cm.flash.track
  37. BIN very_last_engine_ever/data/sync_cm.invmap.track
  38. BIN very_last_engine_ever/data/sync_cm.pal.track
  39. BIN very_last_engine_ever/data/sync_cm.repeat.track
  40. BIN very_last_engine_ever/data/sync_greet.group.track
  41. BIN very_last_engine_ever/data/sync_sphere.offs.track
  42. BIN very_last_engine_ever/data/sync_spheres.anim.track
  43. BIN very_last_engine_ever/data/sync_spheres.anim_amt.track
  44. BIN very_last_engine_ever/dialog.bmp
  45. +503 −112 very_last_engine_ever/kusma.rocket
  46. +24 −30 very_last_engine_ever/main.cpp
  47. +2 −2 very_last_engine_ever/stdafx.h
  48. +2 −2 very_last_engine_ever/very_last_engine_ever.vcproj
@@ -160,7 +160,7 @@ static LRESULT onInitDialog(HWND hDlg)
#if WINDOWED
mode.Width = 1280;
mode.Height = 720;
- EndDialog(hDlg, IDOK);
+// EndDialog(hDlg, IDOK);
#endif
aspect = float(mode.Width) / mode.Height;
@@ -249,7 +249,7 @@ float4 pixel(VS_OUTPUT In) : COLOR
float pal_sel = 0.0;
float4 color =
- tex2D(tex_sampler, In.tex * repeat + bloom_nudge) * 0.1
+ tex2D(tex_sampler, In.tex * repeat + bloom_nudge) * 0.25
+ tex2D(tex2_sampler, In.tex * repeat) * 1.0 ;
if (spheretracer)
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -60,7 +60,7 @@ VS_OUTPUT vertex(
float4 pixel0(VS_OUTPUT In) : COLOR
{
- return float4(0,0,0,1) + texCUBE(env_samp, In.reflection); // EVIL EYES!
+ return float4(0,0,0,1) + texCUBE(env_samp, In.reflection) * 0.1; // EVIL EYES!
}
float4 pixel1(VS_OUTPUT In) : COLOR
@@ -70,12 +70,9 @@ float4 pixel1(VS_OUTPUT In) : COLOR
float4 pixel2(VS_OUTPUT In) : COLOR
{
- float ao = 1.0; // tex2D(lightmap_samp, In.tex).r;
float4 color = float4(1,1,0,1);
-
- float4 ref = texCUBE(env_samp, In.reflection);
- float gloss = ao;
- color += ref;
+
+ color += texCUBE(env_samp, In.reflection) * 0.25;
return color * 1.1;
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Oops, something went wrong.
@@ -391,7 +391,17 @@ int main(int /*argc*/, char* /*argv*/ [])
std::auto_ptr<sync::Device> syncDevice = std::auto_ptr<sync::Device>(sync::createDevice("data/sync", synctimer));
if (NULL == syncDevice.get()) throw FatalException("something went wrong - failed to connect to host?");
+
+ Surface backbuffer = device.getRenderTarget(0);
+ Surface depthstencil = device.getDepthStencilSurface();
+ RenderTexture color_msaa(device, letterbox_viewport.Width, letterbox_viewport.Height, 1, D3DFMT_A8R8G8B8, config::multisample);
+ Surface depthstencil_msaa = device.createDepthStencilSurface(letterbox_viewport.Width, letterbox_viewport.Height, D3DFMT_D24S8, config::multisample);
+
+ /** DEMO ***/
+
+ engine::SpectrumData noise_fft = engine::loadSpectrumData("data/noise.fft");
+
Track &cameraDistanceTrack = syncDevice->getTrack("cam.dist");
Track &cameraRollTrack = syncDevice->getTrack("cam.roll");
Track &cameraXRotTrack = syncDevice->getTrack("cam.x-rot");
@@ -428,54 +438,28 @@ int main(int /*argc*/, char* /*argv*/ [])
Track &musGroove1Track = syncDevice->getTrack("mus.groove1");
Track &musGroove2Track = syncDevice->getTrack("mus.groove2");
- engine::SpectrumData noise_fft = engine::loadSpectrumData("data/noise.fft");
-
- Surface backbuffer = device.getRenderTarget(0);
- Surface depthstencil = device.getDepthStencilSurface();
-
- RenderTexture color_msaa(device, letterbox_viewport.Width, letterbox_viewport.Height, 1, D3DFMT_A8R8G8B8, config::multisample);
- Surface depthstencil_msaa = device.createDepthStencilSurface(letterbox_viewport.Width, letterbox_viewport.Height, D3DFMT_D24S8, config::multisample);
-
- /** DEMO ***/
-
+ Track &spheresAnimTrack = syncDevice->getTrack("spheres.anim");
+ Track &spheresAnimAmtTrack = syncDevice->getTrack("spheres.anim_amt");
+
RenderTexture color1_hdr(device, 800 / 2, int((800 / DEMO_ASPECT) / 2), 1, D3DFMT_A16B16G16R16F);
RenderTexture color2_hdr(device, 800 / 2, int((800 / DEMO_ASPECT) / 2), 1, D3DFMT_A16B16G16R16F);
-
-/* RenderTexture depth(device, 800 / 2, int((800 / DEMO_ASPECT) / 2), 1, D3DFMT_R32F); */
-
+
engine::VertexStreamer vertex_streamer(device);
-
-/* scenegraph::Node *testNode = testScene->findChild("Camera01-node_transform");
- assert(NULL != testNode); */
-
-// RenderTexture rt(device, 128, 128, 1, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE);
-// RenderTexture rt2(device, letterbox_viewport.Width, letterbox_viewport.Height, 1, D3DFMT_A8R8G8B8);
-// RenderTexture rt3(device, letterbox_viewport.Width, letterbox_viewport.Height, 1, D3DFMT_A8R8G8B8);
-
Effect *tex_fx = engine::loadEffect(device, "data/tex.fx");
tex_fx->setMatrix("transform", Matrix4x4::identity());
Effect *blur_fx = engine::loadEffect(device, "data/blur.fx");
-
Effect *noise_fx = engine::loadEffect(device, "data/noise.fx");
Texture noise_tex = engine::loadTexture(device, "data/noise.png");
-
Effect *color_map_fx = engine::loadEffect(device, "data/color_map.fx");
Texture color_maps[2];
-
color_maps[0] = engine::loadTexture(device, "data/color_map0.png");
color_maps[1] = engine::loadTexture(device, "data/color_map1.png");
color_map_fx->setFloat("texel_width", 1.0f / color_msaa.getWidth());
color_map_fx->setFloat("texel_height", 1.0f / color_msaa.getHeight());
-
renderer::CubeTexture cubemap_tex = engine::loadCubeTexture(device, "data/stpeters_cross3.dds");
-/*
- Effect test_fx = engine::loadEffect(device, "data/test.fx");
- test_fx->SetTexture("env", cube);
-*/
Effect *skybox_fx = engine::loadEffect(device, "data/skybox.fx");
skybox_fx->setTexture("reflectionMap", cubemap_tex);
Mesh *cube_x = engine::loadMesh(device, "data/cube.X");
-
Mesh *cornell_main_x = engine::loadMesh(device, "data/cornell-main.x");
Mesh *cornell_left_x = engine::loadMesh(device, "data/cornell-left.x");
Mesh *cornell_right_x = engine::loadMesh(device, "data/cornell-right.x");
@@ -885,6 +869,16 @@ int main(int /*argc*/, char* /*argv*/ [])
view = Matrix4x4::lookAt(eye, at, roll);
}
+ float temp = (2 * M_PI) / 3;
+ float th = spheresAnimTrack.getValue(beat);
+ float r = spheresAnimAmtTrack.getValue(beat);
+ color_map_fx->setVector3("spos[0]", Vector3(sin((th + 0) * temp) * r, 0, cos((th + 0) * temp) * r));
+ color_map_fx->setVector3("spos[1]", Vector3(sin((th + 1) * temp) * r, 0, cos((th + 1) * temp) * r));
+ color_map_fx->setVector3("spos[2]", Vector3(sin((th + 2) * temp) * r, 0, cos((th + 2) * temp) * r));
+// color_map_fx->p->SetVectorArray("sphere_pos", CONST D3DXVECTOR4* pVector, UINT Count
+/* spheresAnimTrack = syncDevice->getTrack("spheres.anim");
+ spheresAnimAmtTrack = syncDevice->getTrack("spheres.anim_amt"); */
+
color_map_fx->setMatrices(world, view, proj);
color_map_fx->setFloat("flash", flash);
color_map_fx->setFloat("fade2", colorMapFadeTrack.getValue(beat));
@@ -14,7 +14,7 @@
#include <windows.h>
#include <shellapi.h>
#include <mmsystem.h>
-#include <omp.h>
+// #include <omp.h>
#ifndef NDEBUG
#define CRTDBG_MAP_ALLOC
@@ -59,4 +59,4 @@
#include <assert.h>
// TODO: reference additional headers your program requires here
-#include <omp.h>
+// #include <omp.h>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9.00"
+ Version="9,00"
Name="very_last_engine_ever"
ProjectGUID="{CD862F66-C73B-4E6B-87DE-FB5519A91A5D}"
RootNamespace="very_last_engine_ever"
@@ -126,7 +126,7 @@
RuntimeLibrary="0"
EnableEnhancedInstructionSet="0"
FloatingPointModel="2"
- OpenMP="true"
+ OpenMP="false"
UsePrecompiledHeader="2"
WarningLevel="3"
Detect64BitPortabilityProblems="false"

0 comments on commit d375c2a

Please sign in to comment.